From 60994add02fdf39764625d4479733d34d43c53b4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 4 Oct 1999 19:53:30 +0000 Subject: [PATCH] 19991004-21:34 GMT+1 --- harbour/ChangeLog | 7 +++++ harbour/tests/bld32exe.bat | 31 --------------------- harbour/tests/bld32w.bat | 31 --------------------- harbour/tests/bld_b16.bat | 8 ++++++ harbour/tests/bld_b32.bat | 8 ++++++ harbour/tests/bld_b32w.bat | 8 ++++++ harbour/tests/{buildvc.bat => bld_vc.bat} | 1 + harbour/tests/bldpexe.bat | 27 ------------------ harbour/tests/buildexe.bat | 27 ------------------ harbour/tests/{build.bat => gnu_test.bat} | 6 ++-- harbour/tests/hb.bat | 13 --------- harbour/tests/hb32.bat | 13 --------- harbour/tests/hb32w.bat | 13 --------- harbour/tests/hbp.bat | 13 --------- harbour/tests/hbrunprg.bat | 8 ------ harbour/tests/hbvc.bat | 10 ------- harbour/tests/run_all.bat | 8 ------ harbour/tests/{bld32obj.bat => run_b32.bat} | 4 +-- harbour/tests/run_prg.bat | 8 ++++++ harbour/tests/run_tsta.bat | 8 ++++++ 20 files changed, 54 insertions(+), 198 deletions(-) delete mode 100644 harbour/tests/bld32exe.bat delete mode 100644 harbour/tests/bld32w.bat create mode 100644 harbour/tests/bld_b16.bat create mode 100644 harbour/tests/bld_b32.bat create mode 100644 harbour/tests/bld_b32w.bat rename harbour/tests/{buildvc.bat => bld_vc.bat} (96%) delete mode 100644 harbour/tests/bldpexe.bat delete mode 100644 harbour/tests/buildexe.bat rename harbour/tests/{build.bat => gnu_test.bat} (84%) delete mode 100644 harbour/tests/hb.bat delete mode 100644 harbour/tests/hb32.bat delete mode 100644 harbour/tests/hb32w.bat delete mode 100644 harbour/tests/hbp.bat delete mode 100644 harbour/tests/hbrunprg.bat delete mode 100644 harbour/tests/hbvc.bat delete mode 100644 harbour/tests/run_all.bat rename harbour/tests/{bld32obj.bat => run_b32.bat} (76%) create mode 100644 harbour/tests/run_prg.bat create mode 100644 harbour/tests/run_tsta.bat diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ef8fb6d8e0..55a6693f79 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,10 @@ +19991004-21:34 GMT+1 Victor Szel + * tests/*.bat + ! Reworked, standardized, simplified. Please test them. + Now they resemble to the bin/*.bat batch files. + * tests/buildexe.bat + - Removed since it was obsolete, use bld_b16.bat instead. + 19991004-19:54 GMT+1 Victor Szel * source/rtl/memvars.c ! memvars.ch changed to hbmemvar.ch diff --git a/harbour/tests/bld32exe.bat b/harbour/tests/bld32exe.bat deleted file mode 100644 index 8dcf9476f0..0000000000 --- a/harbour/tests/bld32exe.bat +++ /dev/null @@ -1,31 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -IF A%1 == A GOTO :SINTAX -IF A%2 == A GOTO :NOOUTPUT - -echo -O2 -e%2.exe -I..\include %1.c > b32.bc -echo ..\lib\b32\harbour.lib ..\lib\b32\terminal.lib >> b32.bc -echo ..\lib\b32\hbgt.lib ..\lib\b32\hbpp.lib >> b32.bc -echo ..\lib\b32\rdd.lib >> b32.bc -bcc32 -v @b32.bc -del b32.bc -GOTO :END - -:NOOUTPUT -echo -O2 -e%1.exe -I..\include %1.c > b32.bc -echo ..\lib\b32\harbour.lib ..\lib\b32\terminal.lib >> b32.bc -echo ..\lib\b32\hbgt.lib ..\lib\b32\hbpp.lib >> b32.bc -echo ..\lib\b32\rdd.lib >> b32.bc -bcc32 -v @b32.bc -del b32.bc -GOTO :END - -:SINTAX -ECHO syntax: BuildExe Harbour_Output_Filename [Exe_Output_Filename] -ECHO Use Harbour_Output_Filename and Exe_Output_Filename without extensions -ECHO\ - -:END diff --git a/harbour/tests/bld32w.bat b/harbour/tests/bld32w.bat deleted file mode 100644 index 5b4e67adfb..0000000000 --- a/harbour/tests/bld32w.bat +++ /dev/null @@ -1,31 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -IF A%1 == A GOTO :SINTAX -IF A%2 == A GOTO :NOOUTPUT - -echo -O2 -e%2.exe -DWINDOWS -tW -I..\include > b32.bc -echo ..\source\vm\hvm.c %1.c ..\lib\b32\harbour.lib ..\lib\b32\termwin.lib >> b32.bc -echo ..\lib\b32\hbgt.lib ..\lib\b32\hbpp.lib >> b32.bc -echo ..\lib\b32\rdd.lib >> b32.bc -bcc32 @b32.bc -del b32.bc -GOTO :END - -:NOOUTPUT -echo -O2 -e%1.exe -DWINDOWS -tW -I..\include > b32.bc -echo ..\source\vm\hvm.c %1.c ..\lib\b32\harbour.lib ..\lib\b32\termwin.lib >> b32.bc -echo ..\lib\b32\hbgt.lib ..\lib\b32\hbpp.lib >> b32.bc -echo ..\lib\b32\rdd.lib >> b32.bc -bcc32 @b32.bc -del b32.bc -GOTO :END - -:SINTAX -ECHO syntax: BuildExe Harbour_Output_Filename [Exe_Output_Filename] -ECHO Use Harbour_Output_Filename and Exe_Output_Filename without extensions -ECHO\ - -:END diff --git a/harbour/tests/bld_b16.bat b/harbour/tests/bld_b16.bat new file mode 100644 index 0000000000..6b40cd0cf4 --- /dev/null +++ b/harbour/tests/bld_b16.bat @@ -0,0 +1,8 @@ +@echo off +rem +rem $Id$ +rem + +..\bin\harbour %1 /n /i..\include +bcc %1.c -e%1.exe -O2 -I..\include -L..\lib\b16 -P -mh -Fm harbour.lib terminal.lib hbpp.lib hbtools.lib +del %1.c diff --git a/harbour/tests/bld_b32.bat b/harbour/tests/bld_b32.bat new file mode 100644 index 0000000000..052c4d21f4 --- /dev/null +++ b/harbour/tests/bld_b32.bat @@ -0,0 +1,8 @@ +@echo off +rem +rem $Id$ +rem + +..\bin\harbour %1 /n /i..\include +bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -v harbour.lib terminal.lib hbpp.lib hbgt.lib rdd.lib +del %1.c diff --git a/harbour/tests/bld_b32w.bat b/harbour/tests/bld_b32w.bat new file mode 100644 index 0000000000..c7c67aabe6 --- /dev/null +++ b/harbour/tests/bld_b32w.bat @@ -0,0 +1,8 @@ +@echo off +rem +rem $Id$ +rem + +..\bin\harbour %1 /n /i..\include +bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -tW harbour.lib termwin.lib hbpp.lib hbgt.lib rdd.lib +del %1.c diff --git a/harbour/tests/buildvc.bat b/harbour/tests/bld_vc.bat similarity index 96% rename from harbour/tests/buildvc.bat rename to harbour/tests/bld_vc.bat index 201ea23d75..7a2388e423 100644 --- a/harbour/tests/buildvc.bat +++ b/harbour/tests/bld_vc.bat @@ -5,3 +5,4 @@ rem ..\bin\harbour %1 /n /i..\include cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\vc\harbour.lib ..\lib\vc\terminal.lib ..\lib\vc\hbtools.lib ..\lib\vc\dbfntx.lib ..\lib\vc\debug.lib +del %1.c diff --git a/harbour/tests/bldpexe.bat b/harbour/tests/bldpexe.bat deleted file mode 100644 index 47f166f5dd..0000000000 --- a/harbour/tests/bldpexe.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -IF A%1 == A GOTO :SINTAX -IF A%2 == A GOTO :NOOUTPUT - -echo -P -mh -O2 -Fm -e%2.exe -I..\include ..\source\vm\hvm.c %1.c > b16.bc -echo ..\lib\b16\harbour.lib ..\lib\b16\hbtools.lib ..\lib\b16\terminal.lib >> b16.bc -bcc @b16.bc -del b16.bc -GOTO :END - -:NOOUTPUT -echo -P -mh -O2 -Fm -e%1.exe -I..\include ..\source\vm\hvm.c %1.c > b16.bc -echo ..\lib\b16\harbour.lib ..\lib\b16\hbtools.lib ..\lib\b16\terminal.lib >> b16.bc -bcc @b16.bc -del b16.bc -GOTO :END - -:SINTAX -ECHO syntax: BuildExe Harbour_Output_Filename [Exe_Output_Filename] -ECHO Use Harbour_Output_Filename and Exe_Output_Filename without extensions -ECHO\ - -:END diff --git a/harbour/tests/buildexe.bat b/harbour/tests/buildexe.bat deleted file mode 100644 index e09cd809e2..0000000000 --- a/harbour/tests/buildexe.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -IF A%1 == A GOTO :SINTAX -IF A%2 == A GOTO :NOOUTPUT - -echo -mh -O2 -Fm -e%2.exe -I..\include ..\source\vm\hvm.c %1.c > b16.bc -echo ..\lib\b16\harbour.lib ..\lib\b16\hbtools.lib ..\lib\b16\terminal.lib >> b16.bc -bcc @b16.bc -del b16.bc -GOTO :END - -:NOOUTPUT -echo -mh -O2 -Fm -e%1.exe -I..\include ..\source\vm\hvm.c %1.c > b16.bc -echo ..\lib\b16\harbour.lib ..\lib\b16\hbtools.lib ..\lib\b16\terminal.lib >> b16.bc -bcc @b16.bc -del b16.bc -GOTO :END - -:SINTAX -ECHO syntax: BuildExe Harbour_Output_Filename [Exe_Output_Filename] -ECHO Use Harbour_Output_Filename and Exe_Output_Filename without extensions -ECHO\ - -:END diff --git a/harbour/tests/build.bat b/harbour/tests/gnu_test.bat similarity index 84% rename from harbour/tests/build.bat rename to harbour/tests/gnu_test.bat index 3358ed26e6..9ea0f303e6 100644 --- a/harbour/tests/build.bat +++ b/harbour/tests/gnu_test.bat @@ -5,13 +5,15 @@ 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. +echo HB_ARCHITECTURE is not set. goto exit :bad_comp -Echo HB_COMPILER is not set. +echo HB_COMPILER is not set. :exit diff --git a/harbour/tests/hb.bat b/harbour/tests/hb.bat deleted file mode 100644 index 6423a38b4c..0000000000 --- a/harbour/tests/hb.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -REM From .PRG to .C = Harbour -..\bin\harbour %1 /n /i..\include -if errorlevel 1 goto end - -REM From .C to .EXE = BuildExe -call buildexe %1 %2 - -:end diff --git a/harbour/tests/hb32.bat b/harbour/tests/hb32.bat deleted file mode 100644 index dae9889209..0000000000 --- a/harbour/tests/hb32.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -REM From .PRG to .C = Harbour -..\bin\harbour %1 %2 /n /i..\include -if errorlevel 1 goto end - -REM From .C to .EXE = BuildExe -call BLD32EXE %1 - -:end diff --git a/harbour/tests/hb32w.bat b/harbour/tests/hb32w.bat deleted file mode 100644 index bb52c23977..0000000000 --- a/harbour/tests/hb32w.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -REM From .PRG to .C = Harbour -..\bin\harbour %1 /n /i..\include -if errorlevel 1 goto end - -REM From .C to .EXE = BuildExe -call BLD32W %1 %2 - -:end diff --git a/harbour/tests/hbp.bat b/harbour/tests/hbp.bat deleted file mode 100644 index 1be712f198..0000000000 --- a/harbour/tests/hbp.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -REM From .PRG to .C = Harbour -..\bin\harbour %1 /n /i..\include -if errorlevel 1 goto end - -REM From .C to .EXE = Bld+Exe -call bldpexe %1 %2 - -:end diff --git a/harbour/tests/hbrunprg.bat b/harbour/tests/hbrunprg.bat deleted file mode 100644 index fb52bc77b6..0000000000 --- a/harbour/tests/hbrunprg.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -REM From .PRG to .C = Harbour -..\bin\harbour %1 /n /gHRB /i..\include -hbrun %1 diff --git a/harbour/tests/hbvc.bat b/harbour/tests/hbvc.bat deleted file mode 100644 index 8801297284..0000000000 --- a/harbour/tests/hbvc.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -REM From .PRG to .C = Harbour -..\bin\harbour %1 /n /i..\include - -REM From .C to .EXE = BuildExe -call BLDVCEXE %1 %2 diff --git a/harbour/tests/run_all.bat b/harbour/tests/run_all.bat deleted file mode 100644 index 00a5fba071..0000000000 --- a/harbour/tests/run_all.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -..\bin\harbour test_all.prg /n /gHBR /i..\include -hbrun test_all -call testall.bat diff --git a/harbour/tests/bld32obj.bat b/harbour/tests/run_b32.bat similarity index 76% rename from harbour/tests/bld32obj.bat rename to harbour/tests/run_b32.bat index 2017f73ca0..b98859f18f 100644 --- a/harbour/tests/bld32obj.bat +++ b/harbour/tests/run_b32.bat @@ -3,6 +3,6 @@ rem rem $Id$ rem -..\bin\harbour %1 /fobj32 /n /i..\include +..\bin\harbour %1 /n /i..\include /gf tlink32 -L..\lib\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib import32.lib cw32mt.lib - +del %1.c diff --git a/harbour/tests/run_prg.bat b/harbour/tests/run_prg.bat new file mode 100644 index 0000000000..ebfe94b199 --- /dev/null +++ b/harbour/tests/run_prg.bat @@ -0,0 +1,8 @@ +@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_tsta.bat b/harbour/tests/run_tsta.bat new file mode 100644 index 0000000000..dc7c1bb3d8 --- /dev/null +++ b/harbour/tests/run_tsta.bat @@ -0,0 +1,8 @@ +@echo off +rem +rem $Id$ +rem + +call run_prg.bat test_all.prg +call testall.bat +del testall.bat