2008-10-30 21:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* contrib/make_b32_all.bat * contrib/make_vc_all.bat * contrib/make_gcc_all.sh + Added support for GNU-make features HB_CONTRIBLIBS, and HB_CONTRIB_ADDONS. Not tested in make_gcc_all.sh. * config/w32/msvc.cf * config/w32/msvcce.cf - Removed -D_CRT_SECURE_NO_DEPRECATE. (sync with non-GNU make)
2008-10-30 20:59:22 +00:00
parent 6822b74b3d
commit a9d57bacf5
6 changed files with 44 additions and 11 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
   2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */

+2008-10-30 21:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/make_b32_all.bat
+  * contrib/make_vc_all.bat
+  * contrib/make_gcc_all.sh
+    + Added support for GNU-make features HB_CONTRIBLIBS, 
+      and HB_CONTRIB_ADDONS.
+      Not tested in make_gcc_all.sh.
+
+  * config/w32/msvc.cf
+  * config/w32/msvcce.cf
+    - Removed -D_CRT_SECURE_NO_DEPRECATE.
+      (sync with non-GNU make)
+
 2008-10-30 15:03 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/include/hbvmpub.h
    + added HB_VM_ISFUNC(), HB_VM_FUNCUNREF() and HB_VM_EXECUTE()
--- a/harbour/config/w32/msvc.cf
+++ b/harbour/config/w32/msvc.cf
@@ -16,7 +16,7 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS = -nologo -W4 -Gs -Zi

 ifeq ($(HB_VISUALC_VER_PRE80),)
-CFLAGS += -Ot2b1 -EHs-c- -D_CRT_SECURE_NO_DEPRECATE
+CFLAGS += -Ot2b1 -EHs-c-
 else
 CFLAGS += -Ogt2yb1p -GX- -G6 -YX
 endif
--- a/harbour/config/w32/msvcce.cf
+++ b/harbour/config/w32/msvcce.cf
@@ -18,7 +18,7 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS = -nologo -W4 -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" -D_UWIN

 ifeq ($(HB_VISUALC_VER_PRE80),)
-CFLAGS += -Od -Os -Gy -GS- -EHsc- -Gm -Zi -GR- -D_CRT_SECURE_NO_DEPRECATE
+CFLAGS += -Od -Os -Gy -GS- -EHsc- -Gm -Zi -GR-
 else
 CFLAGS += -Oxsb1 -EHsc -YX -GF
 endif
--- a/harbour/contrib/make_b32_all.bat
+++ b/harbour/contrib/make_b32_all.bat
@@ -39,6 +39,9 @@ rem *******************************************************
 rem Compiling contrib dirs ...
 rem *******************************************************

+set _HB_DIRS=%HB_CONTRIBLIBS%
+if not "%_HB_DIRS%" == "" goto :OVERRIDE
+
 set _HB_DIRS=gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc
 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9

@@ -60,8 +63,13 @@ if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%"         == "" set _HB_DIRS=%_HB_DIRS% hbmy
 if not "%HB_INC_PGSQL%%HB_DIR_PGSQL%"         == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
 if not "%HB_INC_ADS%%HB_DIR_ADS%"             == "" set _HB_DIRS=%_HB_DIRS% rddads
 if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%"         == "" set _HB_DIRS=%_HB_DIRS% rddsql
+:OVERRIDE
 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9

+if not "%HB_CONTRIB_ADDONS%" == "" goto :NO_ADDONS
+for %%n in ( %HB_CONTRIB_ADDONS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
+:NO_ADDONS
+
 rem *******************************************************
 rem Cleaning ...
 rem *******************************************************
--- a/harbour/contrib/make_gcc_all.sh
+++ b/harbour/contrib/make_gcc_all.sh
@@ -38,15 +38,19 @@ fi

 #**************************************************************

-_HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbnf hbtip hbsqlit3 hbtpathy hbvpdf hbziparc xhb"
+if [ "$HB_CONTRIBLIBS" != "" ]; then
+   _HB_DIRS="${HB_CONTRIBLIBS}"
+else
+   _HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbnf hbtip hbsqlit3 hbtpathy hbvpdf hbziparc xhb"

-case "$HB_ARCHITECTURE" in
-   w32|cyg|os2)
-        _HB_DIRS_ADD="gtwvg hbole hbodbc hbwin hbwhat rddado"
-        ;;
-   *)
-        _HB_DIRS_ADD=;;
-esac
+   case "$HB_ARCHITECTURE" in
+      w32|cyg|os2)
+           _HB_DIRS_ADD="gtwvg hbole hbodbc hbwin hbwhat rddado"
+           ;;
+      *)
+           _HB_DIRS_ADD=;;
+   esac
+fi

 # Revert Cygwin architecture to w32.
 # After all it's under Windows OS.
@@ -67,7 +71,7 @@ if [ "${HB_INC_PGSQL}"     != "" ]; then _HB_DIRS="${_HB_DIRS} hbpgsql" ; fi;
 if [ "${HB_INC_ADS}"       != "" ]; then _HB_DIRS="${_HB_DIRS} rddads"  ; fi;
 if [ "${HB_INC_MYSQL}"     != "" ]; then _HB_DIRS="${_HB_DIRS} rddsql"  ; fi;

-_HB_DIRS="${_HB_DIRS} ${_HB_DIRS_ADD}"
+_HB_DIRS="${_HB_DIRS} ${_HB_DIRS_ADD} ${HB_CONTRIB_ADDONS}"

 #**************************************************************

--- a/harbour/contrib/make_vc_all.bat
+++ b/harbour/contrib/make_vc_all.bat
@@ -39,6 +39,9 @@ rem *******************************************************
 rem Compiling contrib dirs ...
 rem *******************************************************

+set _HB_DIRS=%HB_CONTRIBLIBS%
+if not "%_HB_DIRS%" == "" goto :OVERRIDE
+
 set _HB_DIRS=gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc
 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9

@@ -60,8 +63,13 @@ if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%"         == "" set _HB_DIRS=%_HB_DIRS% hbmy
 if not "%HB_INC_PGSQL%%HB_DIR_PGSQL%"         == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
 if not "%HB_INC_ADS%%HB_DIR_ADS%"             == "" set _HB_DIRS=%_HB_DIRS% rddads
 if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%"         == "" set _HB_DIRS=%_HB_DIRS% rddsql
+:OVERRIDE
 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9

+if not "%HB_CONTRIB_ADDONS%" == "" goto :NO_ADDONS
+for %%n in ( %HB_CONTRIB_ADDONS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
+:NO_ADDONS
+
 rem *******************************************************
 rem Cleaning ...
 rem *******************************************************