From 1ef51c8a2574a5582fda185115201a1c49eae2a7 Mon Sep 17 00:00:00 2001 From: Marek Paliwoda Date: Sat, 17 Nov 2007 06:20:31 +0000 Subject: [PATCH] --- harbour/ChangeLog | 28 +++++++++++++++++++--------- harbour/make_b32.bat | 9 ++++++--- harbour/make_vc.bat | 9 ++++++--- harbour/make_vcce.bat | 7 +++++-- harbour/make_vcce.mak | 4 ++-- 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c2e93a4768..a3e8def263 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-16 18:00 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + * harbour/make_b32.bat + * harbour/make_vc.bat + * harbour/make_vcce.bat + + Customize showing error log file in case of compilation error + ! Do not remove error log file if CLEAN rule fails. + + * harbour/make_vcce.mak + ! Minor formatting + 2007-11-17 03:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/win32/w32_ole.c ! Fixed more direct item accesses. @@ -25,7 +35,7 @@ * include/hbapiitm.h * include/hbapi.h * source/vm/itemapi.c - + Added hb_itemPutCLConst() which is the same as + + Added hb_itemPutCLConst() which is the same as hb_itemPutCConst() but the buffer length can be passed. Same as xhb hb_itemPutCRawStatic(). @@ -38,16 +48,16 @@ ! TraceLog() -> HB_TRACE() ! HB_ITEM s_OleAuto -> PHB_ITEM s_pOleAuto TOFIX (new): s_pOleAuto is not freed on app exit. - ! Fixed a few more internal accesses by using API + ! Fixed a few more internal accesses by using API calls. - ; NOTE: There are four more complicated problems here + ; NOTE: There are four more complicated problems here to be solved: 1) hb_stackSetActionRequest() call - 2) Passing direct references to HB_ITEM .value + 2) Passing direct references to HB_ITEM .value members to external functions. - 3) Storing "hidden" information in string ITEMs + 3) Storing "hidden" information in string ITEMs prepended after the strings' actual content. - 4) Not freeing s_pOleAuto (this var BTW is used in + 4) Not freeing s_pOleAuto (this var BTW is used in one static function only) * source/rtl/hbinet.c @@ -79,8 +89,8 @@ ! Added missing SVN headers. - contrib/pdflib/pdflib.h - - Removed this file which belongs to the pdflib - package. This package is needed anyway to use + - Removed this file which belongs to the pdflib + package. This package is needed anyway to use this contrib. (but the contrib is badly broken) * contrib/pdflib/make_b32.bat @@ -92,7 +102,7 @@ 2007-11-16 21:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/win32/w32_ole.c - ! Some trivial cases fixed where low-level stuff was + ! Some trivial cases fixed where low-level stuff was directly accessed. ! Some remaining static vars prefixed with s_. diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index 632311718c..8813664926 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -17,12 +17,14 @@ rem set HB_BUILD_DEBUG=yes rem set HB_BUILD_VERBOSE=yes rem set HB_REBUILD_PARSER=yes rem set HB_MAKE_PROGRAM= +rem set HB_SHOW_ERRORS= rem set HB_MAKE_FLAGS= rem --------------------------------------------------------------- -if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin -if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 +if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin +if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe +if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=yes set HB_MAKEFILE=make_%HB_CC_NAME%.mak rem --------------------------------------------------------------- @@ -43,12 +45,13 @@ if "%1" == "INSTALL" goto INSTALL :BUILD %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log + if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log goto EXIT :CLEAN %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if errorlevel 1 goto EXIT if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul goto EXIT diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index d2541a2532..a17a94a34f 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -17,12 +17,14 @@ rem set HB_BUILD_DEBUG=yes rem set HB_BUILD_VERBOSE=yes rem set HB_REBUILD_PARSER=yes rem set HB_MAKE_PROGRAM= +rem set HB_SHOW_ERRORS= rem set HB_MAKE_FLAGS= rem --------------------------------------------------------------- -if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=yes set HB_MAKEFILE=make_%HB_CC_NAME%.mak rem --------------------------------------------------------------- @@ -43,12 +45,13 @@ if "%1" == "INSTALL" goto INSTALL :BUILD %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log + if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log goto EXIT :CLEAN %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if errorlevel 1 goto EXIT if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul goto EXIT diff --git a/harbour/make_vcce.bat b/harbour/make_vcce.bat index 660d05a0c4..4fad3f8da0 100644 --- a/harbour/make_vcce.bat +++ b/harbour/make_vcce.bat @@ -16,6 +16,7 @@ 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_SHOW_ERRORS= rem set HB_MAKE_FLAGS= rem set HB_CC_NAME= rem --------------------------------------------------------------- @@ -24,7 +25,8 @@ if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwvt if "%HB_CC_NAME%" == "" set HB_CC_NAME=vcce if "%HB_GT_DEFAULT%" == "" set HB_GT_DEFAULT=wvt if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -set HB_MAKEFILE=make_%HB_CC_NAME%.mak +if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=yes +set HB_MAKEFILE=make_%HB_CC_NAME%.mak set C_USR=%C_USR% -DHB_NO_WIN_CONSOLE @@ -46,12 +48,13 @@ if "%1" == "INSTALL" goto INSTALL :BUILD %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log - if errorlevel 1 notepad make_%HB_CC_NAME%.log + if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log goto EXIT :CLEAN %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if errorlevel 1 goto EXIT if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul goto EXIT diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index fd4835d3bf..d28625d4dc 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -1067,8 +1067,8 @@ doClean: -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul -if exist $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > nul -if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul - -if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul - -if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul + -if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul + -if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul -if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul -if exist bin\*.exe $(DEL) bin\*.exe > nul -if exist lib\*.lib $(DEL) lib\*.lib > nul