From ba2f0f0cf7b0292b7680d1c27ef2d828240ebabc Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sat, 9 Feb 2008 21:43:06 +0000 Subject: [PATCH] 2008-02-09 22:42 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour.spec * harbour/harbour-ce-spec * harbour/harbour-w32-spec * harbour/make_rpm.sh * harbour/make_rpmce.sh * harbour/make_rpmw32.sh * updated for recent changes in library names * added '--with zlib' build switch * changed '--without odbc' to '--with odbc' * changed '--with adsrdd' to '--with ads' * harbour/debian/control * updated note about supported platforms --- harbour/ChangeLog | 15 +++++++++++++++ harbour/debian/control | 3 ++- harbour/harbour-ce-spec | 26 +++++++++++++++----------- harbour/harbour-w32-spec | 26 +++++++++++++++----------- harbour/harbour.spec | 27 ++++++++++++++++++--------- harbour/make_rpm.sh | 16 ++++++++++------ harbour/make_rpmce.sh | 10 +++++++--- harbour/make_rpmw32.sh | 10 +++++++--- 8 files changed, 89 insertions(+), 44 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 76d05d65ae..5c3d0f997b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,21 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2008-02-09 22:42 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/harbour.spec + * harbour/harbour-ce-spec + * harbour/harbour-w32-spec + * harbour/make_rpm.sh + * harbour/make_rpmce.sh + * harbour/make_rpmw32.sh + * updated for recent changes in library names + * added '--with zlib' build switch + * changed '--without odbc' to '--with odbc' + * changed '--with adsrdd' to '--with ads' + + * harbour/debian/control + * updated note about supported platforms + 2008-02-09 12:50 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/w32/global.cf * removed ' quoting from commands - *sh shells removed them but without diff --git a/harbour/debian/control b/harbour/debian/control index 93e59096fe..68eeee7f02 100644 --- a/harbour/debian/control +++ b/harbour/debian/control @@ -14,7 +14,8 @@ Description: Compiler for the xBase superset language often referred to as Clipp compiler CA-Clipper). . Harbour is a cross platform compiler and is known to compile and run on - MS-DOS, MS-Windows, OS/2 and GNU/Linux. + MS-DOS, MS-Windows, OS/2 and GNU/Linux, *BSD systems, MAC-OSX, HP-UX and + other *nixes . The main advantage Harbour has over other Clipper compilers is that it is free software. Harbour also attempts to remove some of the limits diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 472808497a..ca6a2c4f0c 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -15,8 +15,9 @@ # --with pgsql - build pgsql lib # --with gd - build gd lib # --with allegro - build GTALLEG - Allegro based GT driver -# --with adsrdd - build ADS RDD -# --without odbc - do not build odbc lib +# --with ads - build ADS RDD +# --with zlib - build zlib and minizip wrapper +# --with odbc - build odbc lib # --without nf - do not build nanforum lib ###################################################################### @@ -117,7 +118,7 @@ export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/harbour export HB_LIB_INSTALL=%{_libdir}/%{name} export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="%{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" make -r @@ -148,7 +149,7 @@ export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/harbour export HB_LIB_INSTALL=%{_libdir}/%{name} export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="%{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL export _DEFAULT_INC_DIR=$HB_INC_INSTALL @@ -163,9 +164,11 @@ mkdir -p $HB_LIB_INSTALL make -r -i install -[ "%{?_without_odbc:1}" ] && rm -f $HB_LIB_INSTALL/libhbodbc.a +[ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a [ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a -[ "%{?_with_adsrdd:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a +[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a +[ "%{?_with_zlib:1}" ] || rm -f $HB_LIB_INSTALL/libhbzlib.a +[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a # Keep the size of the libraries to a minimim. ${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* @@ -306,7 +309,9 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbcplr.a %{_libdir}/%{name}/libhbdebug.a %{_libdir}/%{name}/libfm.a -%{_libdir}/%{name}/librdd*.a +%{_libdir}/%{name}/librddfpt.a +%{_libdir}/%{name}/librddcdx.a +%{_libdir}/%{name}/librddntx.a %{_libdir}/%{name}/libgt*.a %{_libdir}/%{name}/libhblang.a %{_libdir}/%{name}/libhbmacro.a @@ -322,21 +327,20 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbmainwin.a %{_libdir}/%{name}/libhbusrrdd.a -%{?_with_adsrdd: %{_libdir}/%{name}/librddads.a} -%{!?_without_odbc: %{_libdir}/%{name}/libhbodbc.a} %{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} +%{?_with_ads: %{_libdir}/%{name}/librddads.a} +%{?_with_zlib: %{_libdir}/%{name}/libhbzlib.a} +%{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} %{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} %{?_with_gd: %{_libdir}/%{name}/libhbgd.a} %{_libdir}/%{name}/libhbbtree.a %{_libdir}/%{name}/libhbmisc.a %{_libdir}/%{name}/libhbct.a -#%{_libdir}/%{name}/libhbzlib.a %{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a %{_libdir}/%{name}/librddado.a %{_libdir}/%{name}/libhbw32.a -%{_libdir}/%{name}/libgtwvg.a %{_libdir}/%{name}/libhbgt.a %{_libdir}/%{name}/libhbbmcdx.a %{_libdir}/%{name}/libhbclipsm.a diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index f7b30edc01..88ea16f7c4 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -15,8 +15,9 @@ # --with pgsql - build pgsql lib # --with gd - build gd lib # --with allegro - build GTALLEG - Allegro based GT driver -# --with adsrdd - build ADS RDD -# --without odbc - do not build odbc lib +# --with ads - build ADS RDD +# --with zlib - build zlib and minizip wrapper +# --with odbc - build odbc lib # --without nf - do not build nanforum lib ###################################################################### @@ -117,7 +118,7 @@ export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/harbour export HB_LIB_INSTALL=%{_libdir}/%{name} export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="%{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" make -r @@ -148,7 +149,7 @@ export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/harbour export HB_LIB_INSTALL=%{_libdir}/%{name} export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="%{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL export _DEFAULT_INC_DIR=$HB_INC_INSTALL @@ -163,9 +164,11 @@ mkdir -p $HB_LIB_INSTALL make -r -i install -[ "%{?_without_odbc:1}" ] && rm -f $HB_LIB_INSTALL/libhbodbc.a +[ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a [ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a -[ "%{?_with_adsrdd:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a +[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a +[ "%{?_with_zlib:1}" ] || rm -f $HB_LIB_INSTALL/libhbzlib.a +[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a # Keep the size of the libraries to a minimim. ${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* @@ -306,7 +309,9 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbcplr.a %{_libdir}/%{name}/libhbdebug.a %{_libdir}/%{name}/libfm.a -%{_libdir}/%{name}/librdd*.a +%{_libdir}/%{name}/librddfpt.a +%{_libdir}/%{name}/librddcdx.a +%{_libdir}/%{name}/librddntx.a %{_libdir}/%{name}/libgt*.a %{_libdir}/%{name}/libhblang.a %{_libdir}/%{name}/libhbmacro.a @@ -321,21 +326,20 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbmainstd.a %{_libdir}/%{name}/libhbusrrdd.a -%{?_with_adsrdd: %{_libdir}/%{name}/librddads.a} -%{!?_without_odbc: %{_libdir}/%{name}/libhbodbc.a} %{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} +%{?_with_ads: %{_libdir}/%{name}/librddads.a} +%{?_with_zlib: %{_libdir}/%{name}/libhbzlib.a} +%{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} %{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} %{?_with_gd: %{_libdir}/%{name}/libhbgd.a} %{_libdir}/%{name}/libhbbtree.a %{_libdir}/%{name}/libhbmisc.a %{_libdir}/%{name}/libhbct.a -#%{_libdir}/%{name}/libhbzlib.a %{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a %{_libdir}/%{name}/librddado.a %{_libdir}/%{name}/libhbw32.a -%{_libdir}/%{name}/libgtwvg.a %{_libdir}/%{name}/libhbgt.a %{_libdir}/%{name}/libhbbmcdx.a %{_libdir}/%{name}/libhbclipsm.a diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 87d8a299f1..623ae0470c 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -17,11 +17,12 @@ # --with pgsql - build pgsql lib # --with pgsql4 - build pgsql4 lib # --with gd - build gd lib -# --with odbc - build odbc lib # --with allegro - build GTALLEG - Allegro based GT driver -# --with adsrdd - build ADS RDD -# --without gpl - do not build libs which needs GPL 3-rd party code +# --with ads - build ADS RDD +# --with zlib - build zlib and minizip wrapper +# --with odbc - build odbc lib # --without nf - do not build nanforum lib +# --without gpl - do not build libs which needs GPL 3-rd party code # --without x11 - do not build GTXWC # --without gpm - build GTTRM, GTSLN and GTCRS without GPM support # --without gtsln - do not build GTSLN @@ -78,7 +79,7 @@ %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} %define hb_opt export HB_GTALLEG=%{?_with_allegro:yes} %define hb_cmrc export HB_COMMERCE=%{?_without_gpl:yes} -%define hb_ctrb export HB_CONTRIBLIBS="%{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +%define hb_ctrb export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" %define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_opt} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org @@ -242,7 +243,10 @@ case "`uname -m`" in ;; esac -[ "%{?_with_odbc:1}" ] || rm -fR contrib/odbc +[ "%{?_with_odbc:1}" ] || rm -fR contrib/hbodbc +[ "%{?_with_zlib:1}" ] || rm -fR contrib/hbzlib +[ "%{?_with_ads:1}" ] || rm -fR contrib/rddads +[ "%{?_without_nf:1}" ] && rm -fR contrib/hbnf make -r @@ -274,9 +278,12 @@ mkdir -p $HB_LIB_INSTALL make -r -i install -[ "%{?_without_gtsln:1}" ] && rm -f $HB_LIB_INSTALL/libgtsln.a [ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a [ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a +[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a +[ "%{?_with_zlib:1}" ] || rm -f $HB_LIB_INSTALL/libhbzlib.a +[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a +[ "%{?_without_gtsln:1}" ] && rm -f $HB_LIB_INSTALL/libgtsln.a # Keep the size of the binaries to a minimim. strip $HB_BIN_INSTALL/harbour @@ -489,7 +496,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbcplr.a %{_libdir}/%{name}/libhbdebug.a %{_libdir}/%{name}/libfm.a -%{_libdir}/%{name}/librdd*.a +%{_libdir}/%{name}/librddfpt.a +%{_libdir}/%{name}/librddcdx.a +%{_libdir}/%{name}/librddntx.a %{_libdir}/%{name}/libgt*.a %{_libdir}/%{name}/libhblang.a %{_libdir}/%{name}/libhbmacro.a @@ -507,7 +516,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %dir %{_libdir}/%{name} %{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} -%{?_with_adsrdd: %{_libdir}/%{name}/librddads.a} +%{?_with_ads: %{_libdir}/%{name}/librddads.a} +%{?_with_zlib: %{_libdir}/%{name}/libhbzlib.a} %{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} %{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} @@ -516,7 +526,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbbtree.a %{_libdir}/%{name}/libhbmisc.a %{_libdir}/%{name}/libhbct.a -#%{_libdir}/%{name}/libhbzlib.a %{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a %{_libdir}/%{name}/libhbgt.a diff --git a/harbour/make_rpm.sh b/harbour/make_rpm.sh index 37c58d1f58..b48649e658 100755 --- a/harbour/make_rpm.sh +++ b/harbour/make_rpm.sh @@ -18,7 +18,8 @@ # --with gd - build gd lib # --with odbc - build odbc lib # --with allegro - build GTALLEG - Allegro based GT driver -# --with adsrdd - build ADS RDD +# --with ads - build ADS RDD +# --with zlib - build zlib and minizip wrapper # --without gpl - do not build libs which needs GPL 3-rd party code # --without nf - do not build nanforum lib # --without x11 - do not build GTXWC @@ -107,6 +108,14 @@ if test_reqrpm "allegro-devel" then INST_PARAM="${INST_PARAM} --with allegro" fi +if [ -f /usr/include/zlib.h ] || test_reqrpm "zlib-devel" +then + INST_PARAM="${INST_PARAM} --with zlib" +fi +if [ -f /usr/local/ads/acesdk/ace.h ] || [ -f ${HOME}/ads/acesdk/ace.h ] +then + INST_PARAM="${INST_PARAM} --with ads" +fi if [ "${HB_COMMERCE}" = "yes" ] then INST_PARAM="${INST_PARAM} --without gpl" @@ -119,11 +128,6 @@ if ! test_reqrpm "XFree86-devel" then INST_PARAM="${INST_PARAM} --without X11" fi -if [ -f /usr/local/ads/acesdk/ace.h ] || - [ -f ${HOME}/ads/acesdk/ace.h ] -then - INST_PARAM="${INST_PARAM} --with adsrdd" -fi TOINST_LST="" for i in ${NEED_RPM} diff --git a/harbour/make_rpmce.sh b/harbour/make_rpmce.sh index 0de042519e..43ac40c393 100755 --- a/harbour/make_rpmce.sh +++ b/harbour/make_rpmce.sh @@ -16,7 +16,7 @@ # --with pgsql - build pgsql lib # --with gd - build gd lib # --with allegro - build GTALLEG - Allegro based GT driver -# --with adsrdd - build ADS RDD +# --with ads - build ADS RDD # --without odbc - do not build odbc lib # --without nf - do not build nanforum lib ###################################################################### @@ -67,10 +67,14 @@ do shift done -if [ -f /usr/local/ads/acesdk/ace.h ] || +if [ -f /usr/local/ads/acesdk/ace.h ] || \ [ -f ${HOME}/ads/acesdk/ace.h ] then - INST_PARAM="${INST_PARAM} --with adsrdd" + INST_PARAM="${INST_PARAM} --with ads" +fi +if [ -f /opt/mingw32ce/include/zlib.h ] +then + INST_PARAM="${INST_PARAM} --with zlib" fi TOINST_LST="" diff --git a/harbour/make_rpmw32.sh b/harbour/make_rpmw32.sh index 64297e75b7..d3000477e6 100755 --- a/harbour/make_rpmw32.sh +++ b/harbour/make_rpmw32.sh @@ -16,7 +16,7 @@ # --with pgsql - build pgsql lib # --with gd - build gd lib # --with allegro - build GTALLEG - Allegro based GT driver -# --with adsrdd - build ADS RDD +# --with ads - build ADS RDD # --without odbc - do not build odbc lib # --without nf - do not build nanforum lib ###################################################################### @@ -89,10 +89,14 @@ do shift done -if [ -f /usr/local/ads/acesdk/ace.h ] || +if [ -f /usr/local/ads/acesdk/ace.h ] || \ [ -f ${HOME}/ads/acesdk/ace.h ] then - INST_PARAM="${INST_PARAM} --with adsrdd" + INST_PARAM="${INST_PARAM} --with ads" +fi +if [ -f ${MINGW_DIR}/include/zlib.h ] +then + INST_PARAM="${INST_PARAM} --with zlib" fi TOINST_LST=""