fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-11-23 21:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2007-11-23 20:18:54 +00:00
parent 021bc664d5
commit 2c0d6edff2
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -8,6 +8,20 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
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

6
harbour/contrib/make_b32_all.bat
View File

@@ -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

6
harbour/contrib/make_vc_all.bat
View File

@@ -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

31
harbour/contrib/mtpl_vc.mak
View File

@@ -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 )
<<KEEP
@_hbdeloa.bat
@if exist _hbdeloa.bat $(DEL) _hbdeloa.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 )
<<KEEP
@_hbdelha.bat
@if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
@if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
!endif
@@ -190,16 +188,15 @@ copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul
<<KEEP
@_hbcpyla.bat
@if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > 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 )
<<KEEP
@_hbcpyha.bat
@if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
@if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul