From 2347deadfe7be96bf66f524e044e9fe5f1aff58c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 5 Oct 1999 13:00:09 +0000 Subject: [PATCH] 19991005-14:41 GMT+1 --- harbour/.cvsignore | 4 +-- harbour/ChangeLog | 16 ++++++++++ harbour/config/{win32 => w32}/bcc32.cf | 0 harbour/config/{win32 => w32}/dir.cf | 0 harbour/config/{win32 => w32}/gcc.cf | 0 harbour/config/{win32 => w32}/global.cf | 0 harbour/config/{win32 => w32}/icc.cf | 0 harbour/config/{win32 => w32}/install.cf | 0 harbour/config/{win32 => w32}/mingw32.cf | 0 harbour/config/{win32 => w32}/msvc.cf | 0 harbour/make_tpl.bat | 4 +-- harbour/make_tpl.cmd | 4 +-- harbour/make_tpl.sh | 4 +-- harbour/tests/harbour.ini | 2 +- harbour/tests/run_tsta.bat | 6 ++-- harbour/tests/test_all.prg | 37 +++++++++++------------- 16 files changed, 45 insertions(+), 32 deletions(-) rename harbour/config/{win32 => w32}/bcc32.cf (100%) rename harbour/config/{win32 => w32}/dir.cf (100%) rename harbour/config/{win32 => w32}/gcc.cf (100%) rename harbour/config/{win32 => w32}/global.cf (100%) rename harbour/config/{win32 => w32}/icc.cf (100%) rename harbour/config/{win32 => w32}/install.cf (100%) rename harbour/config/{win32 => w32}/mingw32.cf (100%) rename harbour/config/{win32 => w32}/msvc.cf (100%) diff --git a/harbour/.cvsignore b/harbour/.cvsignore index 0032acd7cd..9efc141b3d 100644 --- a/harbour/.cvsignore +++ b/harbour/.cvsignore @@ -4,5 +4,5 @@ linux linux/* os2 os2/* -win32 -win32/* +w32 +w32/* diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 59f2fd3f74..78edd71776 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,19 @@ +19991005-14:41 GMT+1 Victor Szel + * tests/run_tsta.bat + tests/test_all.prg + ! Fixed, HB32 changed to RUN_PRG, filename cases adjusted, using header + files, date format set to standard. + * .cvsignore + make_tpl.* + config/win32/* moved to config/w32/* + * The GNU platform name for Windows 32bit has changed to "w32" from + "win32", the only reason is that the new one is shorter. This way all the + paths will be shorter, and the binary release filenames will be also + shorter. + + Please update your GNU make starter batch files to use w32 instead of + win32 in HB_ARCHITECTURE. + 19991005-13:59 GMT+1 Victor Szel * source/compiler/harbour.y source/pp/stdalone/hbpp.c diff --git a/harbour/config/win32/bcc32.cf b/harbour/config/w32/bcc32.cf similarity index 100% rename from harbour/config/win32/bcc32.cf rename to harbour/config/w32/bcc32.cf diff --git a/harbour/config/win32/dir.cf b/harbour/config/w32/dir.cf similarity index 100% rename from harbour/config/win32/dir.cf rename to harbour/config/w32/dir.cf diff --git a/harbour/config/win32/gcc.cf b/harbour/config/w32/gcc.cf similarity index 100% rename from harbour/config/win32/gcc.cf rename to harbour/config/w32/gcc.cf diff --git a/harbour/config/win32/global.cf b/harbour/config/w32/global.cf similarity index 100% rename from harbour/config/win32/global.cf rename to harbour/config/w32/global.cf diff --git a/harbour/config/win32/icc.cf b/harbour/config/w32/icc.cf similarity index 100% rename from harbour/config/win32/icc.cf rename to harbour/config/w32/icc.cf diff --git a/harbour/config/win32/install.cf b/harbour/config/w32/install.cf similarity index 100% rename from harbour/config/win32/install.cf rename to harbour/config/w32/install.cf diff --git a/harbour/config/win32/mingw32.cf b/harbour/config/w32/mingw32.cf similarity index 100% rename from harbour/config/win32/mingw32.cf rename to harbour/config/w32/mingw32.cf diff --git a/harbour/config/win32/msvc.cf b/harbour/config/w32/msvc.cf similarity index 100% rename from harbour/config/win32/msvc.cf rename to harbour/config/w32/msvc.cf diff --git a/harbour/make_tpl.bat b/harbour/make_tpl.bat index 1bd8f69571..17f1d8a5a8 100644 --- a/harbour/make_tpl.bat +++ b/harbour/make_tpl.bat @@ -32,7 +32,7 @@ set HB_INC_INSTALL=include\ rem --------------------------------------------------------------- rem The following HB_ARCHITECTURE values are currently supported: rem - dos -rem - win32 +rem - w32 rem - linux rem - os2 @@ -44,7 +44,7 @@ rem - When HB_ARCHITECTURE=dos rem - bcc31 rem - djgpp rem - watcom -rem - When HB_ARCHITECTURE=win32 +rem - When HB_ARCHITECTURE=w32 rem - bcc32 rem - gcc rem - mingw32 diff --git a/harbour/make_tpl.cmd b/harbour/make_tpl.cmd index e665c14b01..9e8e3d98b5 100644 --- a/harbour/make_tpl.cmd +++ b/harbour/make_tpl.cmd @@ -32,7 +32,7 @@ set HB_INC_INSTALL=include\ rem --------------------------------------------------------------- rem The following HB_ARCHITECTURE values are currently supported: rem - dos -rem - win32 +rem - w32 rem - linux rem - os2 @@ -44,7 +44,7 @@ rem - When HB_ARCHITECTURE=dos rem - bcc31 rem - djgpp rem - watcom -rem - When HB_ARCHITECTURE=win32 +rem - When HB_ARCHITECTURE=w32 rem - bcc32 rem - gcc rem - mingw32 diff --git a/harbour/make_tpl.sh b/harbour/make_tpl.sh index 0d2dbee974..110c6f6e5a 100644 --- a/harbour/make_tpl.sh +++ b/harbour/make_tpl.sh @@ -32,7 +32,7 @@ export HB_INC_INSTALL=include/ # --------------------------------------------------------------- # The following HB_ARCHITECTURE values are currently supported: # - dos -# - win32 +# - w32 # - linux # - os2 @@ -44,7 +44,7 @@ export HB_ARCHITECTURE=linux # - bcc31 # - djgpp # - watcom -# - When HB_ARCHITECTURE=win32 +# - When HB_ARCHITECTURE=w32 # - bcc32 # - gcc # - mingw32 diff --git a/harbour/tests/harbour.ini b/harbour/tests/harbour.ini index f6bb3778c9..461213bc15 100644 --- a/harbour/tests/harbour.ini +++ b/harbour/tests/harbour.ini @@ -8,7 +8,7 @@ so there!!!= another=section [Date Test] -Today=19990917 +Today=19991005 [Bool Test] True=.t. diff --git a/harbour/tests/run_tsta.bat b/harbour/tests/run_tsta.bat index dc7c1bb3d8..adfbb3d041 100644 --- a/harbour/tests/run_tsta.bat +++ b/harbour/tests/run_tsta.bat @@ -3,6 +3,6 @@ rem rem $Id$ rem -call run_prg.bat test_all.prg -call testall.bat -del testall.bat +call run_prg.bat test_all +call test_all.bat +del test_all.bat diff --git a/harbour/tests/test_all.prg b/harbour/tests/test_all.prg index ef3c9017a6..1dd80a944a 100644 --- a/harbour/tests/test_all.prg +++ b/harbour/tests/test_all.prg @@ -7,19 +7,23 @@ // Patrick Mast and David G. Holm // Compiler independent, but not platform independent (creates a DOS style batch file). // Specify the hbxxx batch file name to use to build with on the command line. -// Defaults to HB32. -// The TESTALL.BAT batch file has restart capability. For example, if there is an error -// in testgt.prg, find and fix the problem, then restart by running "TESTALL TESTGT". +// Defaults to "run_prg". +// The TEST_ALL.BAT batch file has restart capability. For example, if there is an error +// in testgt.prg, find and fix the problem, then restart by running "TEST_ALL TESTGT". + +#include "directry.ch" +#include "fileio.ch" Function Main( cOption, cCmd ) -LOCAL aDir,f,n,o,p,cRead + LOCAL aDir,f,n,o,p,cRead - aDir:=Directory("*.PRG") - o=fCreate("TestAll.Bat") + SET DATE ANSI + SET CENTURY ON + + aDir := Directory("*.prg") + o := fCreate("test_all.bat") IF Empty( cOption ) - cOption:="HB32" - ELSEIF Upper( cOption ) == "HRB" - fWrite(o,"del test_all.out"+chr(13)+chr(10)) + cOption:="run_prg" ENDIF IF Empty( cCmd ) cCmd := "call " @@ -35,15 +39,8 @@ LOCAL aDir,f,n,o,p,cRead IF p > 1 n := Left(aDir[f][1],p-1) fWrite(o,":" + n + Chr(13) + Chr(10)) - IF !Empty( cOption ) .and. Upper( cOption ) == "HRB" - fWrite(o,; - "..\bin\harbour "+aDir[f][1]+" /n /gHRB /i..\include >> test_all.out"+Chr(13)+Chr(10)+; - "if errorlevel 1 goto end"+Chr(13)+Chr(10)+; - "hbrun "+Left(aDir[f][1],Len(aDir[f][1])-4)+".hrb >> test_all.out"+Chr(13)+Chr(10) ) - ELSE - fWrite(o,cCmd + cOption + " " + n + Chr(13) + Chr(10); + fWrite(o,cCmd + cOption + " " + n + Chr(13) + Chr(10); + "if errorlevel 1 goto end" + Chr(13) + Chr(10) + Chr(13) + Chr(10)) - ENDIF ENDIF ENDIF NEXT @@ -62,11 +59,11 @@ LOCAL nH1,lRetu,nH2 IF !lRetu IF !File("NotTestd.txt") - nH2=fCreate("NotTestd.txt") + nH2=fCreate("nottestd.txt") ELSE - nH2=fOpen("NotTestd.txt",1) + nH2=fOpen("nottestd.txt", FO_WRITE) ENDIF - fSeek(nH2,0,2) + fSeek(nH2, 0, FS_END) fWrite(nH2,DtoC(Date())+" "+Time()+" "+cFile+Chr(13)+Chr(10)) fClose(nH2) ENDIF