From 1087aa836f9bc0ac7d130d3113b0f9f86d40cac7 Mon Sep 17 00:00:00 2001 From: Marek Paliwoda Date: Tue, 4 Dec 2007 09:17:40 +0000 Subject: [PATCH] 2007-12-04 10:17 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * harbour/contrib/make_b32_all.bat * harbour/contrib/make_vc_all.bat - Removed the dependancy on a worker bat file named make_.bat. Now a worker bat file is created on a fly. - harbour/contrib/make_b32.bat - harbour/contrib/make_vc.bat - Removed. No longer neccesary. --- harbour/ChangeLog | 11 +++++++++ harbour/contrib/make_b32.bat | 21 ------------------ harbour/contrib/make_b32_all.bat | 38 ++++++++++++++++++++++++++------ harbour/contrib/make_vc.bat | 21 ------------------ harbour/contrib/make_vc_all.bat | 38 ++++++++++++++++++++++++++------ 5 files changed, 73 insertions(+), 56 deletions(-) delete mode 100644 harbour/contrib/make_b32.bat delete mode 100644 harbour/contrib/make_vc.bat diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 234ffcca7f..32bd4fae4f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-04 10:17 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + * harbour/contrib/make_b32_all.bat + * harbour/contrib/make_vc_all.bat + - Removed the dependancy on a worker bat file + named make_.bat. Now a worker bat file + is created on a fly. + + - harbour/contrib/make_b32.bat + - harbour/contrib/make_vc.bat + - Removed. No longer neccesary. + 2007-12-03 22:35 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/common.mak * harbour/source/rtl/Makefile diff --git a/harbour/contrib/make_b32.bat b/harbour/contrib/make_b32.bat deleted file mode 100644 index e05d634d29..0000000000 --- a/harbour/contrib/make_b32.bat +++ /dev/null @@ -1,21 +0,0 @@ -@echo off -rem -rem $Id: make_b32.bat 7991 2007-11-17 11:42:49Z vszakats $ -rem - -if "%1" == "" goto ERROR - -echo Entering: %1 - -cd %1 -call make_b32.bat %2 %3 %4 %5 %6 %7 %8 %9 -cd .. - -goto EXIT - -:ERROR -echo ---------------------------------------- -echo Usage: "make_b32.bat " -echo ---------------------------------------- - -:EXIT diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index a9729fbd25..2d2676d91c 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -3,18 +3,35 @@ rem rem $Id$ rem -rem The compilation is done in three steps. PLEASE DO NOT MODIFY -rem IT or you will break Win9x command.com line length limit !!! +rem ******************************************************* +rem The compilation is done in three steps. PLEASE DO NOT MODIFY IT +rem or you will break a Windows9x command.com line length limit !!! +rem ******************************************************* set HB_SHOW_ERRORS=no -rem set DO_NOT_COMPILE=examples hbclip hgf hbwhat32 +rem ******************************************************* +rem Creating a worker bat file ... +rem ******************************************************* + +set __BATWORKER__=_hbwrk_.bat + +echo @echo off >%__BATWORKER__% +echo if not exist %%1\make_b32.bat goto EXIT >>%__BATWORKER__% +echo echo Entering: %%1 >>%__BATWORKER__% +echo cd %%1 >>%__BATWORKER__% +echo call make_b32.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >>%__BATWORKER__% +echo cd .. >>%__BATWORKER__% + +rem ******************************************************* +rem Compiling contrib dirs ... +rem ******************************************************* set _HB_DIRS=hbrddado hbbmcdx hbbtree hbgtwvg hbct hbgt hbmisc hbnf hbmsql -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbw32 xhb -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbclipsm hbw32ddr if not "%APOLLO_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo @@ -24,7 +41,14 @@ if not "%GD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbgd if not "%MYSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql if not "%PGSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql if not "%ADS_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbrddads -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 + +rem ******************************************************* +rem Cleaning ... +rem ******************************************************* + +del %__BATWORKER__% > nul -set HB_SHOW_ERRORS= set _HB_DIRS= +set __BATWORKER__= +set HB_SHOW_ERRORS= diff --git a/harbour/contrib/make_vc.bat b/harbour/contrib/make_vc.bat deleted file mode 100644 index eee1469fb9..0000000000 --- a/harbour/contrib/make_vc.bat +++ /dev/null @@ -1,21 +0,0 @@ -@echo off -rem -rem $Id: make_vc.bat 7991 2007-11-17 11:42:49Z vszakats $ -rem - -if "%1" == "" goto ERROR - -echo Entering: %1 - -cd %1 -call make_vc.bat %2 %3 %4 %5 %6 %7 %8 %9 -cd .. - -goto EXIT - -:ERROR -echo ---------------------------------------- -echo Usage: "make_vc.bat " -echo ---------------------------------------- - -:EXIT diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index 8d2f4eaf07..0b594dc0b1 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -3,18 +3,35 @@ rem rem $Id$ rem -rem The compilation is done in three steps. PLEASE DO NOT MODIFY -rem IT or you will break Win9x command.com line length limit !!! +rem ******************************************************* +rem The compilation is done in three steps. PLEASE DO NOT MODIFY IT +rem or you will break a Windows9x command.com line length limit !!! +rem ******************************************************* set HB_SHOW_ERRORS=no -rem set DO_NOT_COMPILE=examples hbclip hgf +rem ******************************************************* +rem Creating a worker bat file ... +rem ******************************************************* + +set __BATWORKER__=_hbwrk_.bat + +echo @echo off >%__BATWORKER__% +echo if not exist %%1\make_vc.bat goto EXIT >>%__BATWORKER__% +echo echo Entering: %%1 >>%__BATWORKER__% +echo cd %%1 >>%__BATWORKER__% +echo call make_vc.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >>%__BATWORKER__% +echo cd .. >>%__BATWORKER__% + +rem ******************************************************* +rem Compiling contrib dirs ... +rem ******************************************************* set _HB_DIRS=hbrddado hbbmcdx hbbtree hbgtwvg hbct hbgt hbmisc hbnf hbmsql -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbw32 xhb -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbclipsm hbw32ddr if not "%APOLLO_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo @@ -24,7 +41,14 @@ if not "%GD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbgd if not "%MYSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql if not "%PGSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql if not "%ADS_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbrddads -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 + +rem ******************************************************* +rem Cleaning ... +rem ******************************************************* + +del %__BATWORKER__% > nul -set HB_SHOW_ERRORS= set _HB_DIRS= +set __BATWORKER__= +set HB_SHOW_ERRORS=