From f697073a475809a6095db962c8f0d9ab366e4955 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 13 Feb 2000 03:06:28 +0000 Subject: [PATCH] 20000213-04:02 GMT+1 Victor Szakats --- harbour/ChangeLog | 14 ++++++++++ harbour/make_b16.bat | 4 +-- harbour/make_b32.bat | 4 +-- harbour/make_b40.bat | 4 +-- harbour/make_vc.bat | 4 +-- harbour/makefile.b32 | 4 +-- harbour/makefile.vc | 6 +++++ harbour/source/compiler/cmdcheck.c | 43 ++++++++++++++---------------- 8 files changed, 50 insertions(+), 33 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f9c3cb6e93..c354a0dda3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,15 @@ +20000213-04:02 GMT+1 Victor Szakats + * source/compiler/cmdcheck.c + ! Fixed broken handling of the /x switch without parameter. + * *.bat + * make*.err changed to make*.log + * makefile.vc + + NOTE: added about UNISTD.H + * makefile.b32 + ! Fixed the fix for the HARBOURY.H not found error in some Borland + compilers. Now the same compile command is used than *was* already + used previously with MACROL.C, so it should work now. + 20000212-22:50 GMT-3 Luiz Rafael Culik *source/rdd/dbcmd.c *Some docs changed @@ -10,6 +22,7 @@ *Added obj\b32 to the include dir *source/rtl/strings.c *Fixed VAL() function provided by Jose Lanin + 20000212-14:00 GMT+1 Ryszard Glab *source/macro/macro.l @@ -20,6 +33,7 @@ * contrib/rdd_ads/ads1.c + Added adsCreate function for creating ads tables. It also supports adt tables with short names. + 20000212-02:30 GMT+1 Victor Szakats * include/gtapi.h + NOTE: added about incompatibilities between Harbour and CA-Cl*pper diff --git a/harbour/make_b16.bat b/harbour/make_b16.bat index 2dde2cd6db..ea10725275 100644 --- a/harbour/make_b16.bat +++ b/harbour/make_b16.bat @@ -3,5 +3,5 @@ rem rem $Id$ rem -make -fmakefile.b16 > make_b16.err -edit make_b16.err +make -fmakefile.b16 > make_b16.log +edit make_b16.log diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index 323320d6b6..c9caaa9bdf 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -3,5 +3,5 @@ rem rem $Id$ rem -make -fmakefile.b32 > make_b32.err -notepad make_b32.err +make -fmakefile.b32 > make_b32.log +notepad make_b32.log diff --git a/harbour/make_b40.bat b/harbour/make_b40.bat index de2f1dba2d..7cea4c9c9b 100644 --- a/harbour/make_b40.bat +++ b/harbour/make_b40.bat @@ -3,5 +3,5 @@ rem rem $Id$ rem -make -DB40 -fmakefile.b32 > make_b40.err -notepad make_b40.err +make -DB40 -fmakefile.b32 > make_b40.log +notepad make_b40.log diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index c199064d9d..aff8381db5 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -3,5 +3,5 @@ rem rem $Id$ rem -nmake /f makefile.vc %1 > make_vc.err -notepad make_vc.err +nmake /f makefile.vc %1 > make_vc.log +notepad make_vc.log diff --git a/harbour/makefile.b32 b/harbour/makefile.b32 index c2bbbb44b4..074407a4c7 100644 --- a/harbour/makefile.b32 +++ b/harbour/makefile.b32 @@ -11,7 +11,7 @@ BCC_OPT = -O2 -DHARBOUR_USE_WIN_GTAPI !endif -INCLUDE_DIR = include;source\compiler;source\vm;obj\b32 +INCLUDE_DIR = include;source\compiler;source\vm COMPILER_DIR = source\compiler COMMON_DIR = source\common PP_DIR = source\pp @@ -353,7 +353,7 @@ $(OBJ_DIR)\harbourl.c : $(COMPILER_DIR)\harbour.l flex -i -8 -o$@ $** $(OBJ_DIR)\harbourl.obj : $(OBJ_DIR)\harbourl.c - bcc32 $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** + bcc32 $(BCC_OPT) -c -I$(INCLUDE_DIR);$(OBJ_DIR) -o$@ $** $(OBJ_DIR)\cmdcheck.obj : $(COMPILER_DIR)\cmdcheck.c bcc32 $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 8b58ea8f41..0f3eec42b0 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -13,6 +13,12 @@ # (see current one as an example) # +# +# NOTE: In order to compile with MSVC you'll have to create an empty +# file with the name UNISTD.H in the \INCLUDE directory, until +# the issue is sorted out [vszakats]. +# + # # Directory macros. These should never have to change. # diff --git a/harbour/source/compiler/cmdcheck.c b/harbour/source/compiler/cmdcheck.c index e262a81c94..83c96245c1 100644 --- a/harbour/source/compiler/cmdcheck.c +++ b/harbour/source/compiler/cmdcheck.c @@ -317,22 +317,22 @@ void hb_compChkEnvironVar( char * szSwitch ) /* NOTE: It already has support for several include files */ - case 'i': - case 'I': - { - char * pPath; - char * pDelim; + case 'i': + case 'I': + { + char * pPath; + char * pDelim; - pPath = hb_strdup( s + 1 ); - while( ( pDelim = strchr( pPath, OS_PATH_LIST_SEPARATOR ) ) != NULL ) - { - * pDelim = '\0'; - AddSearchPath( pPath, &hb_comp_pIncludePath ); - pPath = pDelim + 1; - } - AddSearchPath( pPath, &hb_comp_pIncludePath ); - } - break; + pPath = hb_strdup( s + 1 ); + while( ( pDelim = strchr( pPath, OS_PATH_LIST_SEPARATOR ) ) != NULL ) + { + * pDelim = '\0'; + AddSearchPath( pPath, &hb_comp_pIncludePath ); + pPath = pDelim + 1; + } + AddSearchPath( pPath, &hb_comp_pIncludePath ); + } + break; case 'l': case 'L': @@ -427,15 +427,12 @@ void hb_compChkEnvironVar( char * szSwitch ) szPrefix[ i ] = '\0'; if( strlen( szPrefix ) == 0 ) - { sprintf( szPrefix, "%08lX_", PackDateTime() ); - } - else - { - strncpy( hb_comp_szPrefix, szPrefix, 16 ); - hb_comp_szPrefix[ 20 ] = '\0'; - strcat( hb_comp_szPrefix, "_" ); - } + + strncpy( hb_comp_szPrefix, szPrefix, 16 ); + hb_comp_szPrefix[ 20 ] = '\0'; + strcat( hb_comp_szPrefix, "_" ); + free( szPrefix ); } break;