fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-08-18 12:01 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/make_gnu_xmingw.sh
  * harbour/make_gnu_xmingwce.sh
  * harbour/bin/hb-func.sh
    ! fixed HB_CCPATH setting to be compatible with .mk files and hb* scripts
    ! fixed links to harbour share libraries
This commit is contained in:
Przemyslaw Czerpak
2009-08-18 10:01:38 +00:00
parent 5fe7239954
commit 125e1cbe72
4 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-18 12:01 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/make_gnu_xmingw.sh
* harbour/make_gnu_xmingwce.sh
* harbour/bin/hb-func.sh
! fixed HB_CCPATH setting to be compatible with .mk files and hb* scripts
! fixed links to harbour share libraries
2009-08-17 10:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/wce/poccarm.mk
* config/wce/msvcarm.mk

43
harbour/bin/hb-func.sh
View File

@@ -119,7 +119,7 @@ mk_hbgetlibsctb()
mk_hbtools()
{
local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg hb_mkdef hb_gt_ori
local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg hb_mkdef hb_gt_ori hb_ccpath
name=`get_solibname`
hb_pref="$4"
@@ -264,6 +264,9 @@ mk_hbtools()
echo "libs=${hb_mkdef}gpm">> ${hb_hbmkcfg}
fi
hb_ccpath="${HB_CCPATH%/}"
[ -z "${hb_ccpath}" ] || hb_ccpath="${hb_ccpath}${hb_path_separator}"
echo "Generating ${hb_tool}... "
cat > ${hb_tool} <<EOF
#!/bin/sh
@@ -285,7 +288,7 @@ export HB_COMPILER="${HB_COMPILER}"
[ -z "\${HB_LIB_INSTALL}" ] && export HB_LIB_INSTALL="${_DEFAULT_LIB_DIR}"
# be sure that ${name} binaries are in your path
export PATH="\${HB_BIN_INSTALL}${hb_path_separator}${HB_CCPATH}\${PATH}"
export PATH="\${HB_BIN_INSTALL}${hb_path_separator}${hb_ccpath}\${PATH}"
if [ "\${HB_COMPILER}" == "gpp" ]; then
HB_CC="g++"
@@ -762,7 +765,7 @@ EOF
mk_hblibso()
{
local LIBS LIBSMT l lm ll dir hb_rootdir hb_ver hb_libs full_lib_name full_lib_name_mt linker_options linker_mtoptions gpm
local LIBS LIBSMT l lm ll dir hb_rootdir hb_ver hb_libs full_lib_name full_lib_name_mt linker_options linker_mtoptions gpm lib_ext lib_pref lib_suff
dir=`pwd`
name=`get_solibname`
@@ -863,30 +866,30 @@ mk_hblibso()
done
if [ "${HB_ARCHITECTURE}" = "darwin" ]; then
lib_ext=".dylib"
full_lib_name="lib${name}.${hb_ver}${lib_ext}"
full_lib_name_mt="lib${name}mt.${hb_ver}${lib_ext}"
lib_pref="lib"
lib_suff=".${hb_ver}${lib_ext}"
elif [ "${HB_ARCHITECTURE}" = "win" ] || \
[ "${HB_ARCHITECTURE}" = "wce" ]; then
lib_ext=".dll"
lib_pref=""
if [ "${HB_COMPILER}" = "mingw64" ]; then
full_lib_name="${name}-${hb_ver}-x64${lib_ext}"
full_lib_name_mt="${name}mt-${hb_ver}-x64${lib_ext}"
lib_suff="-${hb_ver}-x64${lib_ext}"
elif [ "${HB_COMPILER}" = "mingwarm" ]; then
full_lib_name="${name}-${hb_ver}-arm${lib_ext}"
full_lib_name_mt="${name}mt-${hb_ver}-arm${lib_ext}"
lib_suff="-${hb_ver}-arm${lib_ext}"
else
full_lib_name="${name}-${hb_ver}${lib_ext}"
full_lib_name_mt="${name}mt-${hb_ver}${lib_ext}"
lib_suff="-${hb_ver}${lib_ext}"
fi
elif [ "${HB_ARCHITECTURE}" = "hpux" ]; then
lib_ext=".sl"
full_lib_name="lib${name}-${hb_ver}${lib_ext}"
full_lib_name_mt="lib${name}mt-${hb_ver}${lib_ext}"
lib_pref="lib"
lib_suff="-${hb_ver}${lib_ext}"
else
lib_ext=".so"
full_lib_name="lib${name}-${hb_ver}${lib_ext}"
full_lib_name_mt="lib${name}mt-${hb_ver}${lib_ext}"
lib_pref="lib"
lib_suff="-${hb_ver}${lib_ext}"
fi
full_lib_name="${lib_pref}${name}${lib_suff}"
full_lib_name_mt="${lib_pref}${name}mt${lib_suff}"
if [ -n "${HB_TOOLS_PREF}" ]; then
hb_mkdyn="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkdyn"
else
@@ -902,22 +905,16 @@ mk_hblibso()
do
if [ -f $l ]
then
ll=${l%${lib_suff}}${lib_ext}
ln -sf $l $ll
if [ "${HB_ARCHITECTURE}" = "win" ] || \
[ "${HB_ARCHITECTURE}" = "wce" ]; then
ll=${l%-${hb_ver}${lib_ext}}${lib_ext}
ln -sf $l $ll
if [ "${HB_XBUILD}" = "" ]; then
(cd "$dir"
mv "${HB_LIB_INSTALL}/$l" "${HB_BIN_INSTALL}"
mv "${HB_LIB_INSTALL}/$ll" "${HB_BIN_INSTALL}")
fi
else
if [ "${HB_ARCHITECTURE}" = "darwin" ]; then
ll=${l%.${hb_ver}${lib_ext}}${lib_ext}
else
ll=${l%-${hb_ver}${lib_ext}}${lib_ext}
ln -sf $l $ll
fi
case $HB_LIB_INSTALL in
*/usr/lib/*|*/usr/lib64/*|*/usr/local/lib/*|*/usr/local/lib64/*)
ln -sf ${name}/$l ../$ll

10
harbour/make_gnu_xmingw.sh
View File

@@ -62,8 +62,7 @@ elif [ -x /usr/local/bin/i[3456]86-mingw*-gcc ]; then
fi
if [ -z "${MINGW_PREFIX}" ] || \
( [ ! -x ${MINGW_PREFIX}/bin/${HB_CCPREFIX}gcc ] && \
[ ! -x ${MINGW_PREFIX}/${TARGET}/bin/${HB_CCPREFIX}gcc ] ); then
[ ! -x ${MINGW_PREFIX}/bin/${HB_CCPREFIX}gcc ]; then
# MinGW cross-compiler not found in default location
# scan some usually used locations and names
for d in /usr /usr/local /usr/local/mingw32 /opt/xmingw; do
@@ -85,15 +84,14 @@ if [ -z "${MINGW_PREFIX}" ] || \
done
fi
if [ ! -x ${MINGW_PREFIX}/bin/${HB_CCPREFIX}gcc ] && \
[ ! -x ${MINGW_PREFIX}/${TARGET}/bin/${HB_CCPREFIX}gcc ]; then
if [ ! -x ${MINGW_PREFIX}/bin/${HB_CCPREFIX}gcc ]; then
echo "Can't determine the location for the MinGW32 cross-compiler."
echo "Please install it or add your platform to the $0 script."
exit 1
fi
export HB_CCPATH="${MINGW_PREFIX}/bin:${MINGW_PREFIX}/${TARGET}/bin:"
export PATH="${HB_CCPATH}${PATH}"
export HB_CCPATH="${MINGW_PREFIX}/bin/"
export PATH="${HB_CCPATH%/}${PATH}"
export HB_CCPREFIX
export HB_TOOLS_PREF="hbw"
export HB_XBUILD="win"

11
harbour/make_gnu_xmingwce.sh
View File

@@ -37,14 +37,15 @@ fi
export HB_INSTALL_PREFIX="/usr/local/arm-wince-mingwce-harbour"
# default mingwce installation path
[ -z "$HB_CCPATH" ] && HB_CCPATH="/opt/mingw32ce/bin"
[ -n "$HB_CCPATH" ] && HB_CCPATH="${HB_CCPATH%/}/"
[ -z "$HB_CCPATH" ] && HB_CCPATH="/opt/mingw32ce/bin/"
# mingwce executables prefix - this
if [ -z "$HB_CCPREFIX" ]; then
if [ -x "${HB_CCPATH}/arm-wince-mingw32ce-gcc" ]; then
if [ -x "${HB_CCPATH}arm-wince-mingw32ce-gcc" ]; then
HB_CCPREFIX="arm-wince-mingw32ce-"
else
if [ -x "${HB_CCPATH}/arm-mingw32ce-gcc" ]; then
if [ -x "${HB_CCPATH}arm-mingw32ce-gcc" ]; then
HB_CCPREFIX="arm-mingw32ce-"
else
echo "mingwce compiler executable not found. Ensure you have mingwce package installed in"
@@ -55,8 +56,8 @@ if [ -z "$HB_CCPREFIX" ]; then
fi
fi
export HB_CCPATH="${HB_CCPATH}:"
export PATH="${HB_CCPATH}${PATH}"
export HB_CCPATH
export PATH="${HB_CCPATH%/}:${PATH}"
export HB_CCPREFIX
export HB_TOOLS_PREF="hbce"
export HB_XBUILD="wce"