4f7bb3e481
+ harbour/config/linux/icc.cf
* harbour/config/linux/gcc.cf
* harbour/bin/hb-func.sh
* harbour/bin/postinst.sh
* harbour/source/common/hbver.c
+ added support for Intel(R) C/C++ compiler
* harbour/bin/postinst.sh
% use hb-mkdyn symlink instead of regenerating it as hb-mkslib
It will work also in DOS/Windows (MSys/DJGPP emulates ln -s ...)
* harbour/source/vm/thread.c
* removed all references to HB_THREAD_EQUAL()/HB_THREAD_SELF() in
non MT builds
* harbour/source/rtl/console.c
! fixed default color setting in hb_dispOutAtBox()
* harbour/contrib/gtwvg/wvggui.h
* harbour/contrib/gtwvg/wvgwin.c
* harbour/contrib/gtwvg/wincallb.c
* harbour/contrib/gtwvg/wvgsink.c
! fixes for C++ compilation:
- this is reserved word in C++ - do not use it as variable name
- class is reserved word in C++ - do not use it as variable name
- use macros to hide differences between C and C++ WinAPI
- casting
101 lines
3.2 KiB
Bash
Executable File
101 lines
3.2 KiB
Bash
Executable File
#!/bin/sh
|
|
[ "$BASH" ] || exec bash `which $0` ${1+"$@"}
|
|
#
|
|
# $Id$
|
|
#
|
|
|
|
# ---------------------------------------------------------------
|
|
# Copyright 2003 Przemyslaw Czerpak <druzus@priv.onet.pl>
|
|
# simple script run after Harbour make install to finish install
|
|
# process
|
|
#
|
|
# See doc/license.txt for licensing terms.
|
|
# ---------------------------------------------------------------
|
|
|
|
if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ] || \
|
|
[ -z "$HB_BIN_INSTALL" ] || \
|
|
[ -z "$HB_INC_INSTALL" ] || \
|
|
[ -z "$HB_LIB_INSTALL" ]
|
|
then
|
|
echo "The following envvars must be set:"
|
|
echo " HB_ARCHITECTURE"
|
|
echo " HB_COMPILER"
|
|
echo " HB_BIN_INSTALL"
|
|
echo " HB_INC_INSTALL"
|
|
echo " HB_LIB_INSTALL"
|
|
exit 1
|
|
fi
|
|
|
|
hb_root=`dirname "$0"`
|
|
if [ "${hb_root}" = "." ]
|
|
then
|
|
hb_root=".."
|
|
else
|
|
hb_root=`dirname "${hb_root}"`
|
|
fi
|
|
if [ ! -f ${hb_root}/bin/hb-func.sh ] && [ -f ./bin/hb-func.sh ]
|
|
then
|
|
hb_root="."
|
|
fi
|
|
|
|
. ${hb_root}/bin/hb-func.sh
|
|
|
|
if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \
|
|
[ "$HB_COMPILER" = "mingw" ] || [ "$HB_COMPILER" = "mingwce" ] || \
|
|
[ "$HB_COMPILER" = "djgpp" ] || [ "$HB_COMPILER" = "icc" ]
|
|
then
|
|
RANLIB=""
|
|
MAKE=make
|
|
AR="${CCPREFIX}ar -cr"
|
|
AR_OPT=""
|
|
if [ "${HB_ARCHITECTURE}" = "bsd" ] || \
|
|
[ "${HB_ARCHITECTURE}" = "hpux" ] || \
|
|
[ `uname` = "FreeBSD" ]; then
|
|
MAKE=gmake
|
|
elif [ "${HB_ARCHITECTURE}" = "darwin" ]; then
|
|
# We must build an archive index on Darwin
|
|
#AR="${CCPREFIX}ar -crs"
|
|
AR="libtool"
|
|
AR_OPT="-static ${HB_USER_LIBTOOL} -o "
|
|
fi
|
|
|
|
if [ -n "${HB_TOOLS_PREF}" ]; then
|
|
hb_mkdyn="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkdyn"
|
|
rm -f "${hb_mkdyn}"
|
|
sed -e "s/^# HB_ARCHITECTURE=\"\"\$/HB_ARCHITECTURE=\"${HB_ARCHITECTURE}\"/g" \
|
|
-e "s/^# CCPREFIX=\"\"\$/[ -n \"\${CCPREFIX}\" ] || CCPREFIX=\"${CCPREFIX}\"/g" \
|
|
"${hb_root}/bin/hb-mkdyn.sh" > "${hb_mkdyn}" && \
|
|
chmod 755 "${hb_mkdyn}"
|
|
elif [ "$HB_COMPILER" = "icc" ]; then
|
|
hb_mkdyn="${HB_BIN_INSTALL}/hb-mkdyn"
|
|
rm -f "${hb_mkdyn}"
|
|
sed -e "s/gcc/icc/g" "${hb_root}/bin/hb-mkdyn.sh" > "${hb_mkdyn}" && \
|
|
chmod 755 "${hb_mkdyn}"
|
|
elif [ "${HB_ARCHITECTURE}" = "sunos" ] || \
|
|
[ "${HB_ARCHITECTURE}" = "hpux" ] || \
|
|
! which install &>/dev/null; then
|
|
hb_mkdyn="${HB_BIN_INSTALL}/hb-mkdyn"
|
|
rm -f "${hb_mkdyn}"
|
|
cp "${hb_root}/bin/hb-mkdyn.sh" "${hb_mkdyn}" && \
|
|
chmod 755 "${hb_mkdyn}"
|
|
elif [ "${HB_ARCHITECTURE}" != "dos" ]; then
|
|
hb_mkdyn="${HB_BIN_INSTALL}/hb-mkdyn"
|
|
# Without -c some OSes _move_ the file instead of copying it!
|
|
install -c -m 755 "${hb_root}/bin/hb-mkdyn.sh" "${hb_mkdyn}"
|
|
fi
|
|
|
|
# Compatibility hb-mkslib creation. Please use hb-mkdyn instead.
|
|
if [ -n "${hb_mkdyn}" ] && [ -f "${hb_mkdyn}" ]; then
|
|
hb_mkdyn="${hb_mkdyn//-mkdyn/-mkslib}"
|
|
rm -f "${hb_mkdyn}"
|
|
ln -s hb-mkdyn "${hb_mkdyn}"
|
|
fi
|
|
|
|
mk_hbtools "${HB_BIN_INSTALL}" "$@"
|
|
if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \
|
|
[ "$HB_COMPILER" = "mingw" ] || [ "$HB_COMPILER" = "mingwce" ] || \
|
|
[ "$HB_COMPILER" = "icc" ]; then
|
|
mk_hblibso "${hb_root}"
|
|
fi
|
|
fi
|