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

2007-11-14 15:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/make_xmingwce.sh
    ! added -D__PLATFORM__Windows for non MS-Windows based hosts I
      removed by mistake in previous commit

  * harbour/bin/hb-mkslib.sh
  * harbour/bin/hb-func.sh
  * harbour/bin/postinst.sh
    * in cross builds changed hb-mkslib.sh name to respect prefix used
      by other hb* scripts (f.e. hbce or hbw) and set destination platform
      to fixed value
This commit is contained in:
Przemyslaw Czerpak
2007-11-14 14:55:47 +00:00
parent 841c07c586
commit 5b7b7842da
5 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -8,6 +8,18 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-14 15:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/make_xmingwce.sh
! added -D__PLATFORM__Windows for non MS-Windows based hosts I
removed by mistake in previous commit
* harbour/bin/hb-mkslib.sh
* harbour/bin/hb-func.sh
* harbour/bin/postinst.sh
* in cross builds changed hb-mkslib.sh name to respect prefix used
by other hb* scripts (f.e. hbce or hbw) and set destination platform
to fixed value
2007-11-14 14:45 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/make_xmingwce.sh
* cleaned possible warning message when host computer is controlled

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

@@ -616,11 +616,16 @@ mk_hblibso()
full_lib_name="lib${name}-${hb_ver}.so"
full_lib_name_mt="lib${name}mt-${hb_ver}.so"
fi
if [ -n "${HB_TOOLS_PREF}" ]; then
hb_mkslib="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkslib"
else
hb_mkslib="${HB_BIN_INSTALL}/hb-mkslib"
fi
echo "Making ${full_lib_name}..."
$HB_BIN_INSTALL/hb-mkslib ${full_lib_name} $LIBS ${linker_options}
${hb_mkslib} ${full_lib_name} $LIBS ${linker_options}
if [ "$HB_MT" = "MT" ]; then
echo "Making ${full_lib_name_mt}..."
$HB_BIN_INSTALL/hb-mkslib ${full_lib_name_mt} $LIBSMT ${linker_options}
${hb_mkslib} ${full_lib_name_mt} $LIBSMT ${linker_options}
fi
for l in ${full_lib_name} ${full_lib_name_mt}
do

4
harbour/bin/hb-mkslib.sh
View File

@@ -12,6 +12,8 @@
# See doc/license.txt for licensing terms.
# ---------------------------------------------------------------
# HB_ARCHITECTURE=""
if [ -n "${HB_ARCHITECTURE}" ]
then
hb_arch="${HB_ARCHITECTURE}"
@@ -20,7 +22,7 @@ else
fi
case "$hb_arch" in
*windows*|*mingw32*) hb_arch="w32" ;;
*windows*|*mingw32*|msys*) hb_arch="w32" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
esac

9
harbour/bin/postinst.sh
View File

@@ -50,7 +50,14 @@ then
# We must build an archive index on Darwin
AR="${CCPREFIX}ar -crs"
fi
if [ "${HB_ARCHITECTURE}" = "sunos" ]; then
if [ -n "${HB_TOOLS_PREF}" ]; then
hb_mkslib="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkslib"
rm -f "${hb_mkslib}"
sed -e "s/^# HB_ARCHITECTURE=\"\"\$/HB_ARCHITECTURE=\"${HB_ARCHITECTURE}\"/g" \
"${hb_root}/bin/hb-mkslib.sh" > "${hb_mkslib}" && \
chmod 755 "${hb_mkslib}"
elif [ "${HB_ARCHITECTURE}" = "sunos" ]; then
rm -f "${HB_BIN_INSTALL}/hb-mkslib"
cp "${hb_root}/bin/hb-mkslib.sh" "${HB_BIN_INSTALL}/hb-mkslib" && \
chmod 755 "${HB_BIN_INSTALL}/hb-mkslib"

2
harbour/make_xmingwce.sh
View File

@@ -31,7 +31,7 @@ fi
CC_PRG_USR="-D__PLATFORM__WINCE"
if [ "$HB_HOST_ARCH" != "w32" ]; then
CC_PRG_USR="$CC_PRG_USR -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAME"
CC_PRG_USR="$CC_PRG_USR -D__PLATFORM__Windows -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAME"
fi
[ -z "$HB_INSTALL_PREFIX" ] && \