2009-09-20 22:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* harbour-win-spec * harbour-wce-spec * INSTALL * bin/postinst.sh * Makefile * source/pp/Makefile * source/Makefile * config/global.mk * HB_BUILD_PART -> HB_BUILD_PARTS (simple rename) + HB_BUILD_STRIP added. It's dummy yet. Support will have to be added on the compiler level and removed from postinst phase.
2009-09-20 20:41:51 +00:00
parent ec1e80e140
commit 9dfc53ab9f
9 changed files with 42 additions and 22 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,19 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-09-20 22:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * harbour-win-spec
+  * harbour-wce-spec
+  * INSTALL
+  * bin/postinst.sh
+  * Makefile
+  * source/pp/Makefile
+  * source/Makefile
+  * config/global.mk
+    * HB_BUILD_PART -> HB_BUILD_PARTS (simple rename)
+    + HB_BUILD_STRIP added. It's dummy yet. Support will have to
+      be added on the compiler level and removed from postinst phase.
+
 2009-09-20 18:12 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/harbour-win-spec
  * harbour/harbour-wce-spec
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -527,13 +527,16 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
                               (for Windows targets created from Windows NT
                               shells only)
   - HB_BUILD_DEBUG=yes        Create a debug build. Default: no
+   - HB_BUILD_STRIP=
+         [all|bin|lib|no]      Strips symbols and debug information from binaries.
+                               Default: no
   - HB_BUILD_OPTIM=no         Enable C compiler optimizations. Default: yes
   - HB_BUILD_UNICODE=yes      Create Unicode build (on Windows/Windows CE).
                               Default: no
   - 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=
+   - HB_BUILD_PARTS=
         [all|compiler|lib]    Build only specific part of Harbour.
   - HB_BUILD_EXTDEF=no        Controls autodetection of external components
                               on default systems locations. Default: yes
--- a/harbour/Makefile
+++ b/harbour/Makefile
@@ -4,14 +4,14 @@

 ROOT := ./

-ifeq ($(HB_BUILD_PART),compiler)
+ifeq ($(HB_BUILD_PARTS),compiler)

   DIRS := \
      source \

 else

-   ifeq ($(HB_BUILD_PART),lib)
+   ifeq ($(HB_BUILD_PARTS),lib)
      HB_UTIL_DIR :=
   else
      HB_UTIL_DIR := utils{source}
--- a/harbour/bin/postinst.sh
+++ b/harbour/bin/postinst.sh
@@ -42,11 +42,11 @@ fi

 # Keep the size of the binaries to a minimim.
 if [ -f $HB_BIN_INSTALL/harbour${HB_HOST_BIN_EXT} ]; then
-   ${HB_CCPREFIX}strip ${HB_BIN_INSTALL}/harbour${HB_HOST_BIN_EXT}
+   ${HB_CCPATH}${HB_CCPREFIX}strip ${HB_BIN_INSTALL}/harbour${HB_HOST_BIN_EXT}
 fi
 if [ "$HB_PLATFORM" != "hpux" ]; then
   # Keep the size of the libraries to a minimim, but don't try to strip symlinks.
-   ${HB_CCPREFIX}strip -S `find $HB_LIB_INSTALL -type f -maxdepth 1`
+   ${HB_CCPATH}${HB_CCPREFIX}strip -S `find $HB_LIB_INSTALL -maxdepth 1 -type f`
 fi

 chmod 644 $HB_INC_INSTALL/*
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -253,6 +253,7 @@ ifeq ($(HB_INIT_DONE),)
      #   HB_INC_COMPILE              -> - (HB_BUILD_INC_DIR)
      #   HB_DIR_*                    -> HB_LIBDIR_* ? (only used for implib and a few .hbm files)
      #   HB_DLLIBS                   -> (only used in one location, so it's a local matter)
+      #   HB_TOOLS_PREF               -> ?
      # Macros:
      #   -DHB_GT_LIB=

@@ -306,6 +307,9 @@ ifeq ($(HB_INIT_DONE),)
      ifneq ($(HB_BUILD_DEBUG),)
         $(info ! HB_BUILD_DEBUG: $(HB_BUILD_DEBUG))
      endif
+      ifneq ($(HB_BUILD_STRIP),)
+         $(info ! HB_BUILD_STRIP: $(HB_BUILD_STRIP))
+      endif
      ifneq ($(HB_BUILD_OPTIM),)
         $(info ! HB_BUILD_OPTIM: $(HB_BUILD_OPTIM))
      endif
@@ -318,8 +322,8 @@ ifeq ($(HB_INIT_DONE),)
      ifneq ($(HB_BUILD_EXTDEF),)
         $(info ! HB_BUILD_EXTDEF: $(HB_BUILD_EXTDEF))
      endif
-      ifneq ($(HB_BUILD_PART),)
-         $(info ! HB_BUILD_PART: $(HB_BUILD_PART))
+      ifneq ($(HB_BUILD_PARTS),)
+         $(info ! HB_BUILD_PARTS: $(HB_BUILD_PARTS))
      endif
      ifneq ($(HB_CONTRIBLIBS),)
         $(info ! HB_CONTRIBLIBS: $(HB_CONTRIBLIBS))
@@ -558,8 +562,8 @@ ifeq ($(HB_COMPILER),)
                  export HB_TOOLS_PREF := hbw
               endif
               export HB_BUILD_EXTDEF := no
-               ifneq ($(HB_BUILD_PART),all)
-                  HB_BUILD_PART := lib
+               ifneq ($(HB_BUILD_PARTS),all)
+                  HB_BUILD_PARTS := 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)
@@ -622,8 +626,8 @@ ifeq ($(HB_COMPILER),)
                     export HB_TOOLS_PREF := hbce
                  endif
                  export HB_BUILD_EXTDEF := no
-                  ifneq ($(HB_BUILD_PART),all)
-                     HB_BUILD_PART := lib
+                  ifneq ($(HB_BUILD_PARTS),all)
+                     HB_BUILD_PARTS := 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)
@@ -662,8 +666,8 @@ ifeq ($(HB_COMPILER),)
                        export HB_TOOLS_PREF := hbdos
                     endif
                     export HB_BUILD_EXTDEF := no
-                     ifneq ($(HB_BUILD_PART),all)
-                        HB_BUILD_PART := lib
+                     ifneq ($(HB_BUILD_PARTS),all)
+                        HB_BUILD_PARTS := 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)
--- a/harbour/harbour-wce-spec
+++ b/harbour/harbour-wce-spec
@@ -86,13 +86,13 @@ rm -fR $RPM_BUILD_ROOT

 %build

-export HB_BUILD_PART=compiler
+export HB_BUILD_PARTS=compiler
 export HB_PLATFORM=linux
 export HB_COMPILER=gcc
 make %{?_smp_mflags}
 unset HB_COMPILER

-export HB_BUILD_PART=lib
+export HB_BUILD_PARTS=lib
 export HB_PLATFORM=wce

 export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
@@ -108,7 +108,7 @@ make %{?_smp_mflags}

 # Install harbour itself.

-export HB_BUILD_PART=lib
+export HB_BUILD_PARTS=lib
 export HB_PLATFORM=wce
 unset HB_COMPILER

--- a/harbour/harbour-win-spec
+++ b/harbour/harbour-win-spec
@@ -86,13 +86,13 @@ rm -fR $RPM_BUILD_ROOT

 %build

-export HB_BUILD_PART=compiler
+export HB_BUILD_PARTS=compiler
 export HB_PLATFORM=linux
 export HB_COMPILER=gcc
 make %{?_smp_mflags}
 unset HB_COMPILER

-export HB_BUILD_PART=lib
+export HB_BUILD_PARTS=lib
 export HB_PLATFORM=win

 export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
@@ -108,7 +108,7 @@ make %{?_smp_mflags}

 # Install harbour itself.

-export HB_BUILD_PART=lib
+export HB_BUILD_PARTS=lib
 export HB_PLATFORM=win
 unset HB_COMPILER

--- a/harbour/source/Makefile
+++ b/harbour/source/Makefile
@@ -6,7 +6,7 @@ ROOT := ../

 include $(TOP)$(ROOT)config/global.mk

-ifeq ($(HB_BUILD_PART),compiler)
+ifeq ($(HB_BUILD_PARTS),compiler)

   DIRS := \
      common \
@@ -74,7 +74,7 @@ else
      export DYNDIRLIST_BASE
   endif

-   ifeq ($(HB_BUILD_PART),lib)
+   ifeq ($(HB_BUILD_PARTS),lib)
      HB_COMP_DIR :=
      HB_COMP_REF :=
   else
--- 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_BUILD_PART),lib)
+ifneq ($(HB_BUILD_PARTS),lib)
   ifneq ($(HB_BIN_INSTALL),)
      INSTALL_FILES := $(BIN_DIR)/hbpp$(BIN_EXT)
      INSTALL_DIR := $(HB_BIN_INSTALL)