2009-09-10 13:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* harbour-win-spec
  * harbour-wce-spec
  * INSTALL
  * bin/hb-func.sh
  * config/detfun.mk
  * config/global.mk
    * Renamed HB_XBUILD to HB_BUILD_EXTDEF=no[|yes].
      Not the perfect name, but anyway.
    + Documented HB_BUILD_EXTDEF setting.
    ; TOFIX: There is an HB_XBUILD reference in mpkg_tgz.sh which
             I couldn't correct.

  * Makefile
    + Moved building of external libs before utils.
      This will allow to add embedded external libs which are used 
      by Harbour core.

harbour/ChangeLog

@@ -17,6 +17,24 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-10 13:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * harbour-win-spec
+  * harbour-wce-spec
+  * INSTALL
+  * bin/hb-func.sh
+  * config/detfun.mk
+  * config/global.mk
+    * Renamed HB_XBUILD to HB_BUILD_EXTDEF=no[|yes].
+      Not the perfect name, but anyway.
+    + Documented HB_BUILD_EXTDEF setting.
+    ; TOFIX: There is an HB_XBUILD reference in mpkg_tgz.sh which
+             I couldn't correct.
+
+  * Makefile
+    + Moved building of external libs before utils.
+      This will allow to add embedded external libs which are used
+      by Harbour core.
+
 2009-09-10 10:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/detect.mk
     + Detecting pcre on darwin.

harbour/INSTALL

@@ -461,6 +461,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_EXTDEF=no        Controls autodetection of external components
+                               on default systems locations. Default: yes
    - HB_CONTRIBLIBS=no         Don't build any contrib libraries. Default: yes
    - HB_CONTRIBLIBS=[<list>]   Build space separated <list> of contrib
                                libraries. Build all if left empty.
@@ -768,8 +770,7 @@ EXAMPLES
       export WATCOM="/opt/lng/watcom"
       export INCLUDE="${WATCOM}/h:${WATCOM}/h/os2"
       export PATH="${WATCOM}/binl:$PATH"
-      # ; eliminate libraries which scans for local host header files
-      export HB_XBUILD=yes
+      export HB_BUILD_EXTDEF=no
       # ;
       export HB_INSTALL_PREFIX="$(pwd)/hb-os2/watcom"
       make "$@"

harbour/Makefile

@@ -14,16 +14,16 @@ else
 ifeq ($(HB_HOST_BUILD),lib)
    HB_UTIL_DIR :=
 else
-   HB_UTIL_DIR := utils{source}
+   HB_UTIL_DIR := utils{source,external}
 endif
 
 DIRS := \
    doc \
    include \
    source \
+   external \
    $(HB_UTIL_DIR) \
    contrib{source} \
-   external \
 
 endif
 

harbour/bin/hb-func.sh

@@ -948,7 +948,7 @@ mk_hblibso()
             ln -sf $l $ll
             if [ "${HB_PLATFORM}" = "win" ] || \
                [ "${HB_PLATFORM}" = "wce" ]; then
-                if [ "${HB_XBUILD}" = "" ]; then
+                if [ "${HB_PLATFORM}" = "${HB_HOST_PLAT}" ]; then
                    (cd "$dir"
                    mv "${HB_LIB_INSTALL}/$l" "${HB_BIN_INSTALL}"
                    mv "${HB_LIB_INSTALL}/$ll" "${HB_BIN_INSTALL}")

harbour/config/detfun.mk

@@ -17,7 +17,7 @@
 #       _DET_VAR_HAS_ - variable name receiving detection result (typically "HB_HAS_*").
 #       _DET_FLT_PLAT - positive and negative platform filters. Prefix negative ones with '!' char.
 #       _DET_FLT_COMP - positive and negative compiler filters. Prefix negative ones with '!' char.
-#       _DET_INC_DEFP - default location to look at. Not effective in HB_XBUILD mode.
+#       _DET_INC_DEFP - default location to look at. Not effective in 'HB_BUILD_EXTDEF=no' mode.
 #       _DET_INC_HEAD - header filename to look for. Unless looking for a directory, prefix with forward slash.
 #       - variable name specified by _DET_VAR_INC_ (typically "HB_INC_*") should contains:
 #          (empty) or yes - will enable external component if found on default locations.
@@ -67,7 +67,7 @@ ifeq ($($(_DET_VAR_HAS_)),)
                      endif
                   endif
                   ifeq ($($(_DET_VAR_HAS_)),)
-                     ifeq ($(HB_XBUILD),)
+                     ifneq ($(HB_BUILD_EXTDEF),no)
                         $(_DET_VAR_HAS_) := $(_DET_INC_DEFP)
                      endif
                   endif

harbour/config/global.mk

@@ -200,17 +200,16 @@ ifeq ($(HB_INIT_DONE),)
 
       # 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_XBUILD                   -> HB_BUILD_INCDEF (disables default *nix values for HB_INC_* vars)
       #   HB_REBUILD_PARSER           -> HB_BUILD_PARSER (or maybe HB_HAVE_BISON?)
       #   HB_DB_DRVEXT                -> -
       #   HB_COMMERCE                 -> ?
       #   HB_BIN_COMPILE              -> HB_BUILD_BIN_DIR
       #   HB_INC_COMPILE              -> - (HB_BUILD_INC_DIR)
       #
-      #   HB_DLLIBS                   -> (only used in place location, so it's a local matter)
       #   HB_CRS_LIB                  -> HB_LIBNAME_CURSES
       #   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_GPM_NOICE_DISABLE        -> HB_USER_CFLAGS=-DHB_GPM_NOICE_DISABLE
       #   HB_GT_CRS_BCEHACK           -> HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK
       #   HB_NCURSES_194              -> HB_USER_CFLAGS=-DHB_NCURSES_194
@@ -505,7 +504,7 @@ ifeq ($(HB_COMPILER),)
                HB_COMPILER := mingw
                HB_PLATFORM := win
                export HB_TOOLS_PREF := hbw
-               export HB_XBUILD := win
+               export HB_BUILD_EXTDEF := no
                ifneq ($(HB_HOST_BUILD),all)
                   HB_HOST_BUILD := lib
                endif
@@ -567,7 +566,7 @@ ifeq ($(HB_COMPILER),)
                   HB_COMP_PATH := $(dir $(HB_CCPATH))
                   HB_PLATFORM := wce
                   export HB_TOOLS_PREF := hbce
-                  export HB_XBUILD := wce
+                  export HB_BUILD_EXTDEF := no
                   ifneq ($(HB_HOST_BUILD),all)
                      HB_HOST_BUILD := lib
                   endif
@@ -605,7 +604,7 @@ ifeq ($(HB_COMPILER),)
                      HB_COMP_PATH := $(dir $(HB_CCPATH))
                      HB_PLATFORM := dos
                      export HB_TOOLS_PREF := hbce
-                     export HB_XBUILD := dos
+                     export HB_BUILD_EXTDEF := no
                      ifneq ($(HB_HOST_BUILD),all)
                         HB_HOST_BUILD := lib
                      endif

harbour/harbour-wce-spec

@@ -104,7 +104,7 @@ export HB_CCPATH="%{hb_ccpath}/"
 export HB_CCPREFIX="%{hb_ccpref}"
 export PATH="%{hb_ccpath}:$PATH"
 
-export HB_XBUILD=wce
+export HB_BUILD_EXTDEF=no
 export HB_BIN_INSTALL=%{_bindir}
 export HB_INC_INSTALL=%{_includedir}/%{name}
 export HB_LIB_INSTALL=%{_libdir}/%{name}
@@ -133,7 +133,7 @@ export HB_CCPATH="%{hb_ccpath}/"
 export HB_CCPREFIX="%{hb_ccpref}"
 export PATH="%{hb_ccpath}:$PATH"
 
-export HB_XBUILD=wce
+export HB_BUILD_EXTDEF=no
 export HB_BIN_INSTALL=%{_bindir}
 export HB_INC_INSTALL=%{_includedir}/%{name}
 export HB_LIB_INSTALL=%{_libdir}/%{name}

harbour/harbour-win-spec

@@ -104,7 +104,7 @@ export HB_CCPATH="%{hb_ccpath}/"
 export HB_CCPREFIX="%{hb_ccpref}"
 export PATH="%{hb_ccpath}:$PATH"
 
-export HB_XBUILD=win
+export HB_BUILD_EXTDEF=no
 export HB_BIN_INSTALL=%{_bindir}
 export HB_INC_INSTALL=%{_includedir}/%{name}
 export HB_LIB_INSTALL=%{_libdir}/%{name}
@@ -133,7 +133,7 @@ export HB_CCPATH="%{hb_ccpath}/"
 export HB_CCPREFIX="%{hb_ccpref}"
 export PATH="%{hb_ccpath}:$PATH"
 
-export HB_XBUILD=win
+export HB_BUILD_EXTDEF=no
 export HB_BIN_INSTALL=%{_bindir}
 export HB_INC_INSTALL=%{_includedir}/%{name}
 export HB_LIB_INSTALL=%{_libdir}/%{name}