diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4970c64ae9..4e2a9ff665 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,75 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-09-13 20:15 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/tests/run_prg.bat + * harbour/tests/gnu_test.bat + * harbour/tests/run_test.bat + * harbour/tests/bld4dll.bat + * harbour/doc/genhtm.bat + * harbour/bin/bld.bat + * harbour/bin/postinst.bat + * harbour/bin/bld_b32.bat + * harbour/bin/bld_b16.bat + * harbour/bin/bld_vc.bat + * harbour/make_b32.bat + * harbour/make_vc.bat + * harbour/make_gnu.bat + * harbour/contrib/ole/bldtest.bat + * harbour/contrib/ole/build32.bat + * harbour/contrib/libmisc/make_b32.bat + * harbour/contrib/libmisc/doc/gendoc.bat + * harbour/contrib/libmisc/make_vc.bat + * harbour/contrib/apollo/test/bld.bat + * harbour/contrib/apollo/test/bld_b32.bat + * harbour/contrib/apollo/make_b32.bat + * harbour/contrib/pgsql/make_b32.bat + * harbour/contrib/gd/make_b32.bat + * harbour/contrib/gd/tests/bldtest.bat + * harbour/contrib/libnf/make_b32.bat + * harbour/contrib/libnf/make_vc.bat + * harbour/contrib/htmllib/make_b32.bat + * harbour/contrib/htmllib/make_vc.bat + * harbour/contrib/tip/make_b32.bat + * harbour/contrib/libct/make_b32.bat + * harbour/contrib/libct/make_vc.bat + * harbour/contrib/adordd/make_b32.bat + * harbour/contrib/rdd_ads/doc/gendoc.bat + * harbour/contrib/rdd_ads/make_b32.bat + * harbour/contrib/rdd_ads/make_vc.bat + * harbour/contrib/libgt/make_b32.bat + * harbour/contrib/libgt/doc/gendoc.bat + * harbour/contrib/libgt/make_vc.bat + * harbour/contrib/hbclip/make_clp.bat + * harbour/contrib/btree/make_b32.bat + * harbour/contrib/btree/mktest.bat + * harbour/contrib/ole2/make_b32.bat + * harbour/contrib/directx/buvcdx.bat + * harbour/contrib/hgf/tests/build_b32.bat + * harbour/contrib/hgf/win32/make_b32.bat + * harbour/contrib/hgf/win32/makevc.bat + * harbour/contrib/samples/make_b32.bat + * harbour/contrib/samples/make_vc.bat + * harbour/contrib/delphi/hbdll/start.bat + * harbour/contrib/delphi/hbdll/bld_sdll.bat + * harbour/contrib/mysql/make_b32.bat + * harbour/contrib/runjava/bld_java.bat + * harbour/contrib/runjava/make_vc.bat + * harbour/contrib/odbc/bldodbc.bat + * harbour/contrib/odbc/bld_b32.bat + * harbour/contrib/bmdbfcdx/make_b32.bat + * harbour/contrib/hbzlib/dll_b32.bat + * harbour/contrib/hbzlib/make_b32.bat + * harbour/contrib/hbzlib/make_vc.bat + * harbour/utils/hbextern/make_c5x.bat + * harbour/utils/hbpptest/compare.bat + * harbour/utils/hbtest/make_c5x.bat + * harbour/utils/hbtest/make_xpp.bat + * harbour/samples/guestbk/bld_b32.bat + * harbour/samples/hscript/makehtm.bat + * harbour/samples/hscript/bld_b32.bat + * set svn:eol-style to CRLF + 2007-09-13 19:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/rdd_ads/ads1.c * harbour/source/rdd/dbf1.c diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index 0d44951867..10f2e73a28 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -1,273 +1,273 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem Template to build a final Harbour executable, using Harbour -rem with the C code generation feature, then calling the proper C -rem linker/compiler. -rem -rem Copyright 1999-2004 Viktor Szakats (viktor.szakats@syenar.hu) -rem See doc/license.txt for licensing terms. -rem --------------------------------------------------------------- - -rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos -rem if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp -rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= - -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\bin\ -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\lib\ -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\ - -:START - - if "%HB_ARCHITECTURE%" == "" goto NO_ARCH - if "%HB_COMPILER%" == "" goto NO_COMP - - if not "%1" == "" goto COMPILE - -:HELP - - echo. - echo Usage: bld filename - echo. - echo Notes: - echo. - echo - 'filename' is the .prg filename *without* extension. - echo - Don't forget to make a MAIN() function for you application. - echo - This batch file assumes you are in some directory off the main - echo harbour directory. - echo - Environment variables HB_ARCHITECTURE, HB_COMPILER, HB_GT_LIB - echo should be set. Setting HB_GT_LIB is optional. - echo The following values are currently supported: - echo. - echo HB_ARCHITECTURE: - echo - dos (HB_GT_LIB=gtdos by default) - echo - w32 (HB_GT_LIB=gtwin by default) - echo - linux (HB_GT_LIB=gtstd by default) - echo - os2 (HB_GT_LIB=gtos2 by default) - echo. - pause - echo HB_COMPILER: - echo - When HB_ARCHITECTURE=dos - echo - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit) - echo - djgpp (Delorie GNU C, DOS 32-bit) - echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) - echo - watcom (OpenWatcom, DOS 32-bit) - echo - When HB_ARCHITECTURE=w32 - echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) - echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) - echo - mingw32 (Cygnus/MinGW GNU C, Windows 32-bit) - echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) - echo - icc (IBM Visual Age C++, Windows 32-bit) - echo - msvc (Microsoft Visual C++, Windows 32-bit) - echo - watcom (OpenWatcom, Windows 32-bit) - echo - When HB_ARCHITECTURE=linux - echo - gcc (GNU C, 32-bit) - echo - When HB_ARCHITECTURE=os2 - echo - gcc (EMX GNU C, OS/2 32-bit) - echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) - echo. - pause - echo HB_GT_LIB: - echo - gtstd (Standard streaming) (for all architectures) - echo - gtdos (DOS console) (for dos architecture) - echo - gtwin (Win32 console) (for w32 architecture) - echo - gtos2 (OS/2 console) (for os2 architecture) - echo - gtpca (PC ANSI console) (for all architectures) - echo - gtcrs (Curses console) (for linux, w32 architectures) - echo - gtsln (Slang console) (for linux, w32 architectures) - goto END - -:NO_ARCH - - echo Error: HB_ARCHITECTURE is not set. - goto HELP - -:NO_COMP - - echo Error: HB_COMPILER is not set. - goto HELP - -:BAD_ARCH - - echo Error: HB_ARCHITECTURE value is unsupported. - goto HELP - -:BAD_COMP - - echo Error: HB_COMPILER value is unsupported. - goto HELP - -:COMPILE - - %HB_BIN_INSTALL%\harbour %1.prg -n -q0 -gc0 -i%HB_INC_INSTALL% %2 %3 %HARBOURFLAGS% - -:A_DOS - - if not "%HB_GT_LIB%" == "" set _HB_GT_LIB=%HB_GT_LIB% - - if not "%HB_ARCHITECTURE%" == "dos" goto A_W32 - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtdos - - if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT - - echo -O2 -d -mh %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp - echo -e%1.exe >> build.tmp - echo %1.c >> build.tmp - echo codepage.lib >> build.tmp - echo debug.lib >> build.tmp - echo vm.lib >> build.tmp - echo rtl.lib >> build.tmp - echo %_HB_GT_LIB%.lib >> build.tmp - echo lang.lib >> build.tmp - echo rdd.lib >> build.tmp - echo macro.lib >> build.tmp - echo pp.lib >> build.tmp - echo dbffpt.lib >> build.tmp - echo dbfntx.lib >> build.tmp - echo dbfcdx.lib >> build.tmp - echo hbsix.lib >> build.tmp - echo common.lib >> build.tmp - bcc @build.tmp - del build.tmp - goto END - -:A_DOS_BCC16_NOT - - if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT - - echo %1.c > build.tmp - echo -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> build.tmp - echo -lcodepage >> build.tmp - echo -ldebug >> build.tmp - echo -lvm >> build.tmp - echo -lrtl >> build.tmp - echo -l%_HB_GT_LIB% >> build.tmp - echo -llang >> build.tmp - echo -lrdd >> build.tmp - echo -lrtl >> build.tmp - echo -lvm >> build.tmp - echo -lmacro >> build.tmp - echo -lpp >> build.tmp - echo -ldbffpt >> build.tmp - echo -ldbfntx >> build.tmp - echo -ldbfcdx >> build.tmp - echo -lhbsix >> build.tmp - echo -lcommon >> build.tmp - echo -lm >> build.tmp - gcc @build.tmp - del build.tmp - goto END - -:A_DOS_DJGPP_NOT - - if not "%HB_COMPILER%" == "rsx32" GOTO A_DOS_RSX32_NOT - - gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon - goto END - -:A_DOS_RSX32_NOT - - if not "%HB_COMPILER%" == "watcom" goto END - - wpp386 -j -w3 -d2 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %1.c -fo=%1.obj - echo debug all OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe NAME %1.exe > build.tmp - echo FILE %1.obj >> build.tmp - echo LIB codepage.lib >> build.tmp - echo LIB debug.lib >> build.tmp - echo LIB vm.lib >> build.tmp - echo LIB rtl.lib >> build.tmp - echo LIB %_HB_GT_LIB%.lib >> build.tmp - echo LIB lang.lib >> build.tmp - echo LIB rdd.lib >> build.tmp - echo LIB macro.lib >> build.tmp - echo LIB pp.lib >> build.tmp - echo LIB dbfntx.lib >> build.tmp - echo LIB dbfcdx.lib >> build.tmp - echo LIB dbffpt.lib >> build.tmp - echo LIB hbsix.lib >> build.tmp - echo LIB common.lib >> build.tmp - wlink @build.tmp - del build.tmp - goto END - -:A_W32 - -if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2 - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin - - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c codepage.lib debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbffpt.lib dbfntx.lib dbfcdx.lib hbsix.lib common.lib %HB_USER_LIBS% - - if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon - if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% %HB_INC_TEMP% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon - if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon - - if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\codepage.lib %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\dbffpt.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\common.lib user32.lib winspool.lib - if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning - -:C_WATCOM - - if not "%HB_COMPILER%" == "watcom" goto end - - wpp386 -j -w3 -d2 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %1.c -fo=%1.obj - echo debug all OP osn=NT OP stack=65536 OP CASEEXACT NAME %1.exe > build.tmp - echo FILE %1.obj >> build.tmp - echo LIB codepage.lib >> build.tmp - echo LIB debug.lib >> build.tmp - echo LIB vm.lib >> build.tmp - echo LIB rtl.lib >> build.tmp - echo LIB %_HB_GT_LIB%.lib >> build.tmp - echo LIB lang.lib >> build.tmp - echo LIB macro.lib >> build.tmp - echo LIB pp.lib >> build.tmp - echo LIB dbfntx.lib >> build.tmp - echo LIB dbfcdx.lib >> build.tmp - echo LIB dbffpt.lib >> build.tmp - echo LIB hbsix.lib >> build.tmp - echo LIB rdd.lib >> build.tmp - echo LIB common.lib >> build.tmp - echo LIB kernel32.lib >> build.tmp - echo LIB user32.lib >> build.tmp - echo LIB winspool.lib >> build.tmp - echo LIB oleaut32.lib >> build.tmp - echo LIB uuid.lib >> build.tmp - wlink @build.tmp - del build.tmp - goto END - -:A_OS2 - - if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2 - - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon - if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\codepage.lib %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbffpt.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\common.lib - goto END - -:A_LINUX - - if not "%HB_ARCHITECTURE%" == "linux" goto BAD_ARCH - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd - - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon - goto END - -:CLEANUP - - del %1.c - -:END +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem Template to build a final Harbour executable, using Harbour +rem with the C code generation feature, then calling the proper C +rem linker/compiler. +rem +rem Copyright 1999-2004 Viktor Szakats (viktor.szakats@syenar.hu) +rem See doc/license.txt for licensing terms. +rem --------------------------------------------------------------- + +rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos +rem if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp +rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= + +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\bin\ +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\lib\ +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\ + +:START + + if "%HB_ARCHITECTURE%" == "" goto NO_ARCH + if "%HB_COMPILER%" == "" goto NO_COMP + + if not "%1" == "" goto COMPILE + +:HELP + + echo. + echo Usage: bld filename + echo. + echo Notes: + echo. + echo - 'filename' is the .prg filename *without* extension. + echo - Don't forget to make a MAIN() function for you application. + echo - This batch file assumes you are in some directory off the main + echo harbour directory. + echo - Environment variables HB_ARCHITECTURE, HB_COMPILER, HB_GT_LIB + echo should be set. Setting HB_GT_LIB is optional. + echo The following values are currently supported: + echo. + echo HB_ARCHITECTURE: + echo - dos (HB_GT_LIB=gtdos by default) + echo - w32 (HB_GT_LIB=gtwin by default) + echo - linux (HB_GT_LIB=gtstd by default) + echo - os2 (HB_GT_LIB=gtos2 by default) + echo. + pause + echo HB_COMPILER: + echo - When HB_ARCHITECTURE=dos + echo - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit) + echo - djgpp (Delorie GNU C, DOS 32-bit) + echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) + echo - watcom (OpenWatcom, DOS 32-bit) + echo - When HB_ARCHITECTURE=w32 + echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) + echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) + echo - mingw32 (Cygnus/MinGW GNU C, Windows 32-bit) + echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) + echo - icc (IBM Visual Age C++, Windows 32-bit) + echo - msvc (Microsoft Visual C++, Windows 32-bit) + echo - watcom (OpenWatcom, Windows 32-bit) + echo - When HB_ARCHITECTURE=linux + echo - gcc (GNU C, 32-bit) + echo - When HB_ARCHITECTURE=os2 + echo - gcc (EMX GNU C, OS/2 32-bit) + echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) + echo. + pause + echo HB_GT_LIB: + echo - gtstd (Standard streaming) (for all architectures) + echo - gtdos (DOS console) (for dos architecture) + echo - gtwin (Win32 console) (for w32 architecture) + echo - gtos2 (OS/2 console) (for os2 architecture) + echo - gtpca (PC ANSI console) (for all architectures) + echo - gtcrs (Curses console) (for linux, w32 architectures) + echo - gtsln (Slang console) (for linux, w32 architectures) + goto END + +:NO_ARCH + + echo Error: HB_ARCHITECTURE is not set. + goto HELP + +:NO_COMP + + echo Error: HB_COMPILER is not set. + goto HELP + +:BAD_ARCH + + echo Error: HB_ARCHITECTURE value is unsupported. + goto HELP + +:BAD_COMP + + echo Error: HB_COMPILER value is unsupported. + goto HELP + +:COMPILE + + %HB_BIN_INSTALL%\harbour %1.prg -n -q0 -gc0 -i%HB_INC_INSTALL% %2 %3 %HARBOURFLAGS% + +:A_DOS + + if not "%HB_GT_LIB%" == "" set _HB_GT_LIB=%HB_GT_LIB% + + if not "%HB_ARCHITECTURE%" == "dos" goto A_W32 + + if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtdos + + if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT + + echo -O2 -d -mh %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp + echo -e%1.exe >> build.tmp + echo %1.c >> build.tmp + echo codepage.lib >> build.tmp + echo debug.lib >> build.tmp + echo vm.lib >> build.tmp + echo rtl.lib >> build.tmp + echo %_HB_GT_LIB%.lib >> build.tmp + echo lang.lib >> build.tmp + echo rdd.lib >> build.tmp + echo macro.lib >> build.tmp + echo pp.lib >> build.tmp + echo dbffpt.lib >> build.tmp + echo dbfntx.lib >> build.tmp + echo dbfcdx.lib >> build.tmp + echo hbsix.lib >> build.tmp + echo common.lib >> build.tmp + bcc @build.tmp + del build.tmp + goto END + +:A_DOS_BCC16_NOT + + if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT + + echo %1.c > build.tmp + echo -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> build.tmp + echo -lcodepage >> build.tmp + echo -ldebug >> build.tmp + echo -lvm >> build.tmp + echo -lrtl >> build.tmp + echo -l%_HB_GT_LIB% >> build.tmp + echo -llang >> build.tmp + echo -lrdd >> build.tmp + echo -lrtl >> build.tmp + echo -lvm >> build.tmp + echo -lmacro >> build.tmp + echo -lpp >> build.tmp + echo -ldbffpt >> build.tmp + echo -ldbfntx >> build.tmp + echo -ldbfcdx >> build.tmp + echo -lhbsix >> build.tmp + echo -lcommon >> build.tmp + echo -lm >> build.tmp + gcc @build.tmp + del build.tmp + goto END + +:A_DOS_DJGPP_NOT + + if not "%HB_COMPILER%" == "rsx32" GOTO A_DOS_RSX32_NOT + + gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon + goto END + +:A_DOS_RSX32_NOT + + if not "%HB_COMPILER%" == "watcom" goto END + + wpp386 -j -w3 -d2 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %1.c -fo=%1.obj + echo debug all OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe NAME %1.exe > build.tmp + echo FILE %1.obj >> build.tmp + echo LIB codepage.lib >> build.tmp + echo LIB debug.lib >> build.tmp + echo LIB vm.lib >> build.tmp + echo LIB rtl.lib >> build.tmp + echo LIB %_HB_GT_LIB%.lib >> build.tmp + echo LIB lang.lib >> build.tmp + echo LIB rdd.lib >> build.tmp + echo LIB macro.lib >> build.tmp + echo LIB pp.lib >> build.tmp + echo LIB dbfntx.lib >> build.tmp + echo LIB dbfcdx.lib >> build.tmp + echo LIB dbffpt.lib >> build.tmp + echo LIB hbsix.lib >> build.tmp + echo LIB common.lib >> build.tmp + wlink @build.tmp + del build.tmp + goto END + +:A_W32 + +if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2 + + if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin + + if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c codepage.lib debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbffpt.lib dbfntx.lib dbfcdx.lib hbsix.lib common.lib %HB_USER_LIBS% + + if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon + if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% %HB_INC_TEMP% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon + if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon + + if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\codepage.lib %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\dbffpt.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\common.lib user32.lib winspool.lib + if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning + +:C_WATCOM + + if not "%HB_COMPILER%" == "watcom" goto end + + wpp386 -j -w3 -d2 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %1.c -fo=%1.obj + echo debug all OP osn=NT OP stack=65536 OP CASEEXACT NAME %1.exe > build.tmp + echo FILE %1.obj >> build.tmp + echo LIB codepage.lib >> build.tmp + echo LIB debug.lib >> build.tmp + echo LIB vm.lib >> build.tmp + echo LIB rtl.lib >> build.tmp + echo LIB %_HB_GT_LIB%.lib >> build.tmp + echo LIB lang.lib >> build.tmp + echo LIB macro.lib >> build.tmp + echo LIB pp.lib >> build.tmp + echo LIB dbfntx.lib >> build.tmp + echo LIB dbfcdx.lib >> build.tmp + echo LIB dbffpt.lib >> build.tmp + echo LIB hbsix.lib >> build.tmp + echo LIB rdd.lib >> build.tmp + echo LIB common.lib >> build.tmp + echo LIB kernel32.lib >> build.tmp + echo LIB user32.lib >> build.tmp + echo LIB winspool.lib >> build.tmp + echo LIB oleaut32.lib >> build.tmp + echo LIB uuid.lib >> build.tmp + wlink @build.tmp + del build.tmp + goto END + +:A_OS2 + + if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX + + if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2 + + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon + if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\codepage.lib %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbffpt.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\common.lib + goto END + +:A_LINUX + + if not "%HB_ARCHITECTURE%" == "linux" goto BAD_ARCH + + if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd + + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon + goto END + +:CLEANUP + + del %1.c + +:END diff --git a/harbour/bin/bld_b16.bat b/harbour/bin/bld_b16.bat index b28adb2b51..335022af7c 100644 --- a/harbour/bin/bld_b16.bat +++ b/harbour/bin/bld_b16.bat @@ -1,18 +1,18 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_ARCHITECTURE=dos -set HB_COMPILER=bcc16 - -call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 - +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +set HB_ARCHITECTURE=dos +set HB_COMPILER=bcc16 + +call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 + diff --git a/harbour/bin/bld_b32.bat b/harbour/bin/bld_b32.bat index 73313fa126..78449b0bb9 100644 --- a/harbour/bin/bld_b32.bat +++ b/harbour/bin/bld_b32.bat @@ -1,17 +1,17 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_ARCHITECTURE=w32 -set HB_COMPILER=bcc32 - -call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 + +call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/bld_vc.bat b/harbour/bin/bld_vc.bat index 0c1469ba7e..ea288a2a97 100644 --- a/harbour/bin/bld_vc.bat +++ b/harbour/bin/bld_vc.bat @@ -1,17 +1,17 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_ARCHITECTURE=w32 -set HB_COMPILER=msvc - -call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc + +call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 45fdb46fe0..ab3be53e0a 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -1,29 +1,29 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem Copyright 2003 Przemyslaw Czerpak -rem simple script run after Harbour make install to finish install -rem process -rem -rem See doc/license.txt for licensing terms. -rem --------------------------------------------------------------- - -goto inst_%HB_ARCHITECTURE% - -:inst_dos -rem DOS post install part - -goto end - - -:inst_w32 -rem Windows post install part - -goto end - - -:inst_ -:end +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem Copyright 2003 Przemyslaw Czerpak +rem simple script run after Harbour make install to finish install +rem process +rem +rem See doc/license.txt for licensing terms. +rem --------------------------------------------------------------- + +goto inst_%HB_ARCHITECTURE% + +:inst_dos +rem DOS post install part + +goto end + + +:inst_w32 +rem Windows post install part + +goto end + + +:inst_ +:end diff --git a/harbour/contrib/adordd/make_b32.bat b/harbour/contrib/adordd/make_b32.bat index 950f1f6e21..cbf3534d55 100644 --- a/harbour/contrib/adordd/make_b32.bat +++ b/harbour/contrib/adordd/make_b32.bat @@ -1,31 +1,31 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\adordd.lib ..\..\lib\*.* > nul - if exist ..\..\lib\b32\adordd.bak del ..\..\lib\b32\adordd.bak - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist ..\..\lib\b32\adordd.lib del ..\..\lib\b32\adordd.lib - if exist ..\..\lib\b32\adordd.bak del ..\..\lib\b32\adordd.bak - - goto EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\adordd.lib ..\..\lib\*.* > nul + if exist ..\..\lib\b32\adordd.bak del ..\..\lib\b32\adordd.bak + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\lib\b32\adordd.lib del ..\..\lib\b32\adordd.lib + if exist ..\..\lib\b32\adordd.bak del ..\..\lib\b32\adordd.bak + + goto EXIT + :EXIT \ No newline at end of file diff --git a/harbour/contrib/apollo/make_b32.bat b/harbour/contrib/apollo/make_b32.bat index c994d0e7f3..6df42ee764 100644 --- a/harbour/contrib/apollo/make_b32.bat +++ b/harbour/contrib/apollo/make_b32.bat @@ -1,35 +1,35 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\apollo.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist ..\..\lib\b32\apollo.lib del ..\..\lib\b32\apollo.lib - if exist ..\..\lib\b32\apollo.bak del ..\..\lib\b32\apollo.bak - if exist ..\..\obj\b32\apollo.obj del ..\..\obj\b32\apollo.obj - if exist ..\..\obj\b32\apollo1.c del ..\..\obj\b32\apollo1.c - if exist ..\..\obj\b32\apollo1.bak del ..\..\obj\b32\apollo1.bak - if exist ..\..\obj\b32\apollo1.obj del ..\..\obj\b32\apollo1.obj - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\apollo.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\lib\b32\apollo.lib del ..\..\lib\b32\apollo.lib + if exist ..\..\lib\b32\apollo.bak del ..\..\lib\b32\apollo.bak + if exist ..\..\obj\b32\apollo.obj del ..\..\obj\b32\apollo.obj + if exist ..\..\obj\b32\apollo1.c del ..\..\obj\b32\apollo1.c + if exist ..\..\obj\b32\apollo1.bak del ..\..\obj\b32\apollo1.bak + if exist ..\..\obj\b32\apollo1.obj del ..\..\obj\b32\apollo1.obj + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/apollo/test/bld.bat b/harbour/contrib/apollo/test/bld.bat index 69083055c5..c0174be86b 100644 --- a/harbour/contrib/apollo/test/bld.bat +++ b/harbour/contrib/apollo/test/bld.bat @@ -1,208 +1,208 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem Template to build a final Harbour executable, using Harbour -rem with the C code generation feature, then calling the proper C -rem linker/compiler. -rem -rem Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) -rem See doc/license.txt for licensing terms. -rem --------------------------------------------------------------- - -rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos -rem if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp -rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= - -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin\ -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib\ -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include\ - -:START - - if "%HB_ARCHITECTURE%" == "" goto NO_ARCH - if "%HB_COMPILER%" == "" goto NO_COMP - - if not "%1" == "" goto COMPILE - -:HELP - - echo. - echo Usage: bld filename - echo. - echo Notes: - echo. - echo - 'filename' is the .prg filename *without* extension. - echo - Don't forget to make a MAIN() function for you application. - echo - This batch file assumes you are in some directory off the main - echo harbour directory. - echo - Environment variables HB_ARCHITECTURE, HB_COMPILER, HB_GT_LIB - echo should be set. Setting HB_GT_LIB is optional. - echo The following values are currently supported: - echo. - echo HB_ARCHITECTURE: - echo - dos (HB_GT_LIB=gtdos by default) - echo - w32 (HB_GT_LIB=gtwin by default) - echo - linux (HB_GT_LIB=gtstd by default) - echo - os2 (HB_GT_LIB=gtos2 by default) - echo. - pause - echo HB_COMPILER: - echo - When HB_ARCHITECTURE=dos - echo - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit) - echo - djgpp (Delorie GNU C, DOS 32-bit) - echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) - echo - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit) - echo - When HB_ARCHITECTURE=w32 - echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) - echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) - echo - mingw32 (Cygnus/MinGW GNU C, Windows 32-bit) - echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) - echo - icc (IBM Visual Age C++, Windows 32-bit) - echo - msvc (Microsoft Visual C++, Windows 32-bit) - echo - When HB_ARCHITECTURE=linux - echo - gcc (GNU C, 32-bit) - echo - When HB_ARCHITECTURE=os2 - echo - gcc (EMX GNU C, OS/2 32-bit) - echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) - echo. - pause - echo HB_GT_LIB: - echo - gtstd (Standard streaming) (for all architectures) - echo - gtdos (DOS console) (for dos architecture) - echo - gtwin (Win32 console) (for w32 architecture) - echo - gtos2 (OS/2 console) (for os2 architecture) - echo - gtpca (PC ANSI console) (for all architectures) - echo - gtcrs (Curses console) (for linux, w32 architectures) - echo - gtsln (Slang console) (for linux, w32 architectures) - goto END - -:NO_ARCH - - echo Error: HB_ARCHITECTURE is not set. - goto HELP - -:NO_COMP - - echo Error: HB_COMPILER is not set. - goto HELP - -:BAD_ARCH - - echo Error: HB_ARCHITECTURE value is unsupported. - goto HELP - -:BAD_COMP - - echo Error: HB_COMPILER value is unsupported. - goto HELP - -:COMPILE - - %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 %3 %HARBOURFLAGS% - -:A_DOS - - if not "%HB_GT_LIB%" == "" set _HB_GT_LIB=%HB_GT_LIB% - - if not "%HB_ARCHITECTURE%" == "dos" goto A_W32 - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtdos - - if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT - - echo -O2 -d -mh %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp - echo -e%1.exe >> build.tmp - echo %1.c >> build.tmp - echo debug.lib >> build.tmp - echo vm.lib >> build.tmp - echo rtl.lib >> build.tmp - echo %_HB_GT_LIB%.lib >> build.tmp - echo lang.lib >> build.tmp - echo rdd.lib >> build.tmp - echo macro.lib >> build.tmp - echo pp.lib >> build.tmp - echo dbfntx.lib >> build.tmp - echo dbfcdx.lib >> build.tmp - echo common.lib >> build.tmp - bcc @build.tmp - del build.tmp - goto END - -:A_DOS_BCC16_NOT - - if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT - - echo %1.c > build.tmp - echo -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> build.tmp - echo -ldebug >> build.tmp - echo -lvm >> build.tmp - echo -lrtl >> build.tmp - echo -l%_HB_GT_LIB% >> build.tmp - echo -llang >> build.tmp - echo -lrdd >> build.tmp - echo -lrtl >> build.tmp - echo -lvm >> build.tmp - echo -lmacro >> build.tmp - echo -lpp >> build.tmp - echo -ldbfnt >> build.tmp - echo -ldbfcd >> build.tmp - echo -lcommo >> build.tmp - gcc @build.tmp - del build.tmp - goto END - -:A_DOS_DJGPP_NOT - - if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - goto END - -:A_W32 - - if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2 - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin - - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib apollo.lib sde60.lib - if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib user32.lib winspool.lib - if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning - - goto END - -:A_OS2 - - if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2 - - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib - goto END - -:A_LINUX - - if not "%HB_ARCHITECTURE%" == "linux" goto BAD_ARCH - - if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd - - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - goto END - -:CLEANUP - - del %1.c - +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem Template to build a final Harbour executable, using Harbour +rem with the C code generation feature, then calling the proper C +rem linker/compiler. +rem +rem Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) +rem See doc/license.txt for licensing terms. +rem --------------------------------------------------------------- + +rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos +rem if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp +rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= + +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin\ +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib\ +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include\ + +:START + + if "%HB_ARCHITECTURE%" == "" goto NO_ARCH + if "%HB_COMPILER%" == "" goto NO_COMP + + if not "%1" == "" goto COMPILE + +:HELP + + echo. + echo Usage: bld filename + echo. + echo Notes: + echo. + echo - 'filename' is the .prg filename *without* extension. + echo - Don't forget to make a MAIN() function for you application. + echo - This batch file assumes you are in some directory off the main + echo harbour directory. + echo - Environment variables HB_ARCHITECTURE, HB_COMPILER, HB_GT_LIB + echo should be set. Setting HB_GT_LIB is optional. + echo The following values are currently supported: + echo. + echo HB_ARCHITECTURE: + echo - dos (HB_GT_LIB=gtdos by default) + echo - w32 (HB_GT_LIB=gtwin by default) + echo - linux (HB_GT_LIB=gtstd by default) + echo - os2 (HB_GT_LIB=gtos2 by default) + echo. + pause + echo HB_COMPILER: + echo - When HB_ARCHITECTURE=dos + echo - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit) + echo - djgpp (Delorie GNU C, DOS 32-bit) + echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) + echo - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit) + echo - When HB_ARCHITECTURE=w32 + echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) + echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) + echo - mingw32 (Cygnus/MinGW GNU C, Windows 32-bit) + echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) + echo - icc (IBM Visual Age C++, Windows 32-bit) + echo - msvc (Microsoft Visual C++, Windows 32-bit) + echo - When HB_ARCHITECTURE=linux + echo - gcc (GNU C, 32-bit) + echo - When HB_ARCHITECTURE=os2 + echo - gcc (EMX GNU C, OS/2 32-bit) + echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) + echo. + pause + echo HB_GT_LIB: + echo - gtstd (Standard streaming) (for all architectures) + echo - gtdos (DOS console) (for dos architecture) + echo - gtwin (Win32 console) (for w32 architecture) + echo - gtos2 (OS/2 console) (for os2 architecture) + echo - gtpca (PC ANSI console) (for all architectures) + echo - gtcrs (Curses console) (for linux, w32 architectures) + echo - gtsln (Slang console) (for linux, w32 architectures) + goto END + +:NO_ARCH + + echo Error: HB_ARCHITECTURE is not set. + goto HELP + +:NO_COMP + + echo Error: HB_COMPILER is not set. + goto HELP + +:BAD_ARCH + + echo Error: HB_ARCHITECTURE value is unsupported. + goto HELP + +:BAD_COMP + + echo Error: HB_COMPILER value is unsupported. + goto HELP + +:COMPILE + + %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 %3 %HARBOURFLAGS% + +:A_DOS + + if not "%HB_GT_LIB%" == "" set _HB_GT_LIB=%HB_GT_LIB% + + if not "%HB_ARCHITECTURE%" == "dos" goto A_W32 + + if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtdos + + if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT + + echo -O2 -d -mh %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp + echo -e%1.exe >> build.tmp + echo %1.c >> build.tmp + echo debug.lib >> build.tmp + echo vm.lib >> build.tmp + echo rtl.lib >> build.tmp + echo %_HB_GT_LIB%.lib >> build.tmp + echo lang.lib >> build.tmp + echo rdd.lib >> build.tmp + echo macro.lib >> build.tmp + echo pp.lib >> build.tmp + echo dbfntx.lib >> build.tmp + echo dbfcdx.lib >> build.tmp + echo common.lib >> build.tmp + bcc @build.tmp + del build.tmp + goto END + +:A_DOS_BCC16_NOT + + if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT + + echo %1.c > build.tmp + echo -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> build.tmp + echo -ldebug >> build.tmp + echo -lvm >> build.tmp + echo -lrtl >> build.tmp + echo -l%_HB_GT_LIB% >> build.tmp + echo -llang >> build.tmp + echo -lrdd >> build.tmp + echo -lrtl >> build.tmp + echo -lvm >> build.tmp + echo -lmacro >> build.tmp + echo -lpp >> build.tmp + echo -ldbfnt >> build.tmp + echo -ldbfcd >> build.tmp + echo -lcommo >> build.tmp + gcc @build.tmp + del build.tmp + goto END + +:A_DOS_DJGPP_NOT + + if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + goto END + +:A_W32 + + if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2 + + if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin + + if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib apollo.lib sde60.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib user32.lib winspool.lib + if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning + + goto END + +:A_OS2 + + if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX + + if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2 + + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib + goto END + +:A_LINUX + + if not "%HB_ARCHITECTURE%" == "linux" goto BAD_ARCH + + if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd + + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + goto END + +:CLEANUP + + del %1.c + :END \ No newline at end of file diff --git a/harbour/contrib/apollo/test/bld_b32.bat b/harbour/contrib/apollo/test/bld_b32.bat index 7bd51205b3..bd27176818 100644 --- a/harbour/contrib/apollo/test/bld_b32.bat +++ b/harbour/contrib/apollo/test/bld_b32.bat @@ -1,18 +1,18 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -cls -set HB_ARCHITECTURE=w32 -set HB_COMPILER=bcc32 - -call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +cls +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 + +call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/bmdbfcdx/make_b32.bat b/harbour/contrib/bmdbfcdx/make_b32.bat index b741127650..51d54ecf2e 100644 --- a/harbour/contrib/bmdbfcdx/make_b32.bat +++ b/harbour/contrib/bmdbfcdx/make_b32.bat @@ -1,35 +1,35 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\bmdbfcdx.lib ..\..\lib\*.* > nul - if exist ..\..\lib\b32\bmdbfcdx.bak del ..\..\lib\b32\bmdbfcdx.bak - copy ..\..\lib\b32\bmsixcdx.lib ..\..\lib\*.* > nul - if exist ..\..\lib\b32\bmsixcdx.bak del ..\..\lib\b32\bmsixcdx.bak - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist ..\..\lib\b32\bmdbfcdx.lib del ..\..\lib\b32\bmdbfcdx.lib - if exist ..\..\lib\b32\bmdbfcdx.bak del ..\..\lib\b32\bmdbfcdx.bak - if exist ..\..\lib\b32\bmsixcdx.lib del ..\..\lib\b32\bmsixcdx.lib - if exist ..\..\lib\b32\bmsixcdx.bak del ..\..\lib\b32\bmsixcdx.bak - - goto EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\bmdbfcdx.lib ..\..\lib\*.* > nul + if exist ..\..\lib\b32\bmdbfcdx.bak del ..\..\lib\b32\bmdbfcdx.bak + copy ..\..\lib\b32\bmsixcdx.lib ..\..\lib\*.* > nul + if exist ..\..\lib\b32\bmsixcdx.bak del ..\..\lib\b32\bmsixcdx.bak + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\lib\b32\bmdbfcdx.lib del ..\..\lib\b32\bmdbfcdx.lib + if exist ..\..\lib\b32\bmdbfcdx.bak del ..\..\lib\b32\bmdbfcdx.bak + if exist ..\..\lib\b32\bmsixcdx.lib del ..\..\lib\b32\bmsixcdx.lib + if exist ..\..\lib\b32\bmsixcdx.bak del ..\..\lib\b32\bmsixcdx.bak + + goto EXIT + :EXIT \ No newline at end of file diff --git a/harbour/contrib/btree/make_b32.bat b/harbour/contrib/btree/make_b32.bat index 59407264a4..0192f51a13 100644 --- a/harbour/contrib/btree/make_b32.bat +++ b/harbour/contrib/btree/make_b32.bat @@ -1,34 +1,34 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\hb_btree.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist ..\..\lib\b32\hb_btree.lib del ..\..\lib\b32\hb_btree.lib - if exist ..\..\lib\b32\hb_btree.bak del ..\..\lib\b32\hb_btree.bak - if exist ..\..\obj\b32\hb_btree.obj del ..\..\obj\b32\hb_btree.obj - if exist ..\..\obj\b32\tbtree.obj del ..\..\obj\b32\tbtree.obj - if exist ..\..\obj\b32\tbtree.c del ..\..\obj\b32\tbtree.c - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\hb_btree.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\lib\b32\hb_btree.lib del ..\..\lib\b32\hb_btree.lib + if exist ..\..\lib\b32\hb_btree.bak del ..\..\lib\b32\hb_btree.bak + if exist ..\..\obj\b32\hb_btree.obj del ..\..\obj\b32\hb_btree.obj + if exist ..\..\obj\b32\tbtree.obj del ..\..\obj\b32\tbtree.obj + if exist ..\..\obj\b32\tbtree.c del ..\..\obj\b32\tbtree.c + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/btree/mktest.bat b/harbour/contrib/btree/mktest.bat index 77543f604e..4739ec7bfc 100644 --- a/harbour/contrib/btree/mktest.bat +++ b/harbour/contrib/btree/mktest.bat @@ -1,21 +1,21 @@ -@echo off - -cd test\dos\djgpp\ -del test.exe -del *.c - -..\..\..\..\..\source\compiler\dos\djgpp\harbour.exe ../../test.prg -n -q0 -w -es2 -gc0 -I../../ -I../../../ -I../../../../../include -gcc -I. -I../../../../../include -Wall -c test.c -otest.o - -..\..\..\..\..\source\compiler\dos\djgpp\harbour.exe ../../ttest.prg -n -q0 -w -es2 -gc0 -I../../ -I../../../ -I../../../../../include -gcc -I. -I../../../../../include -Wall -c ttest.c -ottest.o - -gcc -I. -I../../../../../include -I../../.. -Wall -c ../../ctest.c -octest.o - -gcc @__link__.tmp -cd ..\..\.. - -pause -test\dos\djgpp\test - +@echo off + +cd test\dos\djgpp\ +del test.exe +del *.c + +..\..\..\..\..\source\compiler\dos\djgpp\harbour.exe ../../test.prg -n -q0 -w -es2 -gc0 -I../../ -I../../../ -I../../../../../include +gcc -I. -I../../../../../include -Wall -c test.c -otest.o + +..\..\..\..\..\source\compiler\dos\djgpp\harbour.exe ../../ttest.prg -n -q0 -w -es2 -gc0 -I../../ -I../../../ -I../../../../../include +gcc -I. -I../../../../../include -Wall -c ttest.c -ottest.o + +gcc -I. -I../../../../../include -I../../.. -Wall -c ../../ctest.c -octest.o + +gcc @__link__.tmp +cd ..\..\.. + +pause +test\dos\djgpp\test + :done \ No newline at end of file diff --git a/harbour/contrib/delphi/hbdll/bld_sdll.bat b/harbour/contrib/delphi/hbdll/bld_sdll.bat index db4ed8be6e..50bafe7055 100644 --- a/harbour/contrib/delphi/hbdll/bld_sdll.bat +++ b/harbour/contrib/delphi/hbdll/bld_sdll.bat @@ -1,84 +1,84 @@ -rem Self contained Harbour DLL, original idea and research Antonio Linares -rem -rem $Id$ -rem -@ECHO OFF -CLS - -if A%1 == A GOTO :SINTAX -if NOT EXIST %1.prg GOTO :NOEXIST - -ECHO Compiling... - -set hdir=c:\hb-dev\harbour -set bcdir=c:\borland\bcc55\bin - -%bcdir%\bcc32 -c -D__EXPORT__ -I%hdir%\include -L%bcdir%\..\lib %hdir%\source\vm\maindll.c - -rem Files to integrate harbour DLL to Delphi -%bcdir%\bcc32 -c -D__EXPORT__ -I%hdir%\include -L%bcdir%\..\lib macrcall.c -%hdir%\bin\harbour -n -w errorsys -%bcdir%\bcc32 -c -D__EXPORT__ -I%hdir%\include errorsys.c - -%hdir%\bin\harbour %1 /n /i%hdir%\include /w /p %2 %3 > clip.log -@type clip.log -IF ERRORLEVEL 1 PAUSE -IF ERRORLEVEL 1 GOTO EXIT - -echo -O2 -I%hdir%\include %1.c > b32.bc -%bcdir%\bcc32 -M -c @b32.bc -:ENDCOMPILE - -IF EXIST %1.rc %bcdir%\brc32 -r %1 - -echo c0d32.obj + > b32.bc -echo %1.obj+errorsys.obj+maindll.obj+macrcall.obj, + >> b32.bc -echo %1.dll, + >> b32.bc -echo %1.map, + >> b32.bc -rem echo ..\lib\FiveH.lib ..\lib\FiveHC.lib + >> b32.bc -echo %hdir%\lib\rtl.lib + >> b32.bc -echo %hdir%\lib\vm.lib + >> b32.bc -echo %hdir%\lib\gtwin.lib + >> b32.bc -echo %hdir%\lib\lang.lib + >> b32.bc -echo %hdir%\lib\macro.lib + >> b32.bc -echo %hdir%\lib\rdd.lib + >> b32.bc -echo %hdir%\lib\dbfntx.lib + >> b32.bc -echo %hdir%\lib\dbfcdx.lib + >> b32.bc -echo %hdir%\lib\debug.lib + >> b32.bc -echo %hdir%\lib\common.lib + >> b32.bc -echo %hdir%\lib\pp.lib + >> b32.bc - -rem Uncomment these two lines to use Advantage RDD -rem echo %hdir%\lib\rddads.lib + >> b32.bc -rem echo ..\lib\Ace32.lib + >> b32.bc - -echo %bcdir%\lib\import32.lib + >> b32.bc -echo %bcdir%\lib\cw32.lib + >> b32.bc -echo %bcdir%\lib\psdk\odbc32.lib, >> b32.bc -IF EXIST %1.res echo %1.res >> b32.bc -%bcdir%\ilink32 -Tpd -aa -L%bcdir%\..\lib -L%bcdir%\..\lib\PSDK @b32.bc - -rem delete temporary files -@del %1.c -@del %1.il? - -IF ERRORLEVEL 1 GOTO LINKERROR -ECHO * self contained DLL successfully built -GOTO EXIT -ECHO - -:LINKERROR -rem if exist meminfo.txt notepad meminfo.txt -rem PAUSE * Linking errors * -GOTO EXIT - -:SINTAX -ECHO SYNTAX: Build [Program] {-- No especifiques la extensi˝n PRG -ECHO {-- Don't specify .PRG extension -GOTO EXIT - -:NOEXIST -ECHO The specified PRG %1 does not exist - -:EXIT - +rem Self contained Harbour DLL, original idea and research Antonio Linares +rem +rem $Id$ +rem +@ECHO OFF +CLS + +if A%1 == A GOTO :SINTAX +if NOT EXIST %1.prg GOTO :NOEXIST + +ECHO Compiling... + +set hdir=c:\hb-dev\harbour +set bcdir=c:\borland\bcc55\bin + +%bcdir%\bcc32 -c -D__EXPORT__ -I%hdir%\include -L%bcdir%\..\lib %hdir%\source\vm\maindll.c + +rem Files to integrate harbour DLL to Delphi +%bcdir%\bcc32 -c -D__EXPORT__ -I%hdir%\include -L%bcdir%\..\lib macrcall.c +%hdir%\bin\harbour -n -w errorsys +%bcdir%\bcc32 -c -D__EXPORT__ -I%hdir%\include errorsys.c + +%hdir%\bin\harbour %1 /n /i%hdir%\include /w /p %2 %3 > clip.log +@type clip.log +IF ERRORLEVEL 1 PAUSE +IF ERRORLEVEL 1 GOTO EXIT + +echo -O2 -I%hdir%\include %1.c > b32.bc +%bcdir%\bcc32 -M -c @b32.bc +:ENDCOMPILE + +IF EXIST %1.rc %bcdir%\brc32 -r %1 + +echo c0d32.obj + > b32.bc +echo %1.obj+errorsys.obj+maindll.obj+macrcall.obj, + >> b32.bc +echo %1.dll, + >> b32.bc +echo %1.map, + >> b32.bc +rem echo ..\lib\FiveH.lib ..\lib\FiveHC.lib + >> b32.bc +echo %hdir%\lib\rtl.lib + >> b32.bc +echo %hdir%\lib\vm.lib + >> b32.bc +echo %hdir%\lib\gtwin.lib + >> b32.bc +echo %hdir%\lib\lang.lib + >> b32.bc +echo %hdir%\lib\macro.lib + >> b32.bc +echo %hdir%\lib\rdd.lib + >> b32.bc +echo %hdir%\lib\dbfntx.lib + >> b32.bc +echo %hdir%\lib\dbfcdx.lib + >> b32.bc +echo %hdir%\lib\debug.lib + >> b32.bc +echo %hdir%\lib\common.lib + >> b32.bc +echo %hdir%\lib\pp.lib + >> b32.bc + +rem Uncomment these two lines to use Advantage RDD +rem echo %hdir%\lib\rddads.lib + >> b32.bc +rem echo ..\lib\Ace32.lib + >> b32.bc + +echo %bcdir%\lib\import32.lib + >> b32.bc +echo %bcdir%\lib\cw32.lib + >> b32.bc +echo %bcdir%\lib\psdk\odbc32.lib, >> b32.bc +IF EXIST %1.res echo %1.res >> b32.bc +%bcdir%\ilink32 -Tpd -aa -L%bcdir%\..\lib -L%bcdir%\..\lib\PSDK @b32.bc + +rem delete temporary files +@del %1.c +@del %1.il? + +IF ERRORLEVEL 1 GOTO LINKERROR +ECHO * self contained DLL successfully built +GOTO EXIT +ECHO + +:LINKERROR +rem if exist meminfo.txt notepad meminfo.txt +rem PAUSE * Linking errors * +GOTO EXIT + +:SINTAX +ECHO SYNTAX: Build [Program] {-- No especifiques la extensi˝n PRG +ECHO {-- Don't specify .PRG extension +GOTO EXIT + +:NOEXIST +ECHO The specified PRG %1 does not exist + +:EXIT + diff --git a/harbour/contrib/delphi/hbdll/start.bat b/harbour/contrib/delphi/hbdll/start.bat index 701fa4e491..4cbf849a77 100644 --- a/harbour/contrib/delphi/hbdll/start.bat +++ b/harbour/contrib/delphi/hbdll/start.bat @@ -1,5 +1,5 @@ -rem Makes our PRG to be a DLL, from an Antonio's idea and research -rem -rem $Id$ -rem -Call bld_sdll myprog +rem Makes our PRG to be a DLL, from an Antonio's idea and research +rem +rem $Id$ +rem +Call bld_sdll myprog diff --git a/harbour/contrib/directx/buvcdx.bat b/harbour/contrib/directx/buvcdx.bat index 079bfef97c..93aa787970 100644 --- a/harbour/contrib/directx/buvcdx.bat +++ b/harbour/contrib/directx/buvcdx.bat @@ -1,2 +1,2 @@ -..\..\bin\harbour %1 /n +..\..\bin\harbour %1 /n cl -Fd..\..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_GTAPI -DHARBOUR_USE_WIN_GTAPI -I..\..\include %1.c /link /subsystem:WINDOWS /NODEFAULTLIB:libcd.lib ..\..\obj\symbols.obj ..\..\libs\vc\harbour.lib ..\..\libs\vc\terminal.lib libc.lib user32.lib ..\..\Contrib\DirectX\directx\release\directx.lib ..\..\libs\win32\directx\lib\vc\ddraw.lib gdi32.lib \ No newline at end of file diff --git a/harbour/contrib/gd/make_b32.bat b/harbour/contrib/gd/make_b32.bat index ef760974ab..4ba2e1c6da 100644 --- a/harbour/contrib/gd/make_b32.bat +++ b/harbour/contrib/gd/make_b32.bat @@ -1,60 +1,60 @@ -@echo off - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN -:BUILD - -if not exist bgd.dll goto NODLL - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - - impdef -a ..\..\lib\b32\libbgd.def bgd.dll > make_b32.log - if errorlevel 1 goto BUILD_ERR - - implib -a ..\..\lib\b32\libbgd.lib ..\..\lib\b32\libbgd.def > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\libbgd.lib ..\..\lib > nul - copy ..\..\lib\b32\hbgd.lib ..\..\lib > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - - if exist ..\..\lib\b32\hbgd.lib del ..\..\lib\b32\hbgd.lib - if exist ..\..\lib\b32\hbgd.bak del ..\..\lib\b32\hbgd.bak - - if exist ..\..\obj\b32\gdwrp.obj del ..\..\obj\b32\gdwrp.obj - - if exist ..\..\obj\b32\gd.c del ..\..\obj\b32\gd.c - if exist ..\..\obj\b32\gdimage.c del ..\..\obj\b32\gdimage.c - if exist ..\..\obj\b32\gdchart.c del ..\..\obj\b32\gdchart.c - if exist ..\..\obj\b32\gdbar.c del ..\..\obj\b32\gdbar.c - if exist ..\..\obj\b32\gdbarcod.c del ..\..\obj\b32\gdbarcod.c - - if exist ..\..\obj\b32\gd.obj del ..\..\obj\b32\gd.obj - if exist ..\..\obj\b32\gdimage.obj del ..\..\obj\b32\gdimage.obj - if exist ..\..\obj\b32\gdchart.obj del ..\..\obj\b32\gdchart.obj - if exist ..\..\obj\b32\gdbar.obj del ..\..\obj\b32\gdbar.obj - if exist ..\..\obj\b32\gdbarcod.obj del ..\..\obj\b32\gdbarcod.obj - goto EXIT - - -:NODLL - -echo. -echo.Missing bgd.dll, please download it from: -echo.http://www.libgd.org/Downloads (Windows.DLL) -echo. -echo.Make aborted. -echo. - -:EXIT - +@echo off + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN +:BUILD + +if not exist bgd.dll goto NODLL + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + + impdef -a ..\..\lib\b32\libbgd.def bgd.dll > make_b32.log + if errorlevel 1 goto BUILD_ERR + + implib -a ..\..\lib\b32\libbgd.lib ..\..\lib\b32\libbgd.def > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\libbgd.lib ..\..\lib > nul + copy ..\..\lib\b32\hbgd.lib ..\..\lib > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + if exist ..\..\lib\b32\hbgd.lib del ..\..\lib\b32\hbgd.lib + if exist ..\..\lib\b32\hbgd.bak del ..\..\lib\b32\hbgd.bak + + if exist ..\..\obj\b32\gdwrp.obj del ..\..\obj\b32\gdwrp.obj + + if exist ..\..\obj\b32\gd.c del ..\..\obj\b32\gd.c + if exist ..\..\obj\b32\gdimage.c del ..\..\obj\b32\gdimage.c + if exist ..\..\obj\b32\gdchart.c del ..\..\obj\b32\gdchart.c + if exist ..\..\obj\b32\gdbar.c del ..\..\obj\b32\gdbar.c + if exist ..\..\obj\b32\gdbarcod.c del ..\..\obj\b32\gdbarcod.c + + if exist ..\..\obj\b32\gd.obj del ..\..\obj\b32\gd.obj + if exist ..\..\obj\b32\gdimage.obj del ..\..\obj\b32\gdimage.obj + if exist ..\..\obj\b32\gdchart.obj del ..\..\obj\b32\gdchart.obj + if exist ..\..\obj\b32\gdbar.obj del ..\..\obj\b32\gdbar.obj + if exist ..\..\obj\b32\gdbarcod.obj del ..\..\obj\b32\gdbarcod.obj + goto EXIT + + +:NODLL + +echo. +echo.Missing bgd.dll, please download it from: +echo.http://www.libgd.org/Downloads (Windows.DLL) +echo. +echo.Make aborted. +echo. + +:EXIT + diff --git a/harbour/contrib/gd/tests/bldtest.bat b/harbour/contrib/gd/tests/bldtest.bat index f26c9d2686..b9ef3b1116 100644 --- a/harbour/contrib/gd/tests/bldtest.bat +++ b/harbour/contrib/gd/tests/bldtest.bat @@ -1,159 +1,159 @@ -@echo off -rem *********************************************************** -rem * bldtest.bat -rem * -rem * $Id$ -rem * -rem * Batch file to build test programs in ST or MT environment -rem * -rem * (C) 2003 Francesco Saverio Giudice -rem * -rem *********************************************************** -rem * -rem * This is a generic batch file, if it doesn't fit your own needs -rem * please DON'T MODIFY IT. -rem * -rem * Instead, make a local copy and modify that one, or make a call to -rem * this batch file from your customized one. -rem * -rem *********************************************************** - -rem Saving current HB_MT state -set OLDENVMT=%HB_MT% -set OLDENVGT=%HB_GT_LIB% -set OLDENVC=%CFLAGS% -set OLD_HB_ARCHITECTURE=%HB_ARCHITECTURE% -set OLD_HB_COMPILER=%HB_COMPILER% -set OLD_HB_USER_LIBS=%HB_USER_LIBS% - -set HB_INSTALL=..\..\.. -if %HB_ARCHITECTURE%.==. set HB_ARCHITECTURE=w32 -if %HB_COMPILER%.==. set HB_COMPILER=bcc32 -SET HB_BIN_INSTALL=%HB_INSTALL%\bin -set HB_INC_INSTALL=..;%HB_INSTALL%\include -set HB_LIB_INSTALL=%HB_INSTALL%\lib -set HB_USER_LIBS=%HB_LIB_INSTALL%\hbgd.lib %HB_LIB_INSTALL%\libbgd.lib %HB_LIB_INSTALL%\libct.lib - -echo. -echo.BldTest.bat - /? or /h to display options -echo. - -:ARGUMENTS -rem Check parameters -IF %1.==. GOTO SHOWHELP -IF %1.==/?. GOTO SHOWHELP -IF %1.==/H. GOTO SHOWHELP -IF %1.==/h. GOTO SHOWHELP -IF %1.==/MT. GOTO SETMT -IF %1.==/mt. GOTO SETMT -IF %1.==/cgi. GOTO SETCGI -IF %1.==/CGI. GOTO SETCGI -IF %1.==/WVT. GOTO SETWVT -IF %1.==/wvt. GOTO SETWVT - -IF %BLDDEFAULT%.==N. GOTO CALLBLD -GOTO SETDEFAULT - -:SETMT -echo.Setting MultiThread (MT) mode -echo. -SET HB_MT=mt -SHIFT -SET BLDDEFAULT=N -GOTO ARGUMENTS - -:SETWVT -echo.Setting Windows Virtual Terminal (WVT) mode -echo. -SET HB_GT_LIB=gtwvt -SET CFLAGS=-W -SHIFT -SET BLDDEFAULT=N -GOTO ARGUMENTS - -:SETCGI -echo.Setting CGI Terminal (CGI) mode -echo. -SET HB_GT_LIB=gtcgi -SET CFLAGS= -SHIFT -SET BLDDEFAULT=N -GOTO ARGUMENTS - -:SETDEFAULT -echo.Setting Default Settings (ST/GTWIN) mode -echo. -SET HB_MT= -SET HB_GT_LIB=gtwin - -:CALLBLD -echo.Running %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 -echo. -echo.please wait ... -echo. -call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 > bldtest.log -IF ERRORLEVEL 1 GOTO SHOWERROR - -if exist %1.c del %1.c -if exist %1.obj del %1.obj -if exist %1.tds del %1.tds - -if exist %2.c del %2.c -if exist %2.obj del %2.obj -if exist %2.tds del %2.tds - -if exist %3.c del %3.c -if exist %3.obj del %3.obj -if exist %3.tds del %3.tds - -GOTO COMPILEOK - -:SHOWERROR -echo. -echo.Error on compiling ... -echo. -echo.Running notepad, please close to end this batch file ... -echo. -notepad bldtest.log -echo. -echo.Notepad closed, exiting ... -echo. -GOTO ENDSET - -:COMPILEOK -echo. -echo.Compiled successfully -echo. -if exist bldtest.log del bldtest.log -GOTO ENDSET - -:SHOWHELP -echo. -echo."bldtest [/MT|/mt|/CGI|/cgi|WVT|/wvt|/?|/H|/h] prgname" -echo. -echo. /MT = Set MT envinronment to build test program in MultiThread mode -echo. otherwise program will be compiled in SingleThread mode -echo. /CGI = Uses GTCGI instead of GTWIN to build test program. -echo. /WVT = Uses GTWVT instead of GTWIN to build test program. -echo. /? or /H = Show this help -echo. prgname = Name of prg file to compile without extension [.prg] -echo. - -:ENDSET - -rem Restore Old Settings -set HB_MT=%OLDENVMT% -set HB_GT_LIB=%OLDENVGT% -set CFLAGS=%OLDENVC% -set HB_ARCHITECTURE=%OLD_HB_ARCHITECTURE% -set HB_COMPILER=%OLD_HB_COMPILER% -set HB_USER_LIBS=%OLD_HB_USER_LIBS% - -set OLDENVGT= -set OLDENVC= -set OLDENVMT= -set BLDDEFAULT= -set OLD_HB_ARCHITECTURE= -set OLD_HB_COMPILER= -set OLD_HB_USER_LIBS= -:END +@echo off +rem *********************************************************** +rem * bldtest.bat +rem * +rem * $Id$ +rem * +rem * Batch file to build test programs in ST or MT environment +rem * +rem * (C) 2003 Francesco Saverio Giudice +rem * +rem *********************************************************** +rem * +rem * This is a generic batch file, if it doesn't fit your own needs +rem * please DON'T MODIFY IT. +rem * +rem * Instead, make a local copy and modify that one, or make a call to +rem * this batch file from your customized one. +rem * +rem *********************************************************** + +rem Saving current HB_MT state +set OLDENVMT=%HB_MT% +set OLDENVGT=%HB_GT_LIB% +set OLDENVC=%CFLAGS% +set OLD_HB_ARCHITECTURE=%HB_ARCHITECTURE% +set OLD_HB_COMPILER=%HB_COMPILER% +set OLD_HB_USER_LIBS=%HB_USER_LIBS% + +set HB_INSTALL=..\..\.. +if %HB_ARCHITECTURE%.==. set HB_ARCHITECTURE=w32 +if %HB_COMPILER%.==. set HB_COMPILER=bcc32 +SET HB_BIN_INSTALL=%HB_INSTALL%\bin +set HB_INC_INSTALL=..;%HB_INSTALL%\include +set HB_LIB_INSTALL=%HB_INSTALL%\lib +set HB_USER_LIBS=%HB_LIB_INSTALL%\hbgd.lib %HB_LIB_INSTALL%\libbgd.lib %HB_LIB_INSTALL%\libct.lib + +echo. +echo.BldTest.bat - /? or /h to display options +echo. + +:ARGUMENTS +rem Check parameters +IF %1.==. GOTO SHOWHELP +IF %1.==/?. GOTO SHOWHELP +IF %1.==/H. GOTO SHOWHELP +IF %1.==/h. GOTO SHOWHELP +IF %1.==/MT. GOTO SETMT +IF %1.==/mt. GOTO SETMT +IF %1.==/cgi. GOTO SETCGI +IF %1.==/CGI. GOTO SETCGI +IF %1.==/WVT. GOTO SETWVT +IF %1.==/wvt. GOTO SETWVT + +IF %BLDDEFAULT%.==N. GOTO CALLBLD +GOTO SETDEFAULT + +:SETMT +echo.Setting MultiThread (MT) mode +echo. +SET HB_MT=mt +SHIFT +SET BLDDEFAULT=N +GOTO ARGUMENTS + +:SETWVT +echo.Setting Windows Virtual Terminal (WVT) mode +echo. +SET HB_GT_LIB=gtwvt +SET CFLAGS=-W +SHIFT +SET BLDDEFAULT=N +GOTO ARGUMENTS + +:SETCGI +echo.Setting CGI Terminal (CGI) mode +echo. +SET HB_GT_LIB=gtcgi +SET CFLAGS= +SHIFT +SET BLDDEFAULT=N +GOTO ARGUMENTS + +:SETDEFAULT +echo.Setting Default Settings (ST/GTWIN) mode +echo. +SET HB_MT= +SET HB_GT_LIB=gtwin + +:CALLBLD +echo.Running %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 +echo. +echo.please wait ... +echo. +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 > bldtest.log +IF ERRORLEVEL 1 GOTO SHOWERROR + +if exist %1.c del %1.c +if exist %1.obj del %1.obj +if exist %1.tds del %1.tds + +if exist %2.c del %2.c +if exist %2.obj del %2.obj +if exist %2.tds del %2.tds + +if exist %3.c del %3.c +if exist %3.obj del %3.obj +if exist %3.tds del %3.tds + +GOTO COMPILEOK + +:SHOWERROR +echo. +echo.Error on compiling ... +echo. +echo.Running notepad, please close to end this batch file ... +echo. +notepad bldtest.log +echo. +echo.Notepad closed, exiting ... +echo. +GOTO ENDSET + +:COMPILEOK +echo. +echo.Compiled successfully +echo. +if exist bldtest.log del bldtest.log +GOTO ENDSET + +:SHOWHELP +echo. +echo."bldtest [/MT|/mt|/CGI|/cgi|WVT|/wvt|/?|/H|/h] prgname" +echo. +echo. /MT = Set MT envinronment to build test program in MultiThread mode +echo. otherwise program will be compiled in SingleThread mode +echo. /CGI = Uses GTCGI instead of GTWIN to build test program. +echo. /WVT = Uses GTWVT instead of GTWIN to build test program. +echo. /? or /H = Show this help +echo. prgname = Name of prg file to compile without extension [.prg] +echo. + +:ENDSET + +rem Restore Old Settings +set HB_MT=%OLDENVMT% +set HB_GT_LIB=%OLDENVGT% +set CFLAGS=%OLDENVC% +set HB_ARCHITECTURE=%OLD_HB_ARCHITECTURE% +set HB_COMPILER=%OLD_HB_COMPILER% +set HB_USER_LIBS=%OLD_HB_USER_LIBS% + +set OLDENVGT= +set OLDENVC= +set OLDENVMT= +set BLDDEFAULT= +set OLD_HB_ARCHITECTURE= +set OLD_HB_COMPILER= +set OLD_HB_USER_LIBS= +:END diff --git a/harbour/contrib/hbclip/make_clp.bat b/harbour/contrib/hbclip/make_clp.bat index 682cf9261d..0956d73fdc 100644 --- a/harbour/contrib/hbclip/make_clp.bat +++ b/harbour/contrib/hbclip/make_clp.bat @@ -1,29 +1,29 @@ -@echo off -rem -rem $Id$ -rem - -clipper hbclip.prg /n /w -clipper hbkeyput.prg /n /w -clipper hbshadow.prg /n /w -clipper hbvaltoc.prg /n /w - -cl /c /AL /Zl /Oalt /Gs /W3 hbarg.c -cl /c /AL /Zl /Oalt /Gs /W3 hbcolind.c -cl /c /AL /Zl /Oalt /Gs /W3 hbstod.c -cl /c /AL /Zl /Oalt /Gs /W3 hbstodx.c - -del hbclip.lib - -lib hbclip -+ hbclip.obj ,, -lib hbclip -+ hbkeyput.obj ,, -lib hbclip -+ hbshadow.obj ,, -lib hbclip -+ hbvaltoc.obj ,, - -lib hbclip -+ hbarg.obj ,, -lib hbclip -+ hbcolind.obj ,, -lib hbclip -+ hbstod.obj ,, -lib hbclip -+ hbstodx.obj ,, - -del hbclip.bak -del *.obj +@echo off +rem +rem $Id$ +rem + +clipper hbclip.prg /n /w +clipper hbkeyput.prg /n /w +clipper hbshadow.prg /n /w +clipper hbvaltoc.prg /n /w + +cl /c /AL /Zl /Oalt /Gs /W3 hbarg.c +cl /c /AL /Zl /Oalt /Gs /W3 hbcolind.c +cl /c /AL /Zl /Oalt /Gs /W3 hbstod.c +cl /c /AL /Zl /Oalt /Gs /W3 hbstodx.c + +del hbclip.lib + +lib hbclip -+ hbclip.obj ,, +lib hbclip -+ hbkeyput.obj ,, +lib hbclip -+ hbshadow.obj ,, +lib hbclip -+ hbvaltoc.obj ,, + +lib hbclip -+ hbarg.obj ,, +lib hbclip -+ hbcolind.obj ,, +lib hbclip -+ hbstod.obj ,, +lib hbclip -+ hbstodx.obj ,, + +del hbclip.bak +del *.obj diff --git a/harbour/contrib/hbzlib/dll_b32.bat b/harbour/contrib/hbzlib/dll_b32.bat index 25a6d2cac6..be0a2ae13a 100644 --- a/harbour/contrib/hbzlib/dll_b32.bat +++ b/harbour/contrib/hbzlib/dll_b32.bat @@ -1,34 +1,34 @@ -@echo off -REM -REM $Id$ -REM -REM - -if not exist obj\dll md obj\dll -if not exist obj\dll\b32 md obj\dll\b32 - -:BUILD - - make -fhrbdll.bc %1 %2 %3 > dll_b32.log - if errorlevel 1 goto BUILD_ERR - if "%1" == "clean" goto CLEAN - if "%1" == "CLEAN" goto CLEAN - -:BUILD_OK - -if exist hdll.tmp del hdll.tmp -if exist ..\..\lib\b32\hbzipdll.dll implib ..\..\lib\b32\hbzipdll.lib ..\..\lib\b32\hbzipdll.dll > nul -if exist ..\..\lib\b32\hbzipdll.dll copy ..\..\lib\b32\hbzipdll.dll ..\..\lib > nul -if exist ..\..\lib\b32\hbzipdll.lib copy ..\..\lib\b32\hbzipdll.lib ..\..\lib > nul - -goto EXIT - -:BUILD_ERR - -notepad dll_b32.log -goto EXIT - -:CLEAN - if exist dll_b32.log del dll_b32.log - -:EXIT +@echo off +REM +REM $Id$ +REM +REM + +if not exist obj\dll md obj\dll +if not exist obj\dll\b32 md obj\dll\b32 + +:BUILD + + make -fhrbdll.bc %1 %2 %3 > dll_b32.log + if errorlevel 1 goto BUILD_ERR + if "%1" == "clean" goto CLEAN + if "%1" == "CLEAN" goto CLEAN + +:BUILD_OK + +if exist hdll.tmp del hdll.tmp +if exist ..\..\lib\b32\hbzipdll.dll implib ..\..\lib\b32\hbzipdll.lib ..\..\lib\b32\hbzipdll.dll > nul +if exist ..\..\lib\b32\hbzipdll.dll copy ..\..\lib\b32\hbzipdll.dll ..\..\lib > nul +if exist ..\..\lib\b32\hbzipdll.lib copy ..\..\lib\b32\hbzipdll.lib ..\..\lib > nul + +goto EXIT + +:BUILD_ERR + +notepad dll_b32.log +goto EXIT + +:CLEAN + if exist dll_b32.log del dll_b32.log + +:EXIT diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat index e6c1472eb5..56e14150bb 100644 --- a/harbour/contrib/hbzlib/make_b32.bat +++ b/harbour/contrib/hbzlib/make_b32.bat @@ -1,29 +1,29 @@ -@echo off -rem -rem $Id$ -rem - -if not exist obj md obj -if not exist obj\b32 md obj\b32 - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if "%1" == "clean" goto CLEAN - if "%1" == "CLEAN" goto CLEAN - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - copy ..\..\lib\b32\hbzip.lib ..\..\lib > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist make_b32.log del make_b32.log - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if not exist obj md obj +if not exist obj\b32 md obj\b32 + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if "%1" == "clean" goto CLEAN + if "%1" == "CLEAN" goto CLEAN + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + copy ..\..\lib\b32\hbzip.lib ..\..\lib > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist make_b32.log del make_b32.log + +:EXIT + diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat index a4bf042733..cb7d3c2d35 100644 --- a/harbour/contrib/hbzlib/make_vc.bat +++ b/harbour/contrib/hbzlib/make_vc.bat @@ -1,22 +1,22 @@ -@echo off -rem -rem $Id$ -rem - -if not exist obj md obj -if not exist obj\vc md obj\vc - -:BUILD - - nmake -fmakefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - copy ..\..\lib\vc\hbzip.lib ..\..\lib > nul - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - -:EXIT +@echo off +rem +rem $Id$ +rem + +if not exist obj md obj +if not exist obj\vc md obj\vc + +:BUILD + + nmake -fmakefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + copy ..\..\lib\vc\hbzip.lib ..\..\lib > nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT diff --git a/harbour/contrib/hgf/tests/build_b32.bat b/harbour/contrib/hgf/tests/build_b32.bat index 822fc6cb49..38a3550374 100644 --- a/harbour/contrib/hgf/tests/build_b32.bat +++ b/harbour/contrib/hgf/tests/build_b32.bat @@ -1,81 +1,81 @@ -@rem -@rem $Id$ -@rem - -@ECHO OFF -CLS - -if A%1 == A GOTO :SINTAX -if NOT EXIST %1.prg GOTO :NOEXIST - -ECHO Compiling... - -set hdir=..\..\.. -set bcdir=c:\bcc55\bin - -%hdir%\bin\harbour %1 /n /p /i..\include;%hdir%\include %2 %3 > comp.log -@type comp.log -IF ERRORLEVEL 1 PAUSE -IF ERRORLEVEL 1 GOTO EXIT - -echo -O2 -e%1.exe -I%hdir%\include %1.c > b32.bc -%bcdir%\bcc32 -M -c @b32.bc -:ENDCOMPILE - -echo c0w32.obj + > b32.bc -echo %1.obj, + >> b32.bc -echo %1.exe, + >> b32.bc -echo %1.map, + >> b32.bc -echo %hdir%\lib\rtl.lib + >> b32.bc -echo %hdir%\lib\vm.lib + >> b32.bc -echo %hdir%\lib\gtwin.lib + >> b32.bc -echo %hdir%\lib\lang.lib + >> b32.bc -echo %hdir%\lib\macro.lib + >> b32.bc -echo %hdir%\lib\rdd.lib + >> b32.bc -echo %hdir%\lib\dbfntx.lib + >> b32.bc -echo %hdir%\lib\dbfcdx.lib + >> b32.bc -echo %hdir%\lib\debug.lib + >> b32.bc -echo %hdir%\lib\common.lib + >> b32.bc -echo %hdir%\lib\pp.lib + >> b32.bc -echo %hdir%\lib\hgfwin32.lib + >> b32.bc - -rem Uncomment these two lines to use Advantage RDD -rem echo %hdir%\lib\rddads.lib + >> b32.bc -rem echo %hdir%\lib\ace32.lib + >> b32.bc - -echo %bcdir%\lib\cw32.lib + >> b32.bc -echo %bcdir%\lib\import32.lib, >> b32.bc - -ECHO * -ECHO Linking... -rem Use these flags to avoid the console window creation -rem %bcdir%\ilink32 -Gn -aa -Tpe -s @b32.bc -%bcdir%\ilink32 -Gn -Tpe -s @b32.bc - -rem delete temporary files -@del %1.c -@del b32.bc -@del comp.log -@del %1.map -@del %1.obj -@del %1.tds - -IF ERRORLEVEL 1 GOTO LINKERROR -ECHO * Application successfully built -%1 -GOTO EXIT -ECHO - -:LINKERROR -rem if exist meminfo.txt notepad meminfo.txt -rem PAUSE * Linking errors * -GOTO EXIT - -:SINTAX -ECHO SYNTAX: Build [Program] {-- Don't specify .PRG extension -GOTO EXIT - -:NOEXIST -ECHO The specified PRG %1 does not exist - +@rem +@rem $Id$ +@rem + +@ECHO OFF +CLS + +if A%1 == A GOTO :SINTAX +if NOT EXIST %1.prg GOTO :NOEXIST + +ECHO Compiling... + +set hdir=..\..\.. +set bcdir=c:\bcc55\bin + +%hdir%\bin\harbour %1 /n /p /i..\include;%hdir%\include %2 %3 > comp.log +@type comp.log +IF ERRORLEVEL 1 PAUSE +IF ERRORLEVEL 1 GOTO EXIT + +echo -O2 -e%1.exe -I%hdir%\include %1.c > b32.bc +%bcdir%\bcc32 -M -c @b32.bc +:ENDCOMPILE + +echo c0w32.obj + > b32.bc +echo %1.obj, + >> b32.bc +echo %1.exe, + >> b32.bc +echo %1.map, + >> b32.bc +echo %hdir%\lib\rtl.lib + >> b32.bc +echo %hdir%\lib\vm.lib + >> b32.bc +echo %hdir%\lib\gtwin.lib + >> b32.bc +echo %hdir%\lib\lang.lib + >> b32.bc +echo %hdir%\lib\macro.lib + >> b32.bc +echo %hdir%\lib\rdd.lib + >> b32.bc +echo %hdir%\lib\dbfntx.lib + >> b32.bc +echo %hdir%\lib\dbfcdx.lib + >> b32.bc +echo %hdir%\lib\debug.lib + >> b32.bc +echo %hdir%\lib\common.lib + >> b32.bc +echo %hdir%\lib\pp.lib + >> b32.bc +echo %hdir%\lib\hgfwin32.lib + >> b32.bc + +rem Uncomment these two lines to use Advantage RDD +rem echo %hdir%\lib\rddads.lib + >> b32.bc +rem echo %hdir%\lib\ace32.lib + >> b32.bc + +echo %bcdir%\lib\cw32.lib + >> b32.bc +echo %bcdir%\lib\import32.lib, >> b32.bc + +ECHO * +ECHO Linking... +rem Use these flags to avoid the console window creation +rem %bcdir%\ilink32 -Gn -aa -Tpe -s @b32.bc +%bcdir%\ilink32 -Gn -Tpe -s @b32.bc + +rem delete temporary files +@del %1.c +@del b32.bc +@del comp.log +@del %1.map +@del %1.obj +@del %1.tds + +IF ERRORLEVEL 1 GOTO LINKERROR +ECHO * Application successfully built +%1 +GOTO EXIT +ECHO + +:LINKERROR +rem if exist meminfo.txt notepad meminfo.txt +rem PAUSE * Linking errors * +GOTO EXIT + +:SINTAX +ECHO SYNTAX: Build [Program] {-- Don't specify .PRG extension +GOTO EXIT + +:NOEXIST +ECHO The specified PRG %1 does not exist + :EXIT \ No newline at end of file diff --git a/harbour/contrib/hgf/win32/make_b32.bat b/harbour/contrib/hgf/win32/make_b32.bat index 5000a8bae8..0dd01f55ad 100644 --- a/harbour/contrib/hgf/win32/make_b32.bat +++ b/harbour/contrib/hgf/win32/make_b32.bat @@ -1,38 +1,38 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\..\lib\b32\hgfwin32.lib ..\..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist ..\..\..\lib\b32\hgfwin32.lib del ..\..\..\lib\b32\hgfwin32.lib - if exist ..\..\..\lib\b32\hgfwin32.bak del ..\..\..\lib\b32\hgfwin32.bak - if exist ..\..\..\obj\b32\win32.obj del ..\..\..\obj\b32\win32.obj - if exist ..\..\..\obj\b32\button.obj del ..\..\..\obj\b32\button.obj - if exist ..\..\..\obj\b32\edit.obj del ..\..\..\obj\b32\edit.obj - if exist ..\..\..\obj\b32\form.obj del ..\..\..\obj\b32\form.obj - if exist ..\..\..\obj\b32\menu.obj del ..\..\..\obj\b32\menu.obj - if exist ..\..\..\obj\b32\menuitm.obj del ..\..\..\obj\b32\menuitm.obj - if exist ..\..\..\obj\b32\winctrl.obj del ..\..\..\obj\b32\winctrl.obj - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\..\lib\b32\hgfwin32.lib ..\..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\..\lib\b32\hgfwin32.lib del ..\..\..\lib\b32\hgfwin32.lib + if exist ..\..\..\lib\b32\hgfwin32.bak del ..\..\..\lib\b32\hgfwin32.bak + if exist ..\..\..\obj\b32\win32.obj del ..\..\..\obj\b32\win32.obj + if exist ..\..\..\obj\b32\button.obj del ..\..\..\obj\b32\button.obj + if exist ..\..\..\obj\b32\edit.obj del ..\..\..\obj\b32\edit.obj + if exist ..\..\..\obj\b32\form.obj del ..\..\..\obj\b32\form.obj + if exist ..\..\..\obj\b32\menu.obj del ..\..\..\obj\b32\menu.obj + if exist ..\..\..\obj\b32\menuitm.obj del ..\..\..\obj\b32\menuitm.obj + if exist ..\..\..\obj\b32\winctrl.obj del ..\..\..\obj\b32\winctrl.obj + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/hgf/win32/makevc.bat b/harbour/contrib/hgf/win32/makevc.bat index ad8865dd10..5d43656106 100644 --- a/harbour/contrib/hgf/win32/makevc.bat +++ b/harbour/contrib/hgf/win32/makevc.bat @@ -1,14 +1,14 @@ -@echo off -SET _LIB=%LIB% -SET _PATH=%PATH% -SET _INCLUDE=%INCLUDE% -SET LIB=C:\COMPILER\VC\LIB;%PATH% -SET PATH=C:\COMPILER\VC\BIN;%PATH% -SET INCLUDE=..\..\..\INCLUDE;C:\COMPILER\VC\INCLUDE;%_INCLUDE% -nmake /f makefile.vc %1 %2 %3 -SET LIB=%_LIB% -SET PATH=%_PATH% -SET INCLUDE=%_INCLUDE% -SET _LIB= -SET _PATH= -SET _INCLUDE= +@echo off +SET _LIB=%LIB% +SET _PATH=%PATH% +SET _INCLUDE=%INCLUDE% +SET LIB=C:\COMPILER\VC\LIB;%PATH% +SET PATH=C:\COMPILER\VC\BIN;%PATH% +SET INCLUDE=..\..\..\INCLUDE;C:\COMPILER\VC\INCLUDE;%_INCLUDE% +nmake /f makefile.vc %1 %2 %3 +SET LIB=%_LIB% +SET PATH=%_PATH% +SET INCLUDE=%_INCLUDE% +SET _LIB= +SET _PATH= +SET _INCLUDE= diff --git a/harbour/contrib/htmllib/make_b32.bat b/harbour/contrib/htmllib/make_b32.bat index 2dffe375e7..d8347107c1 100644 --- a/harbour/contrib/htmllib/make_b32.bat +++ b/harbour/contrib/htmllib/make_b32.bat @@ -1,44 +1,44 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "Clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\html.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist ..\..\lib\b32\html.lib del ..\..\lib\b32\html.lib - if exist ..\..\lib\b32\html.bak del ..\..\lib\b32\html.bak - if exist ..\..\obj\b32\ohtm.obj del ..\..\obj\b32\ads1.obj - if exist ..\..\obj\b32\htmbrows.obj del ..\..\obj\b32\adsfunc.obj - if exist ..\..\obj\b32\oedit.obj del ..\..\obj\b32\adsmgmnt.obj - if exist ..\..\obj\b32\ofile.obj del ..\..\obj\b32\ofile.obj - if exist ..\..\obj\b32\jlist.obj del ..\..\obj\b32\jlist.obj - if exist ..\..\obj\b32\oini.obj del ..\..\obj\b32\oini.obj - if exist ..\..\obj\b32\jwindow.obj del ..\..\obj\b32\jwindow.obj - if exist ..\..\obj\b32\ocgi.obj del ..\..\obj\b32\ocgi.obj - if exist ..\..\obj\b32\oframe.obj del ..\..\obj\b32\oframe.obj - if exist ..\..\obj\b32\counter.obj del ..\..\obj\b32\counter.obj - if exist ..\..\obj\b32\errorsys.obj del ..\..\obj\b32\errorsys.obj - if exist ..\..\obj\b32\htmutil.obj del ..\..\obj\b32\htmutil.obj - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "Clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\html.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\lib\b32\html.lib del ..\..\lib\b32\html.lib + if exist ..\..\lib\b32\html.bak del ..\..\lib\b32\html.bak + if exist ..\..\obj\b32\ohtm.obj del ..\..\obj\b32\ads1.obj + if exist ..\..\obj\b32\htmbrows.obj del ..\..\obj\b32\adsfunc.obj + if exist ..\..\obj\b32\oedit.obj del ..\..\obj\b32\adsmgmnt.obj + if exist ..\..\obj\b32\ofile.obj del ..\..\obj\b32\ofile.obj + if exist ..\..\obj\b32\jlist.obj del ..\..\obj\b32\jlist.obj + if exist ..\..\obj\b32\oini.obj del ..\..\obj\b32\oini.obj + if exist ..\..\obj\b32\jwindow.obj del ..\..\obj\b32\jwindow.obj + if exist ..\..\obj\b32\ocgi.obj del ..\..\obj\b32\ocgi.obj + if exist ..\..\obj\b32\oframe.obj del ..\..\obj\b32\oframe.obj + if exist ..\..\obj\b32\counter.obj del ..\..\obj\b32\counter.obj + if exist ..\..\obj\b32\errorsys.obj del ..\..\obj\b32\errorsys.obj + if exist ..\..\obj\b32\htmutil.obj del ..\..\obj\b32\htmutil.obj + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/htmllib/make_vc.bat b/harbour/contrib/htmllib/make_vc.bat index 5709ae2cc4..ebef201ce9 100644 --- a/harbour/contrib/htmllib/make_vc.bat +++ b/harbour/contrib/htmllib/make_vc.bat @@ -1,43 +1,43 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "Clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\vc\html.lib ..\..\lib\*.* >nul - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - -:CLEAN - if exist ..\..\lib\vc\html.lib del ..\..\lib\vc\html.lib - if exist ..\..\lib\vc\html.bak del ..\..\lib\vc\html.bak - if exist ..\..\obj\vc\ohtm.obj del ..\..\obj\vc\ads1.obj - if exist ..\..\obj\vc\htmbrows.obj del ..\..\obj\vc\adsfunc.obj - if exist ..\..\obj\vc\oedit.obj del ..\..\obj\vc\adsmgmnt.obj - if exist ..\..\obj\vc\ofile.obj del ..\..\obj\vc\ofile.obj - if exist ..\..\obj\vc\jlist.obj del ..\..\obj\vc\jlist.obj - if exist ..\..\obj\vc\oini.obj del ..\..\obj\vc\oini.obj - if exist ..\..\obj\vc\jwindow.obj del ..\..\obj\vc\jwindow.obj - if exist ..\..\obj\vc\ocgi.obj del ..\..\obj\vc\ocgi.obj - if exist ..\..\obj\vc\oframe.obj del ..\..\obj\vc\oframe.obj - if exist ..\..\obj\vc\counter.obj del ..\..\obj\vc\counter.obj - if exist ..\..\obj\vc\errorsys.obj del ..\..\obj\vc\errorsys.obj - if exist ..\..\obj\vc\htmutil.obj del ..\..\obj\vc\htmutil.obj - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "Clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\html.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:CLEAN + if exist ..\..\lib\vc\html.lib del ..\..\lib\vc\html.lib + if exist ..\..\lib\vc\html.bak del ..\..\lib\vc\html.bak + if exist ..\..\obj\vc\ohtm.obj del ..\..\obj\vc\ads1.obj + if exist ..\..\obj\vc\htmbrows.obj del ..\..\obj\vc\adsfunc.obj + if exist ..\..\obj\vc\oedit.obj del ..\..\obj\vc\adsmgmnt.obj + if exist ..\..\obj\vc\ofile.obj del ..\..\obj\vc\ofile.obj + if exist ..\..\obj\vc\jlist.obj del ..\..\obj\vc\jlist.obj + if exist ..\..\obj\vc\oini.obj del ..\..\obj\vc\oini.obj + if exist ..\..\obj\vc\jwindow.obj del ..\..\obj\vc\jwindow.obj + if exist ..\..\obj\vc\ocgi.obj del ..\..\obj\vc\ocgi.obj + if exist ..\..\obj\vc\oframe.obj del ..\..\obj\vc\oframe.obj + if exist ..\..\obj\vc\counter.obj del ..\..\obj\vc\counter.obj + if exist ..\..\obj\vc\errorsys.obj del ..\..\obj\vc\errorsys.obj + if exist ..\..\obj\vc\htmutil.obj del ..\..\obj\vc\htmutil.obj + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libct/make_b32.bat b/harbour/contrib/libct/make_b32.bat index 4ceaebe653..344f13d3a8 100644 --- a/harbour/contrib/libct/make_b32.bat +++ b/harbour/contrib/libct/make_b32.bat @@ -1,29 +1,29 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\libct.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\libct.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libct/make_vc.bat b/harbour/contrib/libct/make_vc.bat index 56b9b10e6b..bbc6ae1175 100644 --- a/harbour/contrib/libct/make_vc.bat +++ b/harbour/contrib/libct/make_vc.bat @@ -1,21 +1,21 @@ -@echo off -rem -rem $Id$ -rem - -:BUILD - - nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\vc\libct.lib ..\..\lib\*.* >nul - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - -:EXIT - +@echo off +rem +rem $Id$ +rem + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\libct.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT + diff --git a/harbour/contrib/libgt/doc/gendoc.bat b/harbour/contrib/libgt/doc/gendoc.bat index 50a6f40374..ea0c370959 100644 --- a/harbour/contrib/libgt/doc/gendoc.bat +++ b/harbour/contrib/libgt/doc/gendoc.bat @@ -1,57 +1,57 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" =="/OS2" goto OS2 -if "%1" =="/os2" goto OS2 -if "%1" =="/NGI" goto NG -if "%1" =="/ngi" goto NG -if "%1" =="/RTF" goto RTF -if "%1" =="/rtf" goto RTF -if "%1" =="/HTM" goto HTM -if "%1" =="/htm" goto HTM -ECHO Assembling input files -:help - echo. - echo. Usage gendoc type - echo. where type is: - echo. /rtf for Winhelp output - echo. /os2 for Os/2 help output - echo. /ngi for Norton Guide output - echo. /htm for HTML output - goto END - - - -:NG -hbdoc /ngi libgt.lnk libgt.rsp -REM Compile the sources -Echo Compiling the sources -Echo Processing Input Files -Copy ngi\funcam.txt+ngi\funcn_.txt overview.ngi -Echo Compiling Sources -ngxc overview.ngi -Echo Linking the Guide -ngxl libgt.lnk -del *.ngi -del *.ngo -del ngi\*.txt -del ngi\*.ngi -GOTO END -:OS2 - hbdoc /OS2 libgt.lnk libgt.rsp -GOTO END -:RTF - hbdoc /RTF libgt.lnk libgt.rsp - HCW HARBOUR.HPJ -GOTO END -:HTM - hbdoc /HTM libgt.lnk libgt.rsp - GOTO END -:END -del ass*.bat - -del libgt.lnk -ren libgt.old libgt.lnk - +@echo off +rem +rem $Id$ +rem + +if "%1" =="/OS2" goto OS2 +if "%1" =="/os2" goto OS2 +if "%1" =="/NGI" goto NG +if "%1" =="/ngi" goto NG +if "%1" =="/RTF" goto RTF +if "%1" =="/rtf" goto RTF +if "%1" =="/HTM" goto HTM +if "%1" =="/htm" goto HTM +ECHO Assembling input files +:help + echo. + echo. Usage gendoc type + echo. where type is: + echo. /rtf for Winhelp output + echo. /os2 for Os/2 help output + echo. /ngi for Norton Guide output + echo. /htm for HTML output + goto END + + + +:NG +hbdoc /ngi libgt.lnk libgt.rsp +REM Compile the sources +Echo Compiling the sources +Echo Processing Input Files +Copy ngi\funcam.txt+ngi\funcn_.txt overview.ngi +Echo Compiling Sources +ngxc overview.ngi +Echo Linking the Guide +ngxl libgt.lnk +del *.ngi +del *.ngo +del ngi\*.txt +del ngi\*.ngi +GOTO END +:OS2 + hbdoc /OS2 libgt.lnk libgt.rsp +GOTO END +:RTF + hbdoc /RTF libgt.lnk libgt.rsp + HCW HARBOUR.HPJ +GOTO END +:HTM + hbdoc /HTM libgt.lnk libgt.rsp + GOTO END +:END +del ass*.bat + +del libgt.lnk +ren libgt.old libgt.lnk + diff --git a/harbour/contrib/libgt/make_b32.bat b/harbour/contrib/libgt/make_b32.bat index b72006f1d6..8afe4d05a5 100644 --- a/harbour/contrib/libgt/make_b32.bat +++ b/harbour/contrib/libgt/make_b32.bat @@ -1,29 +1,29 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\gt.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\gt.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libgt/make_vc.bat b/harbour/contrib/libgt/make_vc.bat index 3e7655f017..4f0b3aecbc 100644 --- a/harbour/contrib/libgt/make_vc.bat +++ b/harbour/contrib/libgt/make_vc.bat @@ -1,21 +1,21 @@ -@echo off -rem -rem $Id$ -rem - -:BUILD - - nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\vc\gt.lib ..\..\lib\*.* >nul - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - -:EXIT - +@echo off +rem +rem $Id$ +rem + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\gt.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT + diff --git a/harbour/contrib/libmisc/doc/gendoc.bat b/harbour/contrib/libmisc/doc/gendoc.bat index cd10bf105c..0be5b7cb2d 100644 --- a/harbour/contrib/libmisc/doc/gendoc.bat +++ b/harbour/contrib/libmisc/doc/gendoc.bat @@ -1,60 +1,60 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" =="/OS2" goto OS2 -if "%1" =="/os2" goto OS2 -if "%1" =="/NGI" goto NG -if "%1" =="/ngi" goto NG -if "%1" =="/RTF" goto RTF -if "%1" =="/rtf" goto RTF -if "%1" =="/HTM" goto HTM -if "%1" =="/htm" goto HTM -ECHO Assembling input files -:help - echo. - echo. Usage gendoc type - echo. where type is: - echo. /rtf for Winhelp output - echo. /os2 for Os/2 help output - echo. /ngi for Norton Guide output - echo. /htm for HTML output - goto END - -ECHO Assembling input files -:NG -hbdoc /ngi libmisc.lnk libmisc.rsp -REM Compile the sources -Echo Compiling the sources -Echo Processing Input Files -Copy ngi\funcam.txt+ngi\funcn_.txt overview.ngi -Echo Compiling Sources -ngxc overview.ngi -Echo Linking the Guide -ngxl libmisc.lnk -del *.ngi -del *.ngo -del ngi\*.txt -del ngi\*.ngi -del libmisc.lnk -ren libmisc.old libmisc.lnk - -GOTO END -:OS2 - hbdoc /OS2 libmisc.lnk libmisc.rsp -GOTO END -:RTF - hbdoc /RTF libmisc.lnk libmisc.rsp - HCW HARBOUR.HPJ -del libmisc.lnk -ren libmisc.old libmisc.lnk - -GOTO END -:HTM - hbdoc /HTM libmisc.lnk libmisc.rsp - GOTO END -:END -del ass*.bat - - +@echo off +rem +rem $Id$ +rem + +if "%1" =="/OS2" goto OS2 +if "%1" =="/os2" goto OS2 +if "%1" =="/NGI" goto NG +if "%1" =="/ngi" goto NG +if "%1" =="/RTF" goto RTF +if "%1" =="/rtf" goto RTF +if "%1" =="/HTM" goto HTM +if "%1" =="/htm" goto HTM +ECHO Assembling input files +:help + echo. + echo. Usage gendoc type + echo. where type is: + echo. /rtf for Winhelp output + echo. /os2 for Os/2 help output + echo. /ngi for Norton Guide output + echo. /htm for HTML output + goto END + +ECHO Assembling input files +:NG +hbdoc /ngi libmisc.lnk libmisc.rsp +REM Compile the sources +Echo Compiling the sources +Echo Processing Input Files +Copy ngi\funcam.txt+ngi\funcn_.txt overview.ngi +Echo Compiling Sources +ngxc overview.ngi +Echo Linking the Guide +ngxl libmisc.lnk +del *.ngi +del *.ngo +del ngi\*.txt +del ngi\*.ngi +del libmisc.lnk +ren libmisc.old libmisc.lnk + +GOTO END +:OS2 + hbdoc /OS2 libmisc.lnk libmisc.rsp +GOTO END +:RTF + hbdoc /RTF libmisc.lnk libmisc.rsp + HCW HARBOUR.HPJ +del libmisc.lnk +ren libmisc.old libmisc.lnk + +GOTO END +:HTM + hbdoc /HTM libmisc.lnk libmisc.rsp + GOTO END +:END +del ass*.bat + + diff --git a/harbour/contrib/libmisc/make_b32.bat b/harbour/contrib/libmisc/make_b32.bat index 4cc501f76d..d4e3da2382 100644 --- a/harbour/contrib/libmisc/make_b32.bat +++ b/harbour/contrib/libmisc/make_b32.bat @@ -1,29 +1,29 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\libmisc.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\libmisc.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libmisc/make_vc.bat b/harbour/contrib/libmisc/make_vc.bat index 5a2c6c2518..85171879d4 100644 --- a/harbour/contrib/libmisc/make_vc.bat +++ b/harbour/contrib/libmisc/make_vc.bat @@ -1,21 +1,21 @@ -@echo off -rem -rem $Id$ -rem - -:BUILD - - nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\vc\libmisc.lib ..\..\lib\*.* >nul - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - -:EXIT - +@echo off +rem +rem $Id$ +rem + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\libmisc.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT + diff --git a/harbour/contrib/libnf/make_b32.bat b/harbour/contrib/libnf/make_b32.bat index f63d630161..56d4560cfa 100644 --- a/harbour/contrib/libnf/make_b32.bat +++ b/harbour/contrib/libnf/make_b32.bat @@ -1,29 +1,29 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\nf.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\nf.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libnf/make_vc.bat b/harbour/contrib/libnf/make_vc.bat index 315599713a..df531ce8b1 100644 --- a/harbour/contrib/libnf/make_vc.bat +++ b/harbour/contrib/libnf/make_vc.bat @@ -1,21 +1,21 @@ -@echo off -rem -rem $Id$ -rem - -:BUILD - - nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\vc\nf.lib ..\..\lib\*.* >nul - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - -:EXIT - +@echo off +rem +rem $Id$ +rem + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\nf.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT + diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat index f2f06a7b3c..ded1739d9c 100644 --- a/harbour/contrib/mysql/make_b32.bat +++ b/harbour/contrib/mysql/make_b32.bat @@ -1,33 +1,33 @@ -@echo off - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\mysql.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - - if exist ..\..\lib\b32\mysql.lib del ..\..\lib\b32\mysql.lib - if exist ..\..\lib\b32\mysql.bak del ..\..\lib\b32\mysql.bak - if exist ..\..\obj\b32\mysql.obj del ..\..\obj\b32\mysql.obj - if exist ..\..\obj\b32\tsqlbrw.c del ..\..\obj\b32\tsqlbrw.c - if exist ..\..\obj\b32\tmysql.c del ..\..\obj\b32\tmysql.c - if exist ..\..\obj\b32\tsqlbrw.obj del ..\..\obj\b32\tsqlbrw.obj - if exist ..\..\obj\b32\tmysql.obj del ..\..\obj\b32\tmysql.obj - goto EXIT - -:EXIT - +@echo off + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\mysql.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + if exist ..\..\lib\b32\mysql.lib del ..\..\lib\b32\mysql.lib + if exist ..\..\lib\b32\mysql.bak del ..\..\lib\b32\mysql.bak + if exist ..\..\obj\b32\mysql.obj del ..\..\obj\b32\mysql.obj + if exist ..\..\obj\b32\tsqlbrw.c del ..\..\obj\b32\tsqlbrw.c + if exist ..\..\obj\b32\tmysql.c del ..\..\obj\b32\tmysql.c + if exist ..\..\obj\b32\tsqlbrw.obj del ..\..\obj\b32\tsqlbrw.obj + if exist ..\..\obj\b32\tmysql.obj del ..\..\obj\b32\tmysql.obj + goto EXIT + +:EXIT + diff --git a/harbour/contrib/odbc/bld_b32.bat b/harbour/contrib/odbc/bld_b32.bat index 14194fe1dc..771a936edb 100644 --- a/harbour/contrib/odbc/bld_b32.bat +++ b/harbour/contrib/odbc/bld_b32.bat @@ -1,9 +1,9 @@ -@echo off -rem -rem $Id$ -rem - -..\..\bin\harbour %1 /n /i..\include %2 -bcc32 -e%1.exe -O2 -d -I..\..\include -L..\..\lib\b32 %1.c debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib hbodbc.lib odbc32.lib - -rem del %1.c +@echo off +rem +rem $Id$ +rem + +..\..\bin\harbour %1 /n /i..\include %2 +bcc32 -e%1.exe -O2 -d -I..\..\include -L..\..\lib\b32 %1.c debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib hbodbc.lib odbc32.lib + +rem del %1.c diff --git a/harbour/contrib/odbc/bldodbc.bat b/harbour/contrib/odbc/bldodbc.bat index 10a0bacd4f..9440866234 100644 --- a/harbour/contrib/odbc/bldodbc.bat +++ b/harbour/contrib/odbc/bldodbc.bat @@ -1,3 +1,3 @@ -@echo off -make -fhbodbc.b32 -implib ..\..\lib\b32\odbc32.lib odbc32.def +@echo off +make -fhbodbc.b32 +implib ..\..\lib\b32\odbc32.lib odbc32.def diff --git a/harbour/contrib/ole/bldtest.bat b/harbour/contrib/ole/bldtest.bat index c16bcef9f5..a502ef6d06 100644 --- a/harbour/contrib/ole/bldtest.bat +++ b/harbour/contrib/ole/bldtest.bat @@ -1,9 +1,9 @@ -@set HB_BIN_INSTALL=..\..\bin -@set HB_LIB_INSTALL=..\..\lib\ -@set HB_INC_INSTALL=..\..\include\ - - %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 - bcc32 -O2 -d -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib dbffpt.lib hbsix.lib common.lib codepage.lib hbole.lib - del %1.c - del %1.obj - del %1.tds +@set HB_BIN_INSTALL=..\..\bin +@set HB_LIB_INSTALL=..\..\lib\ +@set HB_INC_INSTALL=..\..\include\ + + %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 + bcc32 -O2 -d -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib dbffpt.lib hbsix.lib common.lib codepage.lib hbole.lib + del %1.c + del %1.obj + del %1.tds diff --git a/harbour/contrib/ole/build32.bat b/harbour/contrib/ole/build32.bat index def5af2c87..b523b0b1b3 100644 --- a/harbour/contrib/ole/build32.bat +++ b/harbour/contrib/ole/build32.bat @@ -1,24 +1,24 @@ -@echo off - -SET HB_INCLUDE=..\..\include - -bcc32 -c -I.;%HB_INCLUDE% ole2.c -if errorlevel 1 goto end - -harbour oleauto /n /i%HB_INCLUDE% -if errorlevel 1 goto end - -bcc32 -M -c -O2 -I%HB_INCLUDE% -tW oleauto.c -if errorlevel 1 goto end - -if exist hbole.lib del hbole.lib -tlib hbole +ole2 +oleauto -if errorlevel 1 goto end - -copy hbole.lib ..\..\lib\*.* > nul - -:END -del oleauto.c -del ole2.obj -del oleauto.obj -del hbole.lib +@echo off + +SET HB_INCLUDE=..\..\include + +bcc32 -c -I.;%HB_INCLUDE% ole2.c +if errorlevel 1 goto end + +harbour oleauto /n /i%HB_INCLUDE% +if errorlevel 1 goto end + +bcc32 -M -c -O2 -I%HB_INCLUDE% -tW oleauto.c +if errorlevel 1 goto end + +if exist hbole.lib del hbole.lib +tlib hbole +ole2 +oleauto +if errorlevel 1 goto end + +copy hbole.lib ..\..\lib\*.* > nul + +:END +del oleauto.c +del ole2.obj +del oleauto.obj +del hbole.lib diff --git a/harbour/contrib/ole2/make_b32.bat b/harbour/contrib/ole2/make_b32.bat index 5ae118bdc8..538f689944 100644 --- a/harbour/contrib/ole2/make_b32.bat +++ b/harbour/contrib/ole2/make_b32.bat @@ -1,33 +1,33 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\hboleaut.lib ..\..\lib\*.* > nul - if exist ..\..\lib\b32\hboleaut.bak del ..\..\lib\b32\hboleaut.bak - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist ..\..\lib\b32\hboleaut.lib del ..\..\lib\b32\hboleaut.lib - if exist ..\..\lib\b32\hboleaut.bak del ..\..\lib\b32\hboleaut.bak - if exist ..\..\obj\b32\win32ole.obj del ..\..\obj\b32\win32ole.obj - if exist ..\..\obj\b32\w32ole.obj del ..\..\obj\b32\w32ole.obj - - goto EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\hboleaut.lib ..\..\lib\*.* > nul + if exist ..\..\lib\b32\hboleaut.bak del ..\..\lib\b32\hboleaut.bak + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\lib\b32\hboleaut.lib del ..\..\lib\b32\hboleaut.lib + if exist ..\..\lib\b32\hboleaut.bak del ..\..\lib\b32\hboleaut.bak + if exist ..\..\obj\b32\win32ole.obj del ..\..\obj\b32\win32ole.obj + if exist ..\..\obj\b32\w32ole.obj del ..\..\obj\b32\w32ole.obj + + goto EXIT + :EXIT \ No newline at end of file diff --git a/harbour/contrib/pgsql/make_b32.bat b/harbour/contrib/pgsql/make_b32.bat index 9165d76fee..e717f557fd 100644 --- a/harbour/contrib/pgsql/make_b32.bat +++ b/harbour/contrib/pgsql/make_b32.bat @@ -1,30 +1,30 @@ -@echo off - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\libhbpg.lib ..\..\lib\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - - if exist ..\..\lib\b32\libhbpg.lib del ..\..\lib\b32\libhbpg.lib - if exist ..\..\lib\b32\libhbpg.bak del ..\..\lib\b32\libhbpg.bak - if exist ..\..\obj\b32\postgres.obj del ..\..\obj\b32\postgres.obj - if exist ..\..\obj\b32\TPostgres.c del ..\..\obj\b32\TPostgres.c - if exist ..\..\obj\b32\TPostgres.obj del ..\..\obj\b32\TPostgres.obj - goto EXIT - -:EXIT +@echo off + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\libhbpg.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + if exist ..\..\lib\b32\libhbpg.lib del ..\..\lib\b32\libhbpg.lib + if exist ..\..\lib\b32\libhbpg.bak del ..\..\lib\b32\libhbpg.bak + if exist ..\..\obj\b32\postgres.obj del ..\..\obj\b32\postgres.obj + if exist ..\..\obj\b32\TPostgres.c del ..\..\obj\b32\TPostgres.c + if exist ..\..\obj\b32\TPostgres.obj del ..\..\obj\b32\TPostgres.obj + goto EXIT + +:EXIT diff --git a/harbour/contrib/rdd_ads/doc/gendoc.bat b/harbour/contrib/rdd_ads/doc/gendoc.bat index 7d42590572..ab487efe6e 100644 --- a/harbour/contrib/rdd_ads/doc/gendoc.bat +++ b/harbour/contrib/rdd_ads/doc/gendoc.bat @@ -1,33 +1,33 @@ -if "%1" =="/OS2" goto OS2 -if "%1" =="/NGI" goto NG -if "%1" =="/RTF" goto RTF -if "%1" =="/HTM" goto HTM -ECHO Assembling input files -:NG -hbdoc /ngi rddads.lnk rddads.rsp -REM Compile the sources -Echo Compiling the sources -Processing Input Files -Copy ngi\overview.ngi . -Compiling Sources -ngxc overview.ngi -Linking the Guide -ngxl rddads.lnk -del *.ngi -del *.ngo -del ngi\*.txt -del ngi\*.ngi -GOTO END -:OS2 - hbdoc /OS2 rddads.lnk rddads.rsp -GOTO END -:RTF - hbdoc /RTF rddads.lnk rddads.rsp - HCW HARBOUR.HPJ -GOTO END -:HTM - hbdoc /HTM rddads.lnk rddads.rsp - GOTO END -:END -del ass*.bat - +if "%1" =="/OS2" goto OS2 +if "%1" =="/NGI" goto NG +if "%1" =="/RTF" goto RTF +if "%1" =="/HTM" goto HTM +ECHO Assembling input files +:NG +hbdoc /ngi rddads.lnk rddads.rsp +REM Compile the sources +Echo Compiling the sources +Processing Input Files +Copy ngi\overview.ngi . +Compiling Sources +ngxc overview.ngi +Linking the Guide +ngxl rddads.lnk +del *.ngi +del *.ngo +del ngi\*.txt +del ngi\*.ngi +GOTO END +:OS2 + hbdoc /OS2 rddads.lnk rddads.rsp +GOTO END +:RTF + hbdoc /RTF rddads.lnk rddads.rsp + HCW HARBOUR.HPJ +GOTO END +:HTM + hbdoc /HTM rddads.lnk rddads.rsp + GOTO END +:END +del ass*.bat + diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat index 3982d492b5..6a9e20912e 100644 --- a/harbour/contrib/rdd_ads/make_b32.bat +++ b/harbour/contrib/rdd_ads/make_b32.bat @@ -1,35 +1,35 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\b32\rddads.lib ..\..\lib\*.* > nul - if exist ..\..\lib\b32\rddads.bak del ..\..\lib\b32\rddads.bak - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - if exist ..\..\lib\b32\rddads.lib del ..\..\lib\b32\rddads.lib - if exist ..\..\lib\b32\rddads.bak del ..\..\lib\b32\rddads.bak - if exist ..\..\obj\b32\ads1.obj del ..\..\obj\b32\ads1.obj - if exist ..\..\obj\b32\adsfunc.obj del ..\..\obj\b32\adsfunc.obj - if exist ..\..\obj\b32\adsmgmnt.obj del ..\..\obj\b32\adsmgmnt.obj - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\rddads.lib ..\..\lib\*.* > nul + if exist ..\..\lib\b32\rddads.bak del ..\..\lib\b32\rddads.bak + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist ..\..\lib\b32\rddads.lib del ..\..\lib\b32\rddads.lib + if exist ..\..\lib\b32\rddads.bak del ..\..\lib\b32\rddads.bak + if exist ..\..\obj\b32\ads1.obj del ..\..\obj\b32\ads1.obj + if exist ..\..\obj\b32\adsfunc.obj del ..\..\obj\b32\adsfunc.obj + if exist ..\..\obj\b32\adsmgmnt.obj del ..\..\obj\b32\adsmgmnt.obj + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/rdd_ads/make_vc.bat b/harbour/contrib/rdd_ads/make_vc.bat index c8a47e2361..43cdfcd96a 100644 --- a/harbour/contrib/rdd_ads/make_vc.bat +++ b/harbour/contrib/rdd_ads/make_vc.bat @@ -1,21 +1,21 @@ -@echo off -rem -rem $Id$ -rem - -:BUILD - - nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\lib\vc\rddads.lib ..\..\lib\*.* >nul - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - -:EXIT - +@echo off +rem +rem $Id$ +rem + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\rddads.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT + diff --git a/harbour/contrib/runjava/bld_java.bat b/harbour/contrib/runjava/bld_java.bat index 38c4eb6820..3f1ab2359e 100644 --- a/harbour/contrib/runjava/bld_java.bat +++ b/harbour/contrib/runjava/bld_java.bat @@ -1,26 +1,26 @@ -@echo off -rem -rem $Id$ -rem - -rem Harbour executable builder batch file -rem -rem Compiler: JAVA -rem Platform: 32-bit Windows -rem - -if not "%1" == "" goto COMPILE - -echo. -echo Usage: bld_java.bat name -echo. -echo - 'name' is the .prg filename *without* extension. -echo - Don't forget to make a MAIN function for you application. -echo - This batch file assumes you are two level deeper than the main harbour dir -exit - -:COMPILE - -..\..\bin\harbour %1.prg /n /gj /i..\..\include -javac %1.java - +@echo off +rem +rem $Id$ +rem + +rem Harbour executable builder batch file +rem +rem Compiler: JAVA +rem Platform: 32-bit Windows +rem + +if not "%1" == "" goto COMPILE + +echo. +echo Usage: bld_java.bat name +echo. +echo - 'name' is the .prg filename *without* extension. +echo - Don't forget to make a MAIN function for you application. +echo - This batch file assumes you are two level deeper than the main harbour dir +exit + +:COMPILE + +..\..\bin\harbour %1.prg /n /gj /i..\..\include +javac %1.java + diff --git a/harbour/contrib/runjava/make_vc.bat b/harbour/contrib/runjava/make_vc.bat index 8d3259de15..39a7e1603c 100644 --- a/harbour/contrib/runjava/make_vc.bat +++ b/harbour/contrib/runjava/make_vc.bat @@ -1,30 +1,30 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - copy ..\..\bin\vc\*.dll ..\..\bin\*.* > nul - copy ..\..\obj\vc\*.class ..\..\bin\*.* > nul - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - goto EXIT - -:CLEAN - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\bin\vc\*.dll ..\..\bin\*.* > nul + copy ..\..\obj\vc\*.class ..\..\bin\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/samples/make_b32.bat b/harbour/contrib/samples/make_b32.bat index 4d98c1c958..dae463c72a 100644 --- a/harbour/contrib/samples/make_b32.bat +++ b/harbour/contrib/samples/make_b32.bat @@ -1,28 +1,28 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - goto EXIT - -:BUILD_ERR - - notepad make_b32.log - goto EXIT - -:CLEAN - - goto EXIT - -:EXIT - +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/samples/make_vc.bat b/harbour/contrib/samples/make_vc.bat index 6447823183..892ddc8c03 100644 --- a/harbour/contrib/samples/make_vc.bat +++ b/harbour/contrib/samples/make_vc.bat @@ -1,19 +1,19 @@ -@echo off -rem -rem $Id$ -rem - -:BUILD - - nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - - goto EXIT - -:BUILD_ERR - - notepad make_vc.log - -:EXIT +@echo off +rem +rem $Id$ +rem + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT diff --git a/harbour/contrib/tip/make_b32.bat b/harbour/contrib/tip/make_b32.bat index b5851b1397..69973cebd9 100644 --- a/harbour/contrib/tip/make_b32.bat +++ b/harbour/contrib/tip/make_b32.bat @@ -1,24 +1,24 @@ -@echo off -rem -rem $Id$ -rem - -:BUILD - - make -fmakefile.bc %1 %2 %3 > make_b32.log - if "%1" == "clean" goto CLEAN - if "%1" == "CLEAN" goto CLEAN - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - goto EXIT - -:BUILD_ERR - notepad make_b32.log - goto EXIT - -:CLEAN - if exist make_b32.log del make_b32.log - -:EXIT - +@echo off +rem +rem $Id$ +rem + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if "%1" == "clean" goto CLEAN + if "%1" == "CLEAN" goto CLEAN + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + goto EXIT + +:BUILD_ERR + notepad make_b32.log + goto EXIT + +:CLEAN + if exist make_b32.log del make_b32.log + +:EXIT + diff --git a/harbour/doc/genhtm.bat b/harbour/doc/genhtm.bat index d10ea6bc17..47d2007653 100644 --- a/harbour/doc/genhtm.bat +++ b/harbour/doc/genhtm.bat @@ -1,12 +1,12 @@ -@echo off -rem -rem $Id$ -rem - -hbdoc -htm genhtm.lnk genhtm.rsp -cd htm -echo renaming Harbour.htm to index.htm -ren harbour.htm index.htm -del genwww.lnk -ren genwww.old genwww.lnk - +@echo off +rem +rem $Id$ +rem + +hbdoc -htm genhtm.lnk genhtm.rsp +cd htm +echo renaming Harbour.htm to index.htm +ren harbour.htm index.htm +del genwww.lnk +ren genwww.old genwww.lnk + diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index ab8fce8625..8d80385f6b 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -1,125 +1,125 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -rem --------------------------------------------------------------- -rem Template to initialize the environment before starting -rem the GNU make system for Harbour -rem -rem For further information about the GNU make system please -rem check doc/gmake.txt -rem -rem Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) -rem See doc/license.txt for licensing terms. -rem --------------------------------------------------------------- - -if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos -if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp -if "%HB_GT_LIB%" == "" set HB_GT_LIB= - -rem set PRG_USR= -rem set C_USR= -rem set L_USR= - -rem Set to constant value to be consistent with the non-GNU make files. - -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HARBOURDIR%/bin -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HARBOURDIR%/lib -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HARBOURDIR%/include - -:START - - if "%HB_ARCHITECTURE%" == "" goto BAD_ARCH - if "%HB_COMPILER%" == "" goto BAD_COMP - - goto MAKE - -:HELP - - echo. - echo Usage: make_gnu [command] - echo. - echo The following commands are supported: - echo - all (default) - echo - clean - echo - install - echo. - echo Notes: - echo. - echo - HB_ARCHITECTURE and HB_COMPILER envvars must be set. - echo The following values are currently supported: - echo. - echo HB_ARCHITECTURE: - echo - dos (HB_GT_LIB=gtdos by default) - echo - w32 (HB_GT_LIB=gtw32 by default) - echo - linux (HB_GT_LIB=gtstd by default) - echo - os2 (HB_GT_LIB=gtos2 by default) - echo. - pause - echo HB_COMPILER: - echo - When HB_ARCHITECTURE=dos - echo - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit) - echo - djgpp (Delorie GNU C, DOS 32-bit) - echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) - echo - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit) - echo - When HB_ARCHITECTURE=w32 - echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) - echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) - echo - mingw32 (Cygnus/MinGW GNU C, Windows 32-bit) - echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) - echo - icc (IBM Visual Age C++, Windows 32-bit) - echo - msvc (Microsoft Visual C++, Windows 32-bit) - echo - When HB_ARCHITECTURE=linux - echo - gcc (GNU C, 32-bit) - echo - When HB_ARCHITECTURE=os2 - echo - gcc (EMX GNU C, OS/2 32-bit) - echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) - echo. - pause - echo HB_GT_LIB: - echo - gtstd (Standard streaming) (for all architectures) - echo - gtdos (DOS console) (for dos architecture) - echo - gtwin (Win32 console) (for w32 architecture) - echo - gtwvt (Win32 win console) (for w32 architecture) - echo - gtos2 (OS/2 console) (for os2 architecture) - echo - gtpca (PC ANSI console) (for all architectures) - echo - gtcrs (Curses console) (for linux, w32 architectures) - echo - gtsln (Slang console) (for linux, w32 architectures) - echo. - echo - Use these optional envvars to configure the make process - echo when using the 'all' command: - echo. - echo PRG_USR - Extra Harbour compiler options - echo C_USR - Extra C compiler options - echo L_USR - Extra linker options - goto END - -:BAD_ARCH - - echo Error: HB_ARCHITECTURE is not set. - goto HELP - -:BAD_COMP - - echo Error: HB_COMPILER is not set. - goto HELP - -:MAKE - - rem --------------------------------------------------------------- - rem Start the GNU make system - - make -r %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log - goto END - -:END - +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + +rem --------------------------------------------------------------- +rem Template to initialize the environment before starting +rem the GNU make system for Harbour +rem +rem For further information about the GNU make system please +rem check doc/gmake.txt +rem +rem Copyright 1999-2001 Viktor Szakats (viktor.szakats@syenar.hu) +rem See doc/license.txt for licensing terms. +rem --------------------------------------------------------------- + +if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos +if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp +if "%HB_GT_LIB%" == "" set HB_GT_LIB= + +rem set PRG_USR= +rem set C_USR= +rem set L_USR= + +rem Set to constant value to be consistent with the non-GNU make files. + +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HARBOURDIR%/bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HARBOURDIR%/lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HARBOURDIR%/include + +:START + + if "%HB_ARCHITECTURE%" == "" goto BAD_ARCH + if "%HB_COMPILER%" == "" goto BAD_COMP + + goto MAKE + +:HELP + + echo. + echo Usage: make_gnu [command] + echo. + echo The following commands are supported: + echo - all (default) + echo - clean + echo - install + echo. + echo Notes: + echo. + echo - HB_ARCHITECTURE and HB_COMPILER envvars must be set. + echo The following values are currently supported: + echo. + echo HB_ARCHITECTURE: + echo - dos (HB_GT_LIB=gtdos by default) + echo - w32 (HB_GT_LIB=gtw32 by default) + echo - linux (HB_GT_LIB=gtstd by default) + echo - os2 (HB_GT_LIB=gtos2 by default) + echo. + pause + echo HB_COMPILER: + echo - When HB_ARCHITECTURE=dos + echo - bcc16 (Borland C++ 3.x, 4.x, 5.0x, DOS 16-bit) + echo - djgpp (Delorie GNU C, DOS 32-bit) + echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) + echo - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit) + echo - When HB_ARCHITECTURE=w32 + echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) + echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) + echo - mingw32 (Cygnus/MinGW GNU C, Windows 32-bit) + echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) + echo - icc (IBM Visual Age C++, Windows 32-bit) + echo - msvc (Microsoft Visual C++, Windows 32-bit) + echo - When HB_ARCHITECTURE=linux + echo - gcc (GNU C, 32-bit) + echo - When HB_ARCHITECTURE=os2 + echo - gcc (EMX GNU C, OS/2 32-bit) + echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) + echo. + pause + echo HB_GT_LIB: + echo - gtstd (Standard streaming) (for all architectures) + echo - gtdos (DOS console) (for dos architecture) + echo - gtwin (Win32 console) (for w32 architecture) + echo - gtwvt (Win32 win console) (for w32 architecture) + echo - gtos2 (OS/2 console) (for os2 architecture) + echo - gtpca (PC ANSI console) (for all architectures) + echo - gtcrs (Curses console) (for linux, w32 architectures) + echo - gtsln (Slang console) (for linux, w32 architectures) + echo. + echo - Use these optional envvars to configure the make process + echo when using the 'all' command: + echo. + echo PRG_USR - Extra Harbour compiler options + echo C_USR - Extra C compiler options + echo L_USR - Extra linker options + goto END + +:BAD_ARCH + + echo Error: HB_ARCHITECTURE is not set. + goto HELP + +:BAD_COMP + + echo Error: HB_COMPILER is not set. + goto HELP + +:MAKE + + rem --------------------------------------------------------------- + rem Start the GNU make system + + make -r %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log + goto END + +:END + diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index 81383b0fb3..c088434783 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -1,91 +1,91 @@ -@echo off -rem -rem $Id$ -rem - -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem -rem Set any of the below settings to customize your build process: -rem set HB_BUILD_MODE=C -rem set HB_BUILD_DLL=yes -rem set HB_BUILD_DEBUG=yes -rem set HB_BUILD_VERBOSE=yes -rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= -rem --------------------------------------------------------------- - -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe - -rem Save the user value, force silent file overwrite with COPY -rem (not all Windows versions support the COPY /Y flag) -set HB_ORGENV_COPYCMD=%COPYCMD% -set COPYCMD=/Y - -rem --------------------------------------------------------------- - -rem IMPORTANT ! It has to be declared here -if "%CC_DIRNAME%" == "" set CC_DIRNAME=vc -if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin - -rem --------------------------------------------------------------- - -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - -if "%1" == "install" goto INSTALL -if "%1" == "INSTALL" goto INSTALL - -rem --------------------------------------------------------------- - -:BUILD - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% /f makefile.vc %1 %2 %3 > make_%CC_DIRNAME%.log - if errorlevel 1 goto BUILD_ERR - goto EXIT - -rem --------------------------------------------------------------- - -:BUILD_ERR - - notepad make_%CC_DIRNAME%.log - goto EXIT - -rem --------------------------------------------------------------- - -:CLEAN - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% /f makefile.vc CLEAN > make_%CC_DIRNAME%.log - - rem In this case, the makefile handles most cleanup. - - if exist make_%CC_DIRNAME%.log del make_%CC_DIRNAME%.log > nul - if exist inst_%CC_DIRNAME%.log del inst_%CC_DIRNAME%.log > nul - - goto EXIT - -rem --------------------------------------------------------------- - -:INSTALL - - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% /f makefile.vc INSTALL > nul - - goto EXIT - -rem --------------------------------------------------------------- - -:EXIT -rem Restore user value -set COPYCMD=%HB_ORGENV_COPYCMD% -set HB_ORGENV_COPYCMD= -set CC_DIRNAME= +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_BUILD_MODE=C +rem set HB_BUILD_DLL=yes +rem set HB_BUILD_DEBUG=yes +rem set HB_BUILD_VERBOSE=yes +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +rem IMPORTANT ! It has to be declared here +if "%CC_DIRNAME%" == "" set CC_DIRNAME=vc +if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +rem --------------------------------------------------------------- + +:BUILD + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% /f makefile.vc %1 %2 %3 > make_%CC_DIRNAME%.log + if errorlevel 1 goto BUILD_ERR + goto EXIT + +rem --------------------------------------------------------------- + +:BUILD_ERR + + notepad make_%CC_DIRNAME%.log + goto EXIT + +rem --------------------------------------------------------------- + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% /f makefile.vc CLEAN > make_%CC_DIRNAME%.log + + rem In this case, the makefile handles most cleanup. + + if exist make_%CC_DIRNAME%.log del make_%CC_DIRNAME%.log > nul + if exist inst_%CC_DIRNAME%.log del inst_%CC_DIRNAME%.log > nul + + goto EXIT + +rem --------------------------------------------------------------- + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% /f makefile.vc INSTALL > nul + + goto EXIT + +rem --------------------------------------------------------------- + +:EXIT +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% +set HB_ORGENV_COPYCMD= +set CC_DIRNAME= diff --git a/harbour/samples/guestbk/bld_b32.bat b/harbour/samples/guestbk/bld_b32.bat index 8924b73e42..fd5d2e629c 100644 --- a/harbour/samples/guestbk/bld_b32.bat +++ b/harbour/samples/guestbk/bld_b32.bat @@ -1,29 +1,29 @@ -@echo off -rem -rem $Id$ -rem - -..\..\bin\harbour /n guestbk /i..\..\include\ -..\..\bin\harbour /n inifiles /i..\..\include\ -..\..\bin\harbour /n testcgi /i..\..\include\ - -echo -O2 -I..\..\include -L..\..\lib > build.tmp -echo -eguestbk.exe >> build.tmp -echo guestbk.c inifiles.c testcgi.c >> build.tmp -echo debug.lib >> build.tmp -echo vm.lib >> build.tmp -echo rtl.lib >> build.tmp -echo gtwin.lib >> build.tmp -echo lang.lib >> build.tmp -echo rdd.lib >> build.tmp -echo macro.lib >> build.tmp -echo pp.lib >> build.tmp -echo dbfntx.lib >> build.tmp -echo dbfcdx.lib >> build.tmp -echo dbffpt.lib >> build.tmp -echo hbsix.lib >> build.tmp -echo common.lib >> build.tmp -bcc32 @build.tmp -del build.tmp - -guestbk +@echo off +rem +rem $Id$ +rem + +..\..\bin\harbour /n guestbk /i..\..\include\ +..\..\bin\harbour /n inifiles /i..\..\include\ +..\..\bin\harbour /n testcgi /i..\..\include\ + +echo -O2 -I..\..\include -L..\..\lib > build.tmp +echo -eguestbk.exe >> build.tmp +echo guestbk.c inifiles.c testcgi.c >> build.tmp +echo debug.lib >> build.tmp +echo vm.lib >> build.tmp +echo rtl.lib >> build.tmp +echo gtwin.lib >> build.tmp +echo lang.lib >> build.tmp +echo rdd.lib >> build.tmp +echo macro.lib >> build.tmp +echo pp.lib >> build.tmp +echo dbfntx.lib >> build.tmp +echo dbfcdx.lib >> build.tmp +echo dbffpt.lib >> build.tmp +echo hbsix.lib >> build.tmp +echo common.lib >> build.tmp +bcc32 @build.tmp +del build.tmp + +guestbk diff --git a/harbour/samples/hscript/bld_b32.bat b/harbour/samples/hscript/bld_b32.bat index 0e80dd9334..2210226746 100644 --- a/harbour/samples/hscript/bld_b32.bat +++ b/harbour/samples/hscript/bld_b32.bat @@ -1,8 +1,8 @@ -@echo off -rem -rem $Id$ -rem - -..\..\bin\harbour hscript /n /i..\..\include -bcc32 -O2 -I..\..\include -L..\..\lib -ehscript.exe hscript.c debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib dbffpt.lib hbsix.lib common.lib -rem del hscript.c +@echo off +rem +rem $Id$ +rem + +..\..\bin\harbour hscript /n /i..\..\include +bcc32 -O2 -I..\..\include -L..\..\lib -ehscript.exe hscript.c debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib dbffpt.lib hbsix.lib common.lib +rem del hscript.c diff --git a/harbour/samples/hscript/makehtm.bat b/harbour/samples/hscript/makehtm.bat index 90f422de30..4cd2041c85 100644 --- a/harbour/samples/hscript/makehtm.bat +++ b/harbour/samples/hscript/makehtm.bat @@ -1,37 +1,37 @@ -@echo off -rem -rem $Id$ -rem - -IF NOT EXIST hscript.exe GOTO :missing - -:start -SET HARBOURDIR=.\ - -hscript hello.hs > hello.htm -hscript multiply.hs > multiply.htm -hscript dir.hs > dir.htm -hscript ugly.hs > ugly.htm - -cls -echo Ready to go! -echo\ -echo If you're under W95/98 try: -echo\ -echo start hello.htm -echo -or- -echo start multiply.htm -echo -or- -echo start dir.htm - -goto end - -:missing -echo Missing hscript.exe -echo\ -echo Press any key to build it or Ctrl+C to quit... -pause>nul -call makehs -goto :start - -:end +@echo off +rem +rem $Id$ +rem + +IF NOT EXIST hscript.exe GOTO :missing + +:start +SET HARBOURDIR=.\ + +hscript hello.hs > hello.htm +hscript multiply.hs > multiply.htm +hscript dir.hs > dir.htm +hscript ugly.hs > ugly.htm + +cls +echo Ready to go! +echo\ +echo If you're under W95/98 try: +echo\ +echo start hello.htm +echo -or- +echo start multiply.htm +echo -or- +echo start dir.htm + +goto end + +:missing +echo Missing hscript.exe +echo\ +echo Press any key to build it or Ctrl+C to quit... +pause>nul +call makehs +goto :start + +:end diff --git a/harbour/tests/bld4dll.bat b/harbour/tests/bld4dll.bat index 68c2013acb..d4befadf0c 100644 --- a/harbour/tests/bld4dll.bat +++ b/harbour/tests/bld4dll.bat @@ -1,29 +1,29 @@ -@echo off -rem --------------------------------------------------------------- -rem This file is intended to build a program, which uses harbour.dll -rem The main function must be called _AppMain. -rem To run the program, you need to have harbour.dll in your path. -rem --------------------------------------------------------------- - -set HB_PATH=..\ - - %HB_PATH%\BIN\harbour %1.prg -n -i%HB_PATH%\INCLUDE %2 %3 - - bcc32 -c -O2 -d -I%HB_PATH%\INCLUDE %1.c %HB_PATH%\source\vm\mainwin.c - - @echo c0w32.obj + > b32.bc - @echo %1.obj + >> b32.bc - @echo mainwin.obj,+ >> b32.bc - @echo %1.exe, + >> b32.bc - @echo , + >> b32.bc - @echo %HB_PATH%\LIB\harbour.lib + >> b32.bc - @echo cw32.lib + >> b32.bc - @echo import32.lib, >> b32.bc - - ilink32 -Tpe -Gn @b32.bc - -del %1.obj -del mainwin.obj -del %1.c -del *.tds -del b32.bc +@echo off +rem --------------------------------------------------------------- +rem This file is intended to build a program, which uses harbour.dll +rem The main function must be called _AppMain. +rem To run the program, you need to have harbour.dll in your path. +rem --------------------------------------------------------------- + +set HB_PATH=..\ + + %HB_PATH%\BIN\harbour %1.prg -n -i%HB_PATH%\INCLUDE %2 %3 + + bcc32 -c -O2 -d -I%HB_PATH%\INCLUDE %1.c %HB_PATH%\source\vm\mainwin.c + + @echo c0w32.obj + > b32.bc + @echo %1.obj + >> b32.bc + @echo mainwin.obj,+ >> b32.bc + @echo %1.exe, + >> b32.bc + @echo , + >> b32.bc + @echo %HB_PATH%\LIB\harbour.lib + >> b32.bc + @echo cw32.lib + >> b32.bc + @echo import32.lib, >> b32.bc + + ilink32 -Tpe -Gn @b32.bc + +del %1.obj +del mainwin.obj +del %1.c +del *.tds +del b32.bc diff --git a/harbour/tests/gnu_test.bat b/harbour/tests/gnu_test.bat index 729ac754c5..a9efcc5c15 100644 --- a/harbour/tests/gnu_test.bat +++ b/harbour/tests/gnu_test.bat @@ -1,19 +1,19 @@ -@echo off -rem -rem $Id$ -rem - -if %hb_architecture%.==. goto bad_arch -if %hb_compiler%.==. goto bad_comp - -if exist %hb_architecture%\%hb_compiler%\%1.* del %hb_architecture%\%hb_compiler%\%1.* -make -r "PRG_SOURCES=%1.prg" -if not errorlevel 1 %hb_architecture%\%hb_compiler%\%1 %2 %3 %4 %5 %6 %7 %8 %9 -goto exit - -:bad_arch -echo HB_ARCHITECTURE is not set. -goto exit -:bad_comp -echo HB_COMPILER is not set. -:exit +@echo off +rem +rem $Id$ +rem + +if %hb_architecture%.==. goto bad_arch +if %hb_compiler%.==. goto bad_comp + +if exist %hb_architecture%\%hb_compiler%\%1.* del %hb_architecture%\%hb_compiler%\%1.* +make -r "PRG_SOURCES=%1.prg" +if not errorlevel 1 %hb_architecture%\%hb_compiler%\%1 %2 %3 %4 %5 %6 %7 %8 %9 +goto exit + +:bad_arch +echo HB_ARCHITECTURE is not set. +goto exit +:bad_comp +echo HB_COMPILER is not set. +:exit diff --git a/harbour/tests/run_prg.bat b/harbour/tests/run_prg.bat index ebfe94b199..667c3c5b58 100644 --- a/harbour/tests/run_prg.bat +++ b/harbour/tests/run_prg.bat @@ -1,8 +1,8 @@ -@echo off -rem -rem $Id$ -rem - -..\bin\harbour %1 /n /i..\include /gh -..\bin\hbrun %1 -del %1.hrb +@echo off +rem +rem $Id$ +rem + +..\bin\harbour %1 /n /i..\include /gh +..\bin\hbrun %1 +del %1.hrb diff --git a/harbour/tests/run_test.bat b/harbour/tests/run_test.bat index 8f7d396210..42888c925b 100644 --- a/harbour/tests/run_test.bat +++ b/harbour/tests/run_test.bat @@ -1,11 +1,11 @@ -@echo off -rem -rem $Id$ -rem - -rem ; Generate test_all.bat -call run_prg.bat test_all - -rem ; Run test_all.bat -call test_all.bat -del test_all.bat +@echo off +rem +rem $Id$ +rem + +rem ; Generate test_all.bat +call run_prg.bat test_all + +rem ; Run test_all.bat +call test_all.bat +del test_all.bat diff --git a/harbour/utils/hbextern/make_c5x.bat b/harbour/utils/hbextern/make_c5x.bat index 9cccaa7370..4c2ee1b45e 100644 --- a/harbour/utils/hbextern/make_c5x.bat +++ b/harbour/utils/hbextern/make_c5x.bat @@ -1,8 +1,8 @@ -@echo off -rem -rem $Id$ -rem - -clipper hbextern.prg /w /n /i..\..\include\ -rtlink fi hbextern -del *.obj +@echo off +rem +rem $Id$ +rem + +clipper hbextern.prg /w /n /i..\..\include\ +rtlink fi hbextern +del *.obj diff --git a/harbour/utils/hbpptest/compare.bat b/harbour/utils/hbpptest/compare.bat index 48a9cdc529..a490fb865d 100644 --- a/harbour/utils/hbpptest/compare.bat +++ b/harbour/utils/hbpptest/compare.bat @@ -1,18 +1,18 @@ -@echo off -rem -rem $Id$ -rem - -copy pp_test.prg _pp_hb.prg -copy pp_test.prg _pp_c5x.prg - -..\..\bin\harbour.exe -p -s -n _pp_hb.prg -clipper.exe _pp_c5x.prg /p /s /n - -del _pp_hb.prg -del _pp_c5x.prg - -diff -u -w _pp_hb.ppo _pp_c5x.ppo > pp_test.diff - -del _pp_hb.ppo -del _pp_c5x.ppo +@echo off +rem +rem $Id$ +rem + +copy pp_test.prg _pp_hb.prg +copy pp_test.prg _pp_c5x.prg + +..\..\bin\harbour.exe -p -s -n _pp_hb.prg +clipper.exe _pp_c5x.prg /p /s /n + +del _pp_hb.prg +del _pp_c5x.prg + +diff -u -w _pp_hb.ppo _pp_c5x.ppo > pp_test.diff + +del _pp_hb.ppo +del _pp_c5x.ppo diff --git a/harbour/utils/hbtest/make_c5x.bat b/harbour/utils/hbtest/make_c5x.bat index 58741baca7..46dcaa3031 100644 --- a/harbour/utils/hbtest/make_c5x.bat +++ b/harbour/utils/hbtest/make_c5x.bat @@ -1,31 +1,31 @@ -@echo off -rem -rem $Id$ -rem - -if not exist ..\..\contrib\hbclip\hbclip.lib goto NO_HBCLIP - -set hb_clipopt=/DHAVE_HBCLIP -set hb_linkopt=li hbclip -set lib=..\..\contrib\hbclip\;%lib% - -:NO_HBCLIP - -clipper hbtest.prg /w /n %hb_clipopt% -clipper rt_array.prg /w /n %hb_clipopt% -clipper rt_date.prg /w /n %hb_clipopt% -clipper rt_file.prg /w /n %hb_clipopt% -clipper rt_hvm.prg /w /n %hb_clipopt% -clipper rt_hvma.prg /w /n %hb_clipopt% -clipper rt_math.prg /w /n %hb_clipopt% -clipper rt_misc.prg /w /n %hb_clipopt% -clipper rt_str.prg /w /n %hb_clipopt% -clipper rt_stra.prg /w /n %hb_clipopt% -clipper rt_trans.prg /w /n %hb_clipopt% - -if "%1" == "" set hb_linker=rtlink -if not "%1" == "" set hb_linker=exospace - -%hb_linker% out hbtest5x fi hbtest,rt_array,rt_date,rt_file,rt_hvm,rt_hvma,rt_math,rt_misc,rt_str,rt_stra,rt_trans %hb_linkopt% - -del *.obj +@echo off +rem +rem $Id$ +rem + +if not exist ..\..\contrib\hbclip\hbclip.lib goto NO_HBCLIP + +set hb_clipopt=/DHAVE_HBCLIP +set hb_linkopt=li hbclip +set lib=..\..\contrib\hbclip\;%lib% + +:NO_HBCLIP + +clipper hbtest.prg /w /n %hb_clipopt% +clipper rt_array.prg /w /n %hb_clipopt% +clipper rt_date.prg /w /n %hb_clipopt% +clipper rt_file.prg /w /n %hb_clipopt% +clipper rt_hvm.prg /w /n %hb_clipopt% +clipper rt_hvma.prg /w /n %hb_clipopt% +clipper rt_math.prg /w /n %hb_clipopt% +clipper rt_misc.prg /w /n %hb_clipopt% +clipper rt_str.prg /w /n %hb_clipopt% +clipper rt_stra.prg /w /n %hb_clipopt% +clipper rt_trans.prg /w /n %hb_clipopt% + +if "%1" == "" set hb_linker=rtlink +if not "%1" == "" set hb_linker=exospace + +%hb_linker% out hbtest5x fi hbtest,rt_array,rt_date,rt_file,rt_hvm,rt_hvma,rt_math,rt_misc,rt_str,rt_stra,rt_trans %hb_linkopt% + +del *.obj diff --git a/harbour/utils/hbtest/make_xpp.bat b/harbour/utils/hbtest/make_xpp.bat index c8335ef17c..99af97dad5 100644 --- a/harbour/utils/hbtest/make_xpp.bat +++ b/harbour/utils/hbtest/make_xpp.bat @@ -1,20 +1,20 @@ -@echo off -rem -rem $Id$ -rem - -xpp hbtest.prg /w /n -xpp rt_array.prg /w /n -xpp rt_date.prg /w /n -xpp rt_file.prg /w /n -xpp rt_hvm.prg /w /n -xpp rt_hvma.prg /w /n -xpp rt_math.prg /w /n -xpp rt_misc.prg /w /n -xpp rt_str.prg /w /n -xpp rt_stra.prg /w /n -xpp rt_trans.prg /w /n - -alink hbtest rt_array rt_date rt_file rt_hvm rt_hvma rt_math rt_misc rt_str rt_stra rt_trans - -del *.obj +@echo off +rem +rem $Id$ +rem + +xpp hbtest.prg /w /n +xpp rt_array.prg /w /n +xpp rt_date.prg /w /n +xpp rt_file.prg /w /n +xpp rt_hvm.prg /w /n +xpp rt_hvma.prg /w /n +xpp rt_math.prg /w /n +xpp rt_misc.prg /w /n +xpp rt_str.prg /w /n +xpp rt_stra.prg /w /n +xpp rt_trans.prg /w /n + +alink hbtest rt_array rt_date rt_file rt_hvm rt_hvma rt_math rt_misc rt_str rt_stra rt_trans + +del *.obj