From ba35cc2c25079d84d418f3cf511554149c335a37 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 27 Aug 2009 07:06:52 +0000 Subject: [PATCH] 2009-08-27 09:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_deb.sh * bin/hb-func.sh * harbour.spec * mpkg_tgz.sh * HB_WITHOUT_GTCRS -> HB_INC_CURSES * HB_WITHOUT_GTSLN -> HB_INC_SLANG * HB_WITHOUT_X11 -> HB_INC_X11 * HB_GPM_MOUSE -> HB_INC_MOUSE (in few remaining hbmk script places) ; NOTE: After all this cleanup/leveling is done, probably HB_INC_* variables will be changed to more standard HB_WITH_* format. First I want to finish this part. --- harbour/ChangeLog | 13 +++++++++++++ harbour/bin/hb-func.sh | 32 ++++++++++++++++---------------- harbour/harbour.spec | 6 +++--- harbour/mpkg_deb.sh | 14 +++++++------- harbour/mpkg_tgz.sh | 22 +++++++++++----------- 5 files changed, 50 insertions(+), 37 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 21b3ff2c00..289ab952e3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,19 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-27 09:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * mpkg_deb.sh + * bin/hb-func.sh + * harbour.spec + * mpkg_tgz.sh + * HB_WITHOUT_GTCRS -> HB_INC_CURSES + * HB_WITHOUT_GTSLN -> HB_INC_SLANG + * HB_WITHOUT_X11 -> HB_INC_X11 + * HB_GPM_MOUSE -> HB_INC_MOUSE (in few remaining hbmk script places) + ; NOTE: After all this cleanup/leveling is done, probably + HB_INC_* variables will be changed to more standard + HB_WITH_* format. First I want to finish this part. + 2009-08-27 08:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_deb.sh * mpkg_tgz.sh diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 0b40e45c16..a6f13cb6ad 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -191,13 +191,13 @@ mk_hbtools() if [ "${HB_COMPILER}" = "mingw" ] || \ [ "${HB_COMPILER}" = "mingw64" ]; then HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -ladvapi32 -lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32" - HB_WITHOUT_X11="yes" + HB_INC_X11="no" elif [ "${HB_COMPILER}" = "mingwarm" ]; then HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32 -loleaut32" - HB_WITHOUT_X11="yes" + HB_INC_X11="no" elif [ "${HB_COMPILER}" = "djgpp" ]; then HB_SYS_LIBS="${HB_SYS_LIBS}" - HB_WITHOUT_X11="yes" + HB_INC_X11="no" else HB_CRS_LIB="" if [ "${HB_PLATFORM}" = "linux" ]; then @@ -364,29 +364,29 @@ if [ -z "$HB_INC_GPM" ]; then export HB_INC_GPM fi -if [ -z "${HB_WITHOUT_GTSLN}" ]; then - HB_WITHOUT_GTSLN=yes +if [ -z "${HB_INC_SLANG}" ]; then + HB_INC_SLANG=no case "$HB_PLATFORM" in linux|bsd|darwin|hpux|sunos) for dir in /usr /usr/local /sw /opt/local do if [ -f ${dir}/include/slang.h ] || \ [ -f ${dir}/include/slang/slang.h ]; then - HB_WITHOUT_GTSLN=no + HB_INC_SLANG=yes fi done ;; esac fi -if [ -z "${HB_WITHOUT_GTCRS}" ]; then - HB_WITHOUT_GTCRS=yes +if [ -z "${HB_INC_CURSES}" ]; then + HB_INC_CURSES=no case "$HB_PLATFORM" in linux|bsd|darwin|hpux|sunos) for dir in /usr /usr/local /sw /opt/local do if [ -f ${dir}/include/curses.h ]; then - HB_WITHOUT_GTCRS=no + HB_INC_CURSES=yes fi done ;; @@ -399,7 +399,7 @@ fi if [ "$HB_COMMERCE" = yes ]; then HB_INC_GPM=no - HB_WITHOUT_GTSLN=yes + HB_INC_SLANG=no fi HB_GT_REQ="" @@ -504,13 +504,13 @@ if [ -f "\${HB_LIB_INSTALL}/libgtsln.a" ]; then SYSTEM_LIBS="\${SYSTEM_LIBS} -L/usr/local/lib" fi SYSTEM_LIBS="-l${HB_SLN_LIB:-slang} \${SYSTEM_LIBS}" - [ "\${HB_GPM_MOUSE}" = "yes" ] && HB_GPM_LIB="gpm" + [ "\${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm" fi if [ -f "\${HB_LIB_INSTALL}/libgtcrs.a" ]; then SYSTEM_LIBS="-l${HB_CRS_LIB:-ncurses} \${SYSTEM_LIBS}" - [ "\${HB_GPM_MOUSE}" = "yes" ] && HB_GPM_LIB="gpm" + [ "\${HB_INC_GPM}" != "no" ] && HB_GPM_LIB="gpm" fi -if [ "\${HB_WITHOUT_X11}" != "yes" ]; then +if [ "\${HB_INC_X11}" != "no" ]; then if [ -f "\${HB_LIB_INSTALL}/libgtxvt.a" ] || [ -f "\${HB_LIB_INSTALL}/libgtxwc.a" ]; then [ -d "/usr/X11R6/lib64" ] && SYSTEM_LIBS="\${SYSTEM_LIBS} -L/usr/X11R6/lib64" SYSTEM_LIBS="-L/usr/X11R6/lib -lX11 \${SYSTEM_LIBS}" @@ -786,7 +786,7 @@ mk_hblibso() (cd $HB_LIB_INSTALL LIBS="" LIBSMT="" - gpm="${HB_GPM_MOUSE}" + gpm="${HB_INC_GPM}" linker_options="-lm" linker_mtoptions="" if [ "${HB_USER_CFLAGS//-DHB_PCRE_REGEX/}" != "${HB_USER_CFLAGS}" ]; then @@ -848,7 +848,7 @@ mk_hblibso() linker_options="$linker_options -lncurses" fi elif [ "${l}" = gtsln ]; then - if [ "${HB_WITHOUT_GTSLN}" != "yes" ]; then + if [ "${HB_INC_SLANG}" != "no" ]; then linker_options="$linker_options -lslang" fi elif [ "${l}" = gtxwc ]; then @@ -858,7 +858,7 @@ mk_hblibso() linker_options="$linker_options -L/usr/X11R6/lib64" linker_options="$linker_options -lX11" fi - if [ "${gpm}" = yes ] && ( [ "${l}" = gtcrs ] || \ + if [ "${gpm}" != no ] && ( [ "${l}" = gtcrs ] || \ [ "${l}" = gtsln ] || [ "${l}" = gttrm ] ); then linker_options="$linker_options -lgpm" gpm="" diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 9e970911af..a26646ae87 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -74,9 +74,9 @@ %define hb_cflag export HB_USER_CFLAGS= %define hb_lflag export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} %{?_with_static:-static}" %define hb_gpm export HB_INC_GPM=%{!?_without_gpm:yes}%{?_without_gpm:no} -%define hb_crs export HB_WITHOUT_GTCRS=%{?_without_gtcrs:yes}%{!?_without_gtcrs:no} -%define hb_sln export HB_WITHOUT_GTSLN=%{?_without_gtsln:yes}%{!?_without_gtsln:no} -%define hb_x11 export HB_WITHOUT_X11=%{?_without_x11:yes}%{!?_without_x11:no} +%define hb_crs export HB_INC_CURSES=%{!?_without_gtcrs:yes}%{?_without_gtcrs:no} +%define hb_sln export HB_INC_SLANG=%{!?_without_gtsln:yes}%{?_without_gtsln:no} +%define hb_x11 export HB_INC_X11=%{!?_without_x11:yes}%{?_without_x11:no} %define hb_bdir export HB_BIN_INSTALL=%{_bindir} %define hb_idir export HB_INC_INSTALL=%{_includedir}/%{name} %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} diff --git a/harbour/mpkg_deb.sh b/harbour/mpkg_deb.sh index 4339f88ae1..47164dddbb 100755 --- a/harbour/mpkg_deb.sh +++ b/harbour/mpkg_deb.sh @@ -32,28 +32,28 @@ done if [ "$HB_COMMERCE" = yes ] then export HB_INC_GPM=no - export HB_WITHOUT_GTSLN=yes + export HB_INC_SLANG=no else if [ -z "$HB_INC_GPM" ] && ( test_reqpkg libgpmg1-dev || test_reqpkg libgpm-dev ) then export HB_INC_GPM=yes fi - if [ -z "$HB_WITHOUT_GTSLN" ] && \ + if [ -z "$HB_INC_SLANG" ] && \ ! test_reqpkg libslang2-dev && \ ! test_reqpkg libslang1-dev then - export HB_WITHOUT_GTSLN=yes + export HB_INC_SLANG=no fi fi -if [ -z "$HB_WITHOUT_GTCRS" ] && ! test_reqpkg libncurses5-dev +if [ -z "$HB_INC_CURSES" ] && ! test_reqpkg libncurses5-dev then - export HB_WITHOUT_GTCRS=yes + export HB_INC_CURSES=no fi -if [ -z "$HB_WITHOUT_X11" ] && ! test_reqpkg libx11-dev +if [ -z "$HB_INC_X11" ] && ! test_reqpkg libx11-dev then - export HB_WITHOUT_X11=yes + export HB_INC_X11=no fi export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnf hbsqlit3 hbtip hbtpathy hbvpdf hbziparc xhb" diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh index 8d03bf1355..086bebb36c 100755 --- a/harbour/mpkg_tgz.sh +++ b/harbour/mpkg_tgz.sh @@ -152,20 +152,20 @@ if [ -z "$HB_INC_GPM" ]; then export HB_INC_GPM fi -if [ -z "${HB_WITHOUT_GTSLN}" ]; then - HB_WITHOUT_GTSLN=yes +if [ -z "${HB_INC_SLANG}" ]; then + HB_INC_SLANG=yes case "$HB_PLATFORM" in linux|bsd|darwin|hpux|sunos) for dir in /usr /usr/local /sw /opt/local do if [ -f ${dir}/include/slang.h ] || \ [ -f ${dir}/include/slang/slang.h ]; then - HB_WITHOUT_GTSLN=no + HB_INC_SLANG=no fi done ;; esac - export HB_WITHOUT_GTSLN + export HB_INC_SLANG fi case "$HB_PLATFORM" in @@ -176,20 +176,20 @@ case "$HB_PLATFORM" in if [ `uname -r | sed "s/\..*//g"` -lt 6 ]; then export HB_NCURSES_FINK=yes fi - [ -z "$HB_WITHOUT_X11" ] && export HB_WITHOUT_X11=yes + [ -z "$HB_INC_X11" ] && export HB_INC_X11=no ;; dos|win) - [ -z "$HB_WITHOUT_X11" ] && export HB_WITHOUT_X11=yes + [ -z "$HB_INC_X11" ] && export HB_INC_X11=no ;; *) - [ -z "$HB_WITHOUT_X11" ] && export HB_WITHOUT_X11=yes + [ -z "$HB_INC_X11" ] && export HB_INC_X11=no ;; esac if [ "$HB_COMMERCE" = yes ] then export HB_INC_GPM=no - export HB_WITHOUT_GTSLN=yes + export HB_INC_SLANG=no fi if [ "${hb_sysdir}" = "yes" ]; then @@ -266,9 +266,9 @@ then sunos) ADD_LIBS="$ADD_LIBS -lcurses" ;; *) ADD_LIBS="$ADD_LIBS -lncurses" ;; esac - [ "${HB_INC_GPM}" = yes ] && ADD_LIBS="$ADD_LIBS -lgpm" - [ "${HB_WITHOUT_GTSLN}" != yes ] && ADD_LIBS="$ADD_LIBS -lslang" - [ "${HB_WITHOUT_X11}" != yes ] && ADD_LIBS="$ADD_LIBS -L/usr/X11R6/$HB_LIBDIRNAME -lX11" + [ "${HB_INC_GPM}" != no ] && ADD_LIBS="$ADD_LIBS -lgpm" + [ "${HB_INC_SLANG}" != no ] && ADD_LIBS="$ADD_LIBS -lslang" + [ "${HB_INC_X11}" != no ] && ADD_LIBS="$ADD_LIBS -L/usr/X11R6/$HB_LIBDIRNAME -lX11" export HB_USER_LDFLAGS="-L${HB_LIB_INSTALL} -l${name} ${ADD_LIBS} ${HB_USER_LDFLAGS}" export HB_USER_PRGFLAGS="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${HB_USER_PRGFLAGS}"