From 2c0d6edff2b4a6891310b216db45b891f5a6c423 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 23 Nov 2007 20:18:54 +0000 Subject: [PATCH] 2007-11-23 21:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/mtpl_vc.mak ! Some minor fixes for VC. - %1 -> %%1 to be on the safe side. - Fixed double execution of inline files. Thanks to Marek. * contrib/make_b32_all.bat * contrib/make_vc_all.bat ! Batch file calling method reset to Marek's version ('%COMSPEC% /c' as opposed to 'call') to avoid any unwanted "crosstalk" between contrib build procedures through the CFLAGS envvar. --- harbour/ChangeLog | 14 ++++++++++++++ harbour/contrib/make_b32_all.bat | 6 +++--- harbour/contrib/make_vc_all.bat | 6 +++--- harbour/contrib/mtpl_vc.mak | 31 ++++++++++++++----------------- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 451e00d24c..a3d9633ce0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-23 21:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/mtpl_vc.mak + ! Some minor fixes for VC. + - %1 -> %%1 to be on the safe side. + - Fixed double execution of inline files. + Thanks to Marek. + + * contrib/make_b32_all.bat + * contrib/make_vc_all.bat + ! Batch file calling method reset to Marek's version + ('%COMSPEC% /c' as opposed to 'call') to avoid + any unwanted "crosstalk" between contrib build + procedures through the CFLAGS envvar. + 2007-11-23 21:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/doc/man/harbour.1 * harbour/source/compiler/hbusage.c diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index 742fd3c230..22ee9e0591 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -11,10 +11,10 @@ set HB_SHOW_ERRORS=no set DO_NOT_COMPILE=examples hbclip hgf msql set DIRS=adordd bmdbfcdx btree libct libgt libmisc libnf ole -for %%n in ( %DIRS% ) do call make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set DIRS=hbzlib htmllib odbc telepath tip win32 xhb -for %%n in ( %DIRS% ) do call make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set DIRS=samples directx if not "%APOLLO_DIR%" == "" set DIRS=%DIRS% apollo @@ -25,4 +25,4 @@ if not "%MYSQL_DIR%" == "" set DIRS=%DIRS% mysql if not "%PDFLIB_DIR%" == "" set DIRS=%DIRS% pdflib if not "%PGSQL_DIR%" == "" set DIRS=%DIRS% pgsql if not "%ADS_DIR%" == "" set DIRS=%DIRS% rdd_ads -for %%n in ( %DIRS% ) do call make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index 7814166989..9f1e94696d 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -11,10 +11,10 @@ set HB_SHOW_ERRORS=no set DO_NOT_COMPILE=examples hbclip hgf msql set DIRS=adordd bmdbfcdx btree libct libgt libmisc libnf ole -for %%n in ( %DIRS% ) do call make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set DIRS=hbzlib htmllib odbc telepath tip win32 xhb -for %%n in ( %DIRS% ) do call make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set DIRS=samples directx if not "%APOLLO_DIR%" == "" set DIRS=%DIRS% apollo @@ -25,4 +25,4 @@ if not "%MYSQL_DIR%" == "" set DIRS=%DIRS% mysql if not "%PDFLIB_DIR%" == "" set DIRS=%DIRS% pdflib if not "%PGSQL_DIR%" == "" set DIRS=%DIRS% pgsql if not "%ADS_DIR%" == "" set DIRS=%DIRS% rdd_ads -for %%n in ( %DIRS% ) do call make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index fa271b1610..7a5d8e9468 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -144,30 +144,28 @@ CLEAN: doClean doClean: @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul - @$(ECHO) @echo off > _hbdeloo.bat - @$(ECHO) if "%1" == "" goto SKIP >> _hbdeloo.bat - @$(ECHO) if exist %1.c $(DEL) %1.c >> _hbdeloo.bat - @$(ECHO) if exist %1.obj $(DEL) %1.obj >> _hbdeloo.bat - @$(ECHO) :SKIP >> _hbdeloo.bat + @$(ECHO) @echo off > _hbdeloo.bat + @$(ECHO) if "%%1" == "" goto SKIP >> _hbdeloo.bat + @$(ECHO) if exist %%1.c $(DEL) %%1.c >> _hbdeloo.bat + @$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> _hbdeloo.bat + @$(ECHO) :SKIP >> _hbdeloo.bat <<_hbdeloa.bat @call _hbdeloo.bat $(LIB_OBJS:.obj=^ @call _hbdeloo.bat ) < nul @if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul !if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul - @$(ECHO) @echo off > _hbdelho.bat - @$(ECHO) if "%1" == "" goto SKIP >> _hbdelho.bat - @$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbdelho.bat - @$(ECHO) :SKIP >> _hbdelho.bat + @$(ECHO) @echo off > _hbdelho.bat + @$(ECHO) if "%%1" == "" goto SKIP >> _hbdelho.bat + @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbdelho.bat + @$(ECHO) :SKIP >> _hbdelho.bat <<_hbdelha.bat @call _hbdelho.bat $(ALL_HEADERS: =^ @call _hbdelho.bat ) < nul @if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul !endif @@ -190,16 +188,15 @@ copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul < nul - @$(ECHO) @echo off > _hbcpyho.bat - @$(ECHO) if "%1" == "" goto SKIP >> _hbcpyho.bat - @$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbcpyho.bat - @$(ECHO) if exist %1 copy %1 $(HB_INC_INSTALL) >> _hbcpyho.bat - @$(ECHO) :SKIP >> _hbcpyho.bat + @$(ECHO) @echo off > _hbcpyho.bat + @$(ECHO) if "%%1" == "" goto SKIP >> _hbcpyho.bat + @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbcpyho.bat + @$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> _hbcpyho.bat + @$(ECHO) :SKIP >> _hbcpyho.bat <<_hbcpyha.bat @call _hbcpyho.bat $(ALL_HEADERS: =^ @call _hbcpyho.bat ) < nul @if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul