From a3c411b23f1f02db6ba3523b5de1dc6a0feb52fe Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 15 Nov 2008 00:54:22 +0000 Subject: [PATCH] 2008-11-15 01:43 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * make_b32.mak * make_vc.mak * contrib/mtpl_b32.mak * contrib/mtpl_vc.mak * Minor fix. * contrib/hbcurl/make_b32.bat * contrib/hbcurl/make_vc.bat * contrib/hbcurl/Makefile - Removed recently added HB_HBCURL_USR_C. * contrib/gtwvg/tests/demowvg.prg * Replaced '#if __MW__' with 'IF hb_vmmt()'. (not tested) * contrib/gtwvg/tests/hbmk_b32.bat * contrib/gtwvg/tests/hbmk_vc.bat ! Added hbwin.lib to HB_USER_LIBS list. * contrib/gtwvg/gtwvg.c * contrib/gtwvg/wvgclass.prg * contrib/gtwvg/wvgax.prg * contrib/gtwvg/wvgphdlr.prg * contrib/gtwvg/wvgpaint.prg * contrib/gtwvg/wvgcore.c * contrib/gtwvg/wvgwin.c * contrib/gtwvg/wvgwnd.prg * contrib/gtwvg/wvgcrt.prg * contrib/gtwvg/wvgutils.c * contrib/gtwvg/wvgsink.c ! SVN IDs missing, mistyped. SVN tags now reset. ; TOFIX: GTWVG is now broken with MSVC 8 and/or C++ and/or 64-bit modes, also unsafe string function is used: - strcat() should be hb_strncat(). - Usual but wrong HRESULT to ULONG conversions break in 64-bit. - Some newest Windows features should be probably guarded. .\gtwvg.c(1913) : warning C4013: 'TrackMouseEvent' undefined; assuming extern returning int .\gtwvg.c(3205) : error C2065: 'WS_EX_LAYERED' : undeclared identifier .\wvgsink.c(128) : warning C4244: 'return' : conversion from 'HB_THREAD_NO' to 'int', possible loss of data .\wvgsink.c(339) : warning C4245: 'return' : conversion from 'HRESULT' to 'ULONG', signed/unsigned mismatch .\wvgsink.c(352) : warning C4245: 'return' : conversion from 'HRESULT' to 'ULONG', signed/unsigned mismatch .\wvgsink.c(368) : warning C4245: 'return' : conversion from 'HRESULT' to 'ULONG', signed/unsigned mismatch .\wvgsink.c(392) : warning C4245: 'return' : conversion from 'HRESULT' to 'ULONG', signed/unsigned mismatch .\wvgsink.c(455) : error C2039: 'n1' : is not a member of 'tagVARIANT' .\wvgsink.c(457) : error C2039: 'n1' : is not a member of 'tagVARIANT' .\wvgsink.c(460) : error C2039: 'n1' : is not a member of 'tagVARIANT' .\wvgsink.c(463) : error C2039: 'n1' : is not a member of 'tagVARIANT' .\wvgsink.c(466) : error C2039: 'n1' : is not a member of 'tagVARIANT' .\wvgsink.c(469) : error C2039: 'n1' : is not a member of 'tagVARIANT' .\wvgsink.c(472) : error C2039: 'n1' : is not a member of 'tagVARIANT' .\wvgsink.c(475) : error C2039: 'n1' : is not a member of 'tagVARIANT' .\wvgsink.c(633) : warning C4305: 'type cast' : truncation from 'HB_LONG' to 'device_interface *' .\wvgsink.c(652) : warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. --- harbour/ChangeLog | 57 +++++++++++++++++++- harbour/contrib/gtwvg/tests/demowvg.prg | 16 +++--- harbour/contrib/gtwvg/tests/hbmk_b32.bat | 2 +- harbour/contrib/gtwvg/tests/hbmk_vc.bat | 2 +- harbour/contrib/gtwvg/wvgax.prg | 3 ++ harbour/contrib/gtwvg/wvgcrt.prg | 3 ++ harbour/contrib/gtwvg/wvgphdlr.prg | 3 ++ harbour/contrib/gtwvg/wvgsink.c | 3 ++ harbour/contrib/gtwvg/wvgwin.c | 2 +- harbour/contrib/gtwvg/wvgwnd.prg | 3 ++ harbour/contrib/hbcurl/Makefile | 2 +- harbour/contrib/hbcurl/make_b32.bat | 2 +- harbour/contrib/hbcurl/make_vc.bat | 2 +- harbour/contrib/mtpl_b32.mak | 66 ++++++++++++------------ harbour/contrib/mtpl_vc.mak | 50 +++++++++--------- harbour/make_b32.mak | 50 +++++++++--------- harbour/make_vc.mak | 58 ++++++++++----------- 17 files changed, 197 insertions(+), 127 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8b252929b1..38f95b8c96 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,61 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-15 01:43 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * make_b32.mak + * make_vc.mak + * contrib/mtpl_b32.mak + * contrib/mtpl_vc.mak + * Minor fix. + + * contrib/hbcurl/make_b32.bat + * contrib/hbcurl/make_vc.bat + * contrib/hbcurl/Makefile + - Removed recently added HB_HBCURL_USR_C. + + * contrib/gtwvg/tests/demowvg.prg + * Replaced '#if __MW__' with 'IF hb_vmmt()'. + (not tested) + + * contrib/gtwvg/tests/hbmk_b32.bat + * contrib/gtwvg/tests/hbmk_vc.bat + ! Added hbwin.lib to HB_USER_LIBS list. + + * contrib/gtwvg/gtwvg.c + * contrib/gtwvg/wvgclass.prg + * contrib/gtwvg/wvgax.prg + * contrib/gtwvg/wvgphdlr.prg + * contrib/gtwvg/wvgpaint.prg + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgwin.c + * contrib/gtwvg/wvgwnd.prg + * contrib/gtwvg/wvgcrt.prg + * contrib/gtwvg/wvgutils.c + * contrib/gtwvg/wvgsink.c + ! SVN IDs missing, mistyped. SVN tags now reset. + ; TOFIX: GTWVG is now broken with MSVC 8 and/or C++ and/or 64-bit modes, + also unsafe string function is used: + - strcat() should be hb_strncat(). + - Usual but wrong HRESULT to ULONG conversions break in 64-bit. + - Some newest Windows features should be probably guarded. + .\gtwvg.c(1913) : warning C4013: 'TrackMouseEvent' undefined; assuming extern returning int + .\gtwvg.c(3205) : error C2065: 'WS_EX_LAYERED' : undeclared identifier + .\wvgsink.c(128) : warning C4244: 'return' : conversion from 'HB_THREAD_NO' to 'int', possible loss of data + .\wvgsink.c(339) : warning C4245: 'return' : conversion from 'HRESULT' to 'ULONG', signed/unsigned mismatch + .\wvgsink.c(352) : warning C4245: 'return' : conversion from 'HRESULT' to 'ULONG', signed/unsigned mismatch + .\wvgsink.c(368) : warning C4245: 'return' : conversion from 'HRESULT' to 'ULONG', signed/unsigned mismatch + .\wvgsink.c(392) : warning C4245: 'return' : conversion from 'HRESULT' to 'ULONG', signed/unsigned mismatch + .\wvgsink.c(455) : error C2039: 'n1' : is not a member of 'tagVARIANT' + .\wvgsink.c(457) : error C2039: 'n1' : is not a member of 'tagVARIANT' + .\wvgsink.c(460) : error C2039: 'n1' : is not a member of 'tagVARIANT' + .\wvgsink.c(463) : error C2039: 'n1' : is not a member of 'tagVARIANT' + .\wvgsink.c(466) : error C2039: 'n1' : is not a member of 'tagVARIANT' + .\wvgsink.c(469) : error C2039: 'n1' : is not a member of 'tagVARIANT' + .\wvgsink.c(472) : error C2039: 'n1' : is not a member of 'tagVARIANT' + .\wvgsink.c(475) : error C2039: 'n1' : is not a member of 'tagVARIANT' + .\wvgsink.c(633) : warning C4305: 'type cast' : truncation from 'HB_LONG' to 'device_interface *' + .\wvgsink.c(652) : warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. + 2008-11-14 20:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * make_b32.mak * make_vc.mak @@ -4183,7 +4238,7 @@ * source/rdd/Makefile * source/rdd/dbdetach.c + source/rdd/dbdetacx.c - * Moved XBase++ compatibility functions to separate file. + * Moved Xbase++ compatibility functions to separate file. 2008-10-13 21:44 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbwin/win_tole.prg diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index b99db93a2a..20b43bb645 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -306,12 +306,12 @@ Function HB_GTSYS() PROCEDURE WvtNextGets() - #ifdef __MW__ - Hb_ThreadStart( {|| Hb_gtReload( 'WVG' ), Wvt_setFont( 'Terminal',20 ), ; - hb_clear(), Wvt_ShowWindow( SW_RESTORE ), WvtNextGets_X() } ) - #else + IF hb_mtvm() + Hb_ThreadStart( {|| Hb_gtReload( 'WVG' ), Wvt_setFont( 'Terminal',20 ), ; + hb_clear(), Wvt_ShowWindow( SW_RESTORE ), WvtNextGets_X() } ) + ELSE WvtNextGets_X() - #endif + ENDIF RETURN @@ -645,7 +645,7 @@ FUNCTION Hb_Clear() //----------------------------------------------------------------------// FUNCTION WvtMyBrowse() - #ifdef __MW__ + IF hb_mtvm() #if 0 Hb_ThreadStart( {|| Hb_gtReload( 'WVG' ), ; SetMode( 35,70 ), ; @@ -665,9 +665,9 @@ FUNCTION WvtMyBrowse() oCrt:destroy(); } ) - #else + ELSE WvtMyBrowse_X() - #endif + ENDIF Return nil //----------------------------------------------------------------------// diff --git a/harbour/contrib/gtwvg/tests/hbmk_b32.bat b/harbour/contrib/gtwvg/tests/hbmk_b32.bat index 9559b9aa3a..215adaa4e7 100644 --- a/harbour/contrib/gtwvg/tests/hbmk_b32.bat +++ b/harbour/contrib/gtwvg/tests/hbmk_b32.bat @@ -9,7 +9,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 -set HB_USER_LIBS=gtwvg.lib +set HB_USER_LIBS=gtwvg.lib hbwin.lib set HB_GUI=yes call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/gtwvg/tests/hbmk_vc.bat b/harbour/contrib/gtwvg/tests/hbmk_vc.bat index b26904e75b..6de7f4bbf0 100644 --- a/harbour/contrib/gtwvg/tests/hbmk_vc.bat +++ b/harbour/contrib/gtwvg/tests/hbmk_vc.bat @@ -9,7 +9,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc -set HB_USER_LIBS=gtwvg.lib comdlg32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib +set HB_USER_LIBS=gtwvg.lib hbwin.lib comdlg32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib set HB_GUI=yes call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/gtwvg/wvgax.prg b/harbour/contrib/gtwvg/wvgax.prg index 503cb4c9fb..6028d15364 100644 --- a/harbour/contrib/gtwvg/wvgax.prg +++ b/harbour/contrib/gtwvg/wvgax.prg @@ -1,3 +1,6 @@ +/* + * $Id$ + */ /* * Harbour Project source code: diff --git a/harbour/contrib/gtwvg/wvgcrt.prg b/harbour/contrib/gtwvg/wvgcrt.prg index da7d0405be..b69a9a85b7 100644 --- a/harbour/contrib/gtwvg/wvgcrt.prg +++ b/harbour/contrib/gtwvg/wvgcrt.prg @@ -1,3 +1,6 @@ +/* + * $Id$ + */ /* * Harbour Project source code: diff --git a/harbour/contrib/gtwvg/wvgphdlr.prg b/harbour/contrib/gtwvg/wvgphdlr.prg index e319bc61a0..2f336cb567 100644 --- a/harbour/contrib/gtwvg/wvgphdlr.prg +++ b/harbour/contrib/gtwvg/wvgphdlr.prg @@ -1,3 +1,6 @@ +/* + * $Id$ + */ /* * Harbour Project source code: diff --git a/harbour/contrib/gtwvg/wvgsink.c b/harbour/contrib/gtwvg/wvgsink.c index c193987b1b..e229e96ba9 100644 --- a/harbour/contrib/gtwvg/wvgsink.c +++ b/harbour/contrib/gtwvg/wvgsink.c @@ -1,3 +1,6 @@ +/* + * $Id$ + */ /* * Harbour Project source code: diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c index df2b9793db..a572420430 100644 --- a/harbour/contrib/gtwvg/wvgwin.c +++ b/harbour/contrib/gtwvg/wvgwin.c @@ -1,5 +1,5 @@ /* - * $Id: + * $Id$ */ /* diff --git a/harbour/contrib/gtwvg/wvgwnd.prg b/harbour/contrib/gtwvg/wvgwnd.prg index 716f2e563e..fc009a3186 100644 --- a/harbour/contrib/gtwvg/wvgwnd.prg +++ b/harbour/contrib/gtwvg/wvgwnd.prg @@ -1,3 +1,6 @@ +/* + * $Id$ + */ /* * Harbour Project source code: diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile index ac1ff3ca0d..ba1f8b6738 100644 --- a/harbour/contrib/hbcurl/Makefile +++ b/harbour/contrib/hbcurl/Makefile @@ -22,7 +22,7 @@ endif ifneq ($(strip $(HB_INC_CURL_OK)),) -C_USR += $(foreach d, $(HB_INC_CURL_OK), -I$(d)) $(HB_HBCURL_USR_C) +C_USR += $(foreach d, $(HB_INC_CURL_OK), -I$(d)) C_SOURCES=\ hbcurl.c \ diff --git a/harbour/contrib/hbcurl/make_b32.bat b/harbour/contrib/hbcurl/make_b32.bat index fece784bb1..c33ca98668 100644 --- a/harbour/contrib/hbcurl/make_b32.bat +++ b/harbour/contrib/hbcurl/make_b32.bat @@ -18,7 +18,7 @@ goto POST_EXIT :DIR_OK if "%HB_INC_CURL%" == "" set HB_INC_CURL=%HB_DIR_CURL%\include -set CFLAGS=-I"%HB_INC_CURL%" %HB_HBCURL_USR_C% +set CFLAGS=-I"%HB_INC_CURL%" set _HB_DLL_NAME=libcurl if exist "%HB_DIR_CURL%\bin\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_CURL%\bin if exist "%HB_DIR_CURL%\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_CURL% diff --git a/harbour/contrib/hbcurl/make_vc.bat b/harbour/contrib/hbcurl/make_vc.bat index fcdbf9d4c0..dff3f0e32b 100644 --- a/harbour/contrib/hbcurl/make_vc.bat +++ b/harbour/contrib/hbcurl/make_vc.bat @@ -18,7 +18,7 @@ goto POST_EXIT :DIR_OK if "%HB_INC_CURL%" == "" set HB_INC_CURL=%HB_DIR_CURL%\include -set CFLAGS=-I"%HB_INC_CURL%" %HB_HBCURL_USR_C% +set CFLAGS=-I"%HB_INC_CURL%" set _HB_DLL_NAME=libcurl if exist "%HB_DIR_CURL%\bin\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_CURL%\bin if exist "%HB_DIR_CURL%\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_CURL% diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 0ecbdf5537..fada62a7e1 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -180,36 +180,36 @@ Clean: doClean CLEAN: doClean doClean: - @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul - @$(ECHO) @echo off > _hbdeloo.bat - @$(ECHO) if %1x == x goto SKIP >> _hbdeloo.bat - @$(ECHO) if exist %1.c $(DEL) %1.c >> _hbdeloo.bat - @$(ECHO) if exist %1.obj $(DEL) %1.obj >> _hbdeloo.bat - @$(ECHO) :SKIP >> _hbdeloo.bat - @type &&! + -if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul + -$(ECHO) @echo off > _hbdeloo.bat + -$(ECHO) if %1x == x goto SKIP >> _hbdeloo.bat + -$(ECHO) if exist %1.c $(DEL) %1.c >> _hbdeloo.bat + -$(ECHO) if exist %1.obj $(DEL) %1.obj >> _hbdeloo.bat + -$(ECHO) :SKIP >> _hbdeloo.bat + -type &&! @call _hbdeloo.bat $(LIB_OBJS:.obj=^ @call _hbdeloo.bat ) ! > _hbdeloa.bat - @_hbdeloa.bat - @if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul - @if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul - @if exist "$(OBJ_DIR)" rd "$(OBJ_DIR)" > nul 2> nul + -_hbdeloa.bat + -if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul + -if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul + -if exist "$(OBJ_DIR)" rd "$(OBJ_DIR)" > nul 2> nul !if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" - @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul + -if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul !endif - @$(ECHO) @echo off > _hbdelho.bat - @$(ECHO) if %1x == x goto SKIP >> _hbdelho.bat - @$(ECHO) if $(HB_INSTALL_PREFIX)x == $(HB_ROOT)x goto SKIP >> _hbdelho.bat - @$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbdelho.bat - @$(ECHO) :SKIP >> _hbdelho.bat - @type &&! + -$(ECHO) @echo off > _hbdelho.bat + -$(ECHO) if %1x == x goto SKIP >> _hbdelho.bat + -$(ECHO) if $(HB_INSTALL_PREFIX)x == $(HB_ROOT)x goto SKIP >> _hbdelho.bat + -$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbdelho.bat + -$(ECHO) :SKIP >> _hbdelho.bat + -type &&! @call _hbdelho.bat $(ALL_HEADERS: =^ @call _hbdelho.bat ) ! > _hbdelha.bat - @_hbdelha.bat - @if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul - @if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul + -_hbdelha.bat + -if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul + -if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul #********************************************************** # INSTALL rule(s) @@ -220,26 +220,26 @@ Install: doInstall INSTALL: doInstall doInstall: - @type &&! + -type &&! @echo off if not exist $(LIB_PATH) goto SKIP if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul :SKIP ! > _hbcpyla.bat - @_hbcpyla.bat - @if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul - @$(ECHO) @echo off > _hbcpyho.bat - @$(ECHO) if %1x == x goto SKIP >> _hbcpyho.bat - @$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbcpyho.bat - @$(ECHO) if exist %1 copy %1 $(HB_INC_INSTALL) >> _hbcpyho.bat - @$(ECHO) :SKIP >> _hbcpyho.bat - @type &&! + -_hbcpyla.bat + -if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul + -$(ECHO) @echo off > _hbcpyho.bat + -$(ECHO) if %1x == x goto SKIP >> _hbcpyho.bat + -$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbcpyho.bat + -$(ECHO) if exist %1 copy %1 $(HB_INC_INSTALL) >> _hbcpyho.bat + -$(ECHO) :SKIP >> _hbcpyho.bat + -type &&! @call _hbcpyho.bat $(ALL_HEADERS: =^ @call _hbcpyho.bat ) ! > _hbcpyha.bat - @_hbcpyha.bat - @if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul - @if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul + -_hbcpyha.bat + -if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul + -if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul #********************************************************** diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index e890a1fcae..8593a4aa23 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -179,32 +179,32 @@ Clean: doClean CLEAN: doClean doClean: - @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul - @$(ECHO) @echo off > _hbdeloo.bat - @$(ECHO) if %%1x == x goto SKIP >> _hbdeloo.bat - @$(ECHO) if exist %%1.c $(DEL) %%1.c >> _hbdeloo.bat - @$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> _hbdeloo.bat - @$(ECHO) :SKIP >> _hbdeloo.bat + -if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul + -$(ECHO) @echo off > _hbdeloo.bat + -$(ECHO) if %%1x == x goto SKIP >> _hbdeloo.bat + -$(ECHO) if exist %%1.c $(DEL) %%1.c >> _hbdeloo.bat + -$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> _hbdeloo.bat + -$(ECHO) :SKIP >> _hbdeloo.bat <<_hbdeloa.bat @call _hbdeloo.bat $(LIB_OBJS:.obj=^ @call _hbdeloo.bat ) < nul - @if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul - @if exist "$(OBJ_DIR)" rd "$(OBJ_DIR)" > nul 2> nul + -if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul + -if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul + -if exist "$(OBJ_DIR)" rd "$(OBJ_DIR)" > nul 2> nul !if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" - @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul - @$(ECHO) @echo off > _hbdelho.bat - @$(ECHO) if %%1x == x goto SKIP >> _hbdelho.bat - @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbdelho.bat - @$(ECHO) :SKIP >> _hbdelho.bat + -if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul + -$(ECHO) @echo off > _hbdelho.bat + -$(ECHO) if %%1x == x goto SKIP >> _hbdelho.bat + -$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbdelho.bat + -$(ECHO) :SKIP >> _hbdelho.bat <<_hbdelha.bat @call _hbdelho.bat $(ALL_HEADERS: =^ @call _hbdelho.bat ) < nul - @if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul + -if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul + -if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul !endif #********************************************************** @@ -223,18 +223,18 @@ if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAM copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul :SKIP < nul - @$(ECHO) @echo off > _hbcpyho.bat - @$(ECHO) if %%1x == x goto SKIP >> _hbcpyho.bat - @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbcpyho.bat - @$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> _hbcpyho.bat - @$(ECHO) :SKIP >> _hbcpyho.bat + -_hbcpyla.bat + -if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul + -$(ECHO) @echo off > _hbcpyho.bat + -$(ECHO) if %%1x == x goto SKIP >> _hbcpyho.bat + -$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbcpyho.bat + -$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> _hbcpyho.bat + -$(ECHO) :SKIP >> _hbcpyho.bat <<_hbcpyha.bat @call _hbcpyho.bat $(ALL_HEADERS: =^ @call _hbcpyho.bat ) < nul - @if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul + -if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul + -if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul #********************************************************** diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index b6b7527773..2f8727aee7 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -645,31 +645,31 @@ Clean: doClean CLEAN: doClean doClean: - @if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul - @if exist $(BIN_DIR)\*.tds $(DEL) $(BIN_DIR)\*.tds > nul - @if exist $(BIN_DIR)\*.tr? $(DEL) $(BIN_DIR)\*.tr? > nul - @if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul - @if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul - @if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul - @if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul - @if exist $(LIB_DIR)\*.bak $(DEL) $(LIB_DIR)\*.bak > nul - @if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul - @if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul - @if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > 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 $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul - @if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul - @if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul - @if exist $(MTDLL_OBJ_DIR)\*.obj $(DEL) $(MTDLL_OBJ_DIR)\*.obj > nul - @if exist $(MTDLL_OBJ_DIR)\*.c $(DEL) $(MTDLL_OBJ_DIR)\*.c > nul - @if exist $(MTDLL_OBJ_DIR)\*.h $(DEL) $(MTDLL_OBJ_DIR)\*.h > nul - @if exist $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.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 bin\*.dll $(DEL) bin\*.dll > nul - @if exist lib\*.lib $(DEL) lib\*.lib > nul + -if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul + -if exist $(BIN_DIR)\*.tds $(DEL) $(BIN_DIR)\*.tds > nul + -if exist $(BIN_DIR)\*.tr? $(DEL) $(BIN_DIR)\*.tr? > nul + -if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul + -if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul + -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul + -if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul + -if exist $(LIB_DIR)\*.bak $(DEL) $(LIB_DIR)\*.bak > nul + -if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul + -if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul + -if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > 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 $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul + -if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul + -if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul + -if exist $(MTDLL_OBJ_DIR)\*.obj $(DEL) $(MTDLL_OBJ_DIR)\*.obj > nul + -if exist $(MTDLL_OBJ_DIR)\*.c $(DEL) $(MTDLL_OBJ_DIR)\*.c > nul + -if exist $(MTDLL_OBJ_DIR)\*.h $(DEL) $(MTDLL_OBJ_DIR)\*.h > nul + -if exist $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.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 bin\*.dll $(DEL) bin\*.dll > nul + -if exist lib\*.lib $(DEL) lib\*.lib > nul #********************************************************** # INSTALL rules diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 94edb82448..75bcf335c3 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -1026,35 +1026,35 @@ Clean: doClean CLEAN: doClean doClean: - @if exist *.idb $(DEL) *.idb > nul - @if exist *.pch $(DEL) *.pch > nul - @if exist *.pdb $(DEL) *.pdb > nul - @if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul - @if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul - @if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > nul - @if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul - @if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul - @if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul - @if exist $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > nul - @if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul - @if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul - @if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul - @if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul - @if exist $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > 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 $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul - @if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul - @if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul - @if exist $(MTDLL_OBJ_DIR)\*.obj $(DEL) $(MTDLL_OBJ_DIR)\*.obj > nul - @if exist $(MTDLL_OBJ_DIR)\*.c $(DEL) $(MTDLL_OBJ_DIR)\*.c > nul - @if exist $(MTDLL_OBJ_DIR)\*.h $(DEL) $(MTDLL_OBJ_DIR)\*.h > nul - @if exist $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.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 bin\*.dll $(DEL) bin\*.dll > nul - @if exist lib\*.lib $(DEL) lib\*.lib > nul + -if exist *.idb $(DEL) *.idb > nul + -if exist *.pch $(DEL) *.pch > nul + -if exist *.pdb $(DEL) *.pdb > nul + -if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul + -if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul + -if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > nul + -if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul + -if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul + -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul + -if exist $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > nul + -if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul + -if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul + -if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul + -if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul + -if exist $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > 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 $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul + -if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul + -if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul + -if exist $(MTDLL_OBJ_DIR)\*.obj $(DEL) $(MTDLL_OBJ_DIR)\*.obj > nul + -if exist $(MTDLL_OBJ_DIR)\*.c $(DEL) $(MTDLL_OBJ_DIR)\*.c > nul + -if exist $(MTDLL_OBJ_DIR)\*.h $(DEL) $(MTDLL_OBJ_DIR)\*.h > nul + -if exist $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.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 bin\*.dll $(DEL) bin\*.dll > nul + -if exist lib\*.lib $(DEL) lib\*.lib > nul #********************************************************** # INSTALL rules