From 73bec3a94a0ac3a1d7cf2faaaa3c52b4e3937b37 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 18 Sep 2009 22:30:44 +0000 Subject: [PATCH] 2009-09-19 00:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * harbour-win-spec * harbour-wce-spec * Makefile * source/pp/Makefile * source/Makefile * config/global.mk * Renamed HB_HOST_BUILD to HB_BUILD_PART. Values 'yes' changed to compiler. + Documented HB_BUILD_PART in INSTALL. * mpkg_deb.sh * mpkg_rpm.sh * mpkg_rpm_win.sh * mpkg_rpm_wce.sh ! Changed bin/pack_src.sh to mpkg_src.sh. --- harbour/ChangeLog | 18 ++++++++++++++++++ harbour/INSTALL | 2 ++ harbour/Makefile | 30 +++++++++++++++--------------- harbour/config/global.mk | 13 ++++++------- harbour/harbour-wce-spec | 6 +++--- harbour/harbour-win-spec | 6 +++--- harbour/mpkg_deb.sh | 6 +++--- harbour/mpkg_rpm.sh | 6 +++--- harbour/mpkg_rpm_wce.sh | 6 +++--- harbour/mpkg_rpm_win.sh | 6 +++--- harbour/source/Makefile | 4 ++-- harbour/source/pp/Makefile | 2 +- 12 files changed, 62 insertions(+), 43 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 13d6ca7fe1..d7fb29a4e1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-19 00:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * harbour-win-spec + * harbour-wce-spec + * Makefile + * source/pp/Makefile + * source/Makefile + * config/global.mk + * Renamed HB_HOST_BUILD to HB_BUILD_PART. Values 'yes' changed + to compiler. + + Documented HB_BUILD_PART in INSTALL. + + * mpkg_deb.sh + * mpkg_rpm.sh + * mpkg_rpm_win.sh + * mpkg_rpm_wce.sh + ! Changed bin/pack_src.sh to mpkg_src.sh. + 2009-09-19 00:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/common/hbgete.c * harbour/source/common/hbprintf.c diff --git a/harbour/INSTALL b/harbour/INSTALL index ef79de9d37..4971af8f73 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -472,6 +472,8 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR - HB_BUILD_MODE=[cpp|c] Changes default build mode to C++ or C. Default: c, except for msvc* and watcom compilers, where it's cpp. + - HB_BUILD_PART= + [all|compiler|lib] Build only specific part of Harbour. - HB_BUILD_EXTDEF=no Controls autodetection of external components on default systems locations. Default: yes - HB_CONTRIBLIBS=no Don't build any contrib libraries. Default: yes diff --git a/harbour/Makefile b/harbour/Makefile index faecc0b397..6e4c7922b6 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -4,26 +4,26 @@ ROOT := ./ -ifeq ($(HB_HOST_BUILD),yes) +ifeq ($(HB_BUILD_PART),compiler) -DIRS := \ - source \ + DIRS := \ + source \ else -ifeq ($(HB_HOST_BUILD),lib) - HB_UTIL_DIR := -else - HB_UTIL_DIR := utils{source} -endif + ifeq ($(HB_BUILD_PART),lib) + HB_UTIL_DIR := + else + HB_UTIL_DIR := utils{source} + endif -DIRS := \ - doc \ - include \ - external \ - source{external} \ - $(HB_UTIL_DIR) \ - contrib{source} \ + DIRS := \ + doc \ + include \ + external \ + source{external} \ + $(HB_UTIL_DIR) \ + contrib{source} \ endif diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 3020c15136..2e5a5577ee 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -241,7 +241,6 @@ ifeq ($(HB_INIT_DONE),) ifneq ($(MAKE_381),) # Some additional ones to be given a standard name: - # HB_HOST_BUILD [yes|all|lib] -> ? (yes = build harbour/hbpp bin only, all = default, lib = build libs only) # HB_DB_DRVEXT -> - # HB_COMMERCE -> ? # HB_BIN_COMPILE -> HB_BUILD_BIN_DIR @@ -539,8 +538,8 @@ ifeq ($(HB_COMPILER),) HB_PLATFORM := win export HB_TOOLS_PREF := hbw export HB_BUILD_EXTDEF := no - ifneq ($(HB_HOST_BUILD),all) - HB_HOST_BUILD := lib + ifneq ($(HB_BUILD_PART),all) + HB_BUILD_PART := lib endif else $(error ! Harbour build could not find mingw32 cross-compiler. Please install it, or point HB_CCPATH/HB_CCPREFIX environment variables to it) @@ -601,8 +600,8 @@ ifeq ($(HB_COMPILER),) HB_PLATFORM := wce export HB_TOOLS_PREF := hbce export HB_BUILD_EXTDEF := no - ifneq ($(HB_HOST_BUILD),all) - HB_HOST_BUILD := lib + ifneq ($(HB_BUILD_PART),all) + HB_BUILD_PART := lib endif else $(error ! Harbour build could not find cegcc cross-compiler. Please install it to /opt/mingw32ce, or point HB_CCPATH/HB_CCPREFIX environment variables to it) @@ -639,8 +638,8 @@ ifeq ($(HB_COMPILER),) HB_PLATFORM := dos export HB_TOOLS_PREF := hbce export HB_BUILD_EXTDEF := no - ifneq ($(HB_HOST_BUILD),all) - HB_HOST_BUILD := lib + ifneq ($(HB_BUILD_PART),all) + HB_BUILD_PART := lib endif else $(error ! Harbour build could not find djgpp cross-compiler. Please install it to /usr/local/i586-pc-msdosdjgpp, or point HB_CCPATH/HB_CCPREFIX environment variables to it) diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index f106d64a05..638535357f 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -86,13 +86,13 @@ rm -fR $RPM_BUILD_ROOT %build -export HB_HOST_BUILD=yes +export HB_BUILD_PART=compiler export HB_PLATFORM=linux export HB_COMPILER=gcc export HB_USER_CFLAGS= make %{?_smp_mflags} -export HB_HOST_BUILD=lib +export HB_BUILD_PART=lib export HB_PLATFORM=wce export HB_COMPILER=mingwarm @@ -121,7 +121,7 @@ make %{?_smp_mflags} # Install harbour itself. -export HB_HOST_BUILD=lib +export HB_BUILD_PART=lib export HB_PLATFORM=wce export HB_COMPILER=mingwarm diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index 5906e03f25..3e335bcfad 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -86,13 +86,13 @@ rm -fR $RPM_BUILD_ROOT %build -export HB_HOST_BUILD=yes +export HB_BUILD_PART=compiler export HB_PLATFORM=linux export HB_COMPILER=gcc export HB_USER_CFLAGS= make %{?_smp_mflags} -export HB_HOST_BUILD=lib +export HB_BUILD_PART=lib export HB_PLATFORM=win export HB_COMPILER=mingw @@ -121,7 +121,7 @@ make %{?_smp_mflags} # Install harbour itself. -export HB_HOST_BUILD=lib +export HB_BUILD_PART=lib export HB_PLATFORM=win export HB_COMPILER=mingw diff --git a/harbour/mpkg_deb.sh b/harbour/mpkg_deb.sh index cde00692b8..99c1f69bcc 100755 --- a/harbour/mpkg_deb.sh +++ b/harbour/mpkg_deb.sh @@ -120,15 +120,15 @@ fi if [ -z "${TOINST_LST}" ] || [ "$1" = "--force" ] then - . ./bin/pack_src.sh + . ./mpkg_src.sh stat="$?" if [ -z "${hb_filename}" ] then - echo "The script ./bin/pack_src.sh doesn't set archive name to \${hb_filename}" + echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}" exit 1 elif [ "${stat}" != 0 ] then - echo "Error during packing the sources in ./bin/pack_src.sh" + echo "Error during packing the sources in ./mpkg_src.sh" exit 1 elif [ -f ${hb_filename} ] then diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh index feeecbfd2b..09b2dc9315 100755 --- a/harbour/mpkg_rpm.sh +++ b/harbour/mpkg_rpm.sh @@ -156,15 +156,15 @@ done if [ -z "${TOINST_LST}" ] || [ "${FORCE}" = "yes" ] then - . ./bin/pack_src.sh + . ./mpkg_src.sh stat="$?" if [ -z "${hb_filename}" ] then - echo "The script ./bin/pack_src.sh doesn't set archive name to \${hb_filename}" + echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}" exit 1 elif [ "${stat}" != 0 ] then - echo "Error during packing the sources in ./bin/pack_src.sh" + echo "Error during packing the sources in ./mpkg_src.sh" exit 1 elif [ -f ${hb_filename} ] then diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/mpkg_rpm_wce.sh index 7ce41e8849..ad447dae8d 100755 --- a/harbour/mpkg_rpm_wce.sh +++ b/harbour/mpkg_rpm_wce.sh @@ -84,15 +84,15 @@ done if [ -z "${TOINST_LST}" ] || [ "${FORCE}" = "yes" ] then - . ./bin/pack_src.sh + . ./mpkg_src.sh stat="$?" if [ -z "${hb_filename}" ] then - echo "The script ./bin/pack_src.sh doesn't set archive name to \${hb_filename}" + echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}" exit 1 elif [ "${stat}" != 0 ] then - echo "Error during packing the sources in ./bin/pack_src.sh" + echo "Error during packing the sources in ./mpkg_src.sh" exit 1 elif [ -f ${hb_filename} ] then diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh index 7f8903a4a7..2c13978458 100755 --- a/harbour/mpkg_rpm_win.sh +++ b/harbour/mpkg_rpm_win.sh @@ -106,15 +106,15 @@ done if [ -z "${TOINST_LST}" ] || [ "${FORCE}" = "yes" ] then - . ./bin/pack_src.sh + . ./mpkg_src.sh stat="$?" if [ -z "${hb_filename}" ] then - echo "The script ./bin/pack_src.sh doesn't set archive name to \${hb_filename}" + echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}" exit 1 elif [ "${stat}" != 0 ] then - echo "Error during packing the sources in ./bin/pack_src.sh" + echo "Error during packing the sources in ./mpkg_src.sh" exit 1 elif [ -f ${hb_filename} ] then diff --git a/harbour/source/Makefile b/harbour/source/Makefile index d2a95648d6..646d49147c 100644 --- a/harbour/source/Makefile +++ b/harbour/source/Makefile @@ -6,7 +6,7 @@ ROOT := ../ include $(TOP)$(ROOT)config/global.mk -ifeq ($(HB_HOST_BUILD),yes) +ifeq ($(HB_BUILD_PART),compiler) DIRS := \ common \ @@ -115,7 +115,7 @@ else export DYNNAME_POST endif - ifeq ($(HB_HOST_BUILD),lib) + ifeq ($(HB_BUILD_PART),lib) HB_COMP_DIR := HB_COMP_REF := else diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile index 60982c7809..8f307a58b4 100644 --- a/harbour/source/pp/Makefile +++ b/harbour/source/pp/Makefile @@ -32,7 +32,7 @@ pptable.c : hbpp$(BIN_EXT) $(HB_HOST_BIN_DIR)/hbpp$(HB_HOST_BIN_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c$(TOP)$(ROOT) -v$(HB_VERHEADER) -@$(RM) hbpp$(OBJ_EXT) -ifneq ($(HB_HOST_BUILD),lib) +ifneq ($(HB_BUILD_PART),lib) ifneq ($(HB_BIN_INSTALL),) INSTALL_FILES := $(BIN_DIR)/hbpp$(BIN_EXT) INSTALL_DIR := $(HB_BIN_INSTALL)