From 19ba2898bc31c87ac3ffeff1b5fbcd111da2cdfb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 29 Nov 2009 13:24:25 +0000 Subject: [PATCH] 2009-11-29 14:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * harbour.spec * mpkg_rpm.sh * Moved mpkg_rpm*.sh cmdline options description to INSTALL. At the same time some inconsistencies were fixed and from now on it should be updated in less copies. Still, there different option list for win/wce cross-builds and regular builds. (some of these may not be relevant anymore as Przemek just deleted some of these option, which is an even better solution.) Maybe the same could be done for the rest of them? --- harbour/ChangeLog | 13 +++++++++++++ harbour/INSTALL | 27 +++++++++++++++++++++++++-- harbour/harbour.spec | 21 --------------------- harbour/mpkg_rpm.sh | 20 -------------------- 4 files changed, 38 insertions(+), 43 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0570dfd752..ee34bb854d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,19 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-29 14:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * harbour.spec + * mpkg_rpm.sh + * Moved mpkg_rpm*.sh cmdline options description to INSTALL. + At the same time some inconsistencies were fixed and from + now on it should be updated in less copies. Still, there + different option list for win/wce cross-builds and regular + builds. (some of these may not be relevant anymore as Przemek + just deleted some of these option, which is an even better + solution.) + Maybe the same could be done for the rest of them? + 2009-11-29 14:06 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour-win-spec * harbour/harbour-wce-spec diff --git a/harbour/INSTALL b/harbour/INSTALL index 9e9b48467e..3615ca49ce 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -222,9 +222,32 @@ HARBOUR for native build: $ ./mpkg_rpm.sh - for Windows cross-build: + + You can fine-tune the build with these options: + --with static - link all binaries with static libs + --with mysql - build components dependent on mysql (hbmysql, sddmy) + --with pgsql - build components dependent on pgsql (hbpgsql, sddpg) + --with gd - build components dependent on gd (hbgd) + --with allegro - build components dependent on allegro (gtalleg) + --with ads - build components dependent on ads (rddads) + --with odbc - build components dependent on odbc (hbodbc, sddodbc) + --with firebird - build componetns dependent on firebird (hbfbird, sddfb) + --with curl - build componetns dependent on libcurl (hbcurl) + --with localzlib - build local copy of zlib library + --with localpcre - build local copy of pcre library + --with qt - build componetns dependent on qt (hbqt, hbxbp) + --without gpllib - do not build components which needs GPL 3rd party code (HB_COMMERCE) + --without x11 - build componetns dependent on x11 (gtxwc) + --without gpm - build gttrm, gtsln and gtcrs without gpm support + --without curses - build componetns dependent on curses (gtcrs) + --without slang - build componetns dependent on slang (gtsln) + + Binary .rpm on Linux (cross-builds) + ----------------------------------- + + for Windows: $ ./mpkg_rpm_win.sh - for Windows CE cross-build: + for Windows CE: $ ./mpkg_rpm_wce.sh Binary .zip + .exe on Windows for all targets (except Linux) diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 282f34f0f8..7e8018a0c8 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -10,27 +10,6 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -###################################################################### -# Conditional build: -# --with static - link all binaries with static libs -# --with mysql - build hbmysql lib and sddmy for sqlrdd -# --with pgsql - build hbpgsql lib and sddpg for sqlrdd -# --with firebird - build hbfbird lib and sddfb for sqlrdd -# --with odbc - build hbodbc lib and sddodbc for sqlrdd -# --with gd - build hbgd lib -# --with ads - build rddads -# --with curl - build hbcurl lib -# --with localzlib - build local copy of zlib library -# --with localpcre - build local copy of pcre library -# --with qt - build hbqt and hbxbp libs -# --without hbnf - do not build hbnf lib (nanforum lib) -# --without gpllib - do not build libs which needs GPL 3rd party code -# --without x11 - do not build gtxwc -# --without gpm - build gttrm, gtsln and gtcrs without gpm support -# --without curses - do not build gtcrs -# --without slang - do not build gtsln -###################################################################### - ###################################################################### ## Definitions. ###################################################################### diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh index 91ffba994a..efb5131fb6 100755 --- a/harbour/mpkg_rpm.sh +++ b/harbour/mpkg_rpm.sh @@ -11,26 +11,6 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -###################################################################### -# Conditional build: -# --with static - link all binaries with static libs -# --with mysql - build hbmysql lib and sddmy for sqlrdd -# --with pgsql - build hbpgsql lib and sddpg for sqlrdd -# --with firebird - build hbfbird lib and sddfb for sqlrdd -# --with odbc - build hbodbc lib and sddodbc for sqlrdd -# --with ads - build rddads -# --with gd - build hbgd lib -# --with qt - build hbqt and hbxbp libs -# --with allegro - build gtalleg - Allegro based GT driver -# --with localzlib - build local copy of zlib library -# --with localpcre - build local copy of pcre library -# --without gpllib - do not build libs which needs GPL 3rd party code -# --without x11 - do not build gtxwc -# --without gpm - build gttrm, gtsln and gtcrs without gpm support -# --without curses - do not build gtcrs -# --without slang - do not build gtsln -###################################################################### - test_reqrpm() { rpm -q --whatprovides "$1" &> /dev/null