harbour/ChangeLog

@@ -8,6 +8,16 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+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_.
 

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

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

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

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