diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d0abc5a84a..762ca8388a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,74 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-10 17:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * make_b32.bat + * make_vc.bat + * contrib/xhb/make_b32.bat + * contrib/xhb/make_vc.bat + * contrib/libmisc/make_b32.bat + * contrib/libmisc/make_vc.bat + * contrib/pgsql/make_b32.bat + * contrib/pgsql/make_vc.bat + * contrib/apollo/make_b32.bat + * contrib/apollo/make_vc.bat + * contrib/libnf/make_b32.bat + * contrib/libnf/make_vc.bat + * contrib/gd/make_b32.bat + * contrib/gd/make_vc.bat + * contrib/htmllib/make_b32.bat + * contrib/htmllib/make_vc.bat + * contrib/tip/make_b32.bat + * contrib/tip/make_vc.bat + * contrib/libct/make_b32.bat + * contrib/libct/make_vc.bat + * contrib/adordd/make_b32.bat + * contrib/adordd/make_vc.bat + * contrib/pdflib/make_b32.bat + * contrib/pdflib/make_vc.bat + * contrib/rdd_ads/make_b32.bat + * contrib/rdd_ads/make_vc.bat + * contrib/libgt/make_b32.bat + * contrib/libgt/make_vc.bat + * contrib/btree/make_b32.bat + * contrib/btree/make_vc.bat + * contrib/win32/make_b32.bat + * contrib/win32/make_vc.bat + * contrib/directx/make_b32.bat + * contrib/directx/make_vc.bat + * contrib/samples/make_b32.bat + * contrib/samples/make_vc.bat + * contrib/mysql/make_b32.bat + * contrib/mysql/make_vc.bat + * contrib/odbc/make_b32.bat + + contrib/odbc/make_vc.bat + * contrib/bmdbfcdx/make_b32.bat + * contrib/bmdbfcdx/make_vc.bat + * contrib/hgf/win32/make_b32.bat + * contrib/hgf/win32/make_vc.bat + ! Readded COPYCMD "hack" to core Harbour for fully portable + "copy /y" functionality across all Micro$oft operating systems. + + Same feature added for all contribs. + + * contrib/hbzlib/make_b32_dll.bat + * contrib/hbzlib/make_b32_dll.mak + * contrib/hbzlib/make_b32.bat + - contrib/hbzlib/make_b32.mak + * contrib/hbzlib/make_vc.bat + - contrib/hbzlib/make_vc.mak + + contrib/hbzlib/common.mak + + Standardized make files (and some cleanup along the way) + ; TODO: BC dll creating is still to be cleaned. + ; TOFIX: Lots of warnings if compiled with standard BCC switch set. + ; TOFIX: Lots of warnings when compiler for MSVC. + + * contrib/hgf/win32/win32.c + * contrib/hgf/win32/form.prg + ! Fixed one unused var warning in .prg code. + ! Fixed to not use Harbour internals. + (Petr, this should have the same effect as your request, + but pls test this change.) + 2007-11-10 12:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/libmisc/common.mak * contrib/apollo/common.mak diff --git a/harbour/contrib/adordd/make_b32.bat b/harbour/contrib/adordd/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/adordd/make_b32.bat +++ b/harbour/contrib/adordd/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/adordd/make_vc.bat b/harbour/contrib/adordd/make_vc.bat index 96eca5a7e9..0709c7b924 100644 --- a/harbour/contrib/adordd/make_vc.bat +++ b/harbour/contrib/adordd/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/apollo/make_b32.bat b/harbour/contrib/apollo/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/apollo/make_b32.bat +++ b/harbour/contrib/apollo/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/apollo/make_vc.bat b/harbour/contrib/apollo/make_vc.bat index 96eca5a7e9..0709c7b924 100644 --- a/harbour/contrib/apollo/make_vc.bat +++ b/harbour/contrib/apollo/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/bmdbfcdx/make_b32.bat b/harbour/contrib/bmdbfcdx/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/bmdbfcdx/make_b32.bat +++ b/harbour/contrib/bmdbfcdx/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/bmdbfcdx/make_vc.bat b/harbour/contrib/bmdbfcdx/make_vc.bat index 96eca5a7e9..0709c7b924 100644 --- a/harbour/contrib/bmdbfcdx/make_vc.bat +++ b/harbour/contrib/bmdbfcdx/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/btree/make_b32.bat b/harbour/contrib/btree/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/btree/make_b32.bat +++ b/harbour/contrib/btree/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/btree/make_vc.bat b/harbour/contrib/btree/make_vc.bat index 96eca5a7e9..0709c7b924 100644 --- a/harbour/contrib/btree/make_vc.bat +++ b/harbour/contrib/btree/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/directx/make_b32.bat b/harbour/contrib/directx/make_b32.bat index 37c0b64205..cec776e5c8 100644 --- a/harbour/contrib/directx/make_b32.bat +++ b/harbour/contrib/directx/make_b32.bat @@ -27,6 +27,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -58,3 +65,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/directx/make_vc.bat b/harbour/contrib/directx/make_vc.bat index d1555db9c5..0e4b1d79f6 100644 --- a/harbour/contrib/directx/make_vc.bat +++ b/harbour/contrib/directx/make_vc.bat @@ -27,6 +27,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -58,3 +65,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/gd/make_b32.bat b/harbour/contrib/gd/make_b32.bat index 0eaeee64d1..46aab210f3 100644 --- a/harbour/contrib/gd/make_b32.bat +++ b/harbour/contrib/gd/make_b32.bat @@ -27,6 +27,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -58,3 +65,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/gd/make_vc.bat b/harbour/contrib/gd/make_vc.bat index f9612777f0..c12b61bb2c 100644 --- a/harbour/contrib/gd/make_vc.bat +++ b/harbour/contrib/gd/make_vc.bat @@ -27,6 +27,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -58,3 +65,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/hbzlib/common.mak b/harbour/contrib/hbzlib/common.mak new file mode 100644 index 0000000000..889dcd9ed0 --- /dev/null +++ b/harbour/contrib/hbzlib/common.mak @@ -0,0 +1,34 @@ +# +# $Id$ +# + +LIBNAME = hbzip + +LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) + +# +# LIB rules +# + +LIB_OBJS = \ + $(OBJ_DIR)\ziparchive$(OBJEXT) \ + $(OBJ_DIR)\zip$(OBJEXT) \ + $(OBJ_DIR)\hbcomprs$(OBJEXT) \ + $(OBJ_DIR)\zipplatform$(OBJEXT) \ + $(OBJ_DIR)\zipstorage$(OBJEXT) \ + $(OBJ_DIR)\zipstring$(OBJEXT) \ + $(OBJ_DIR)\zipplatformcomm$(OBJEXT) \ + $(OBJ_DIR)\zippathcomponent$(OBJEXT) \ + $(OBJ_DIR)\zipmemfile$(OBJEXT) \ + $(OBJ_DIR)\zipfileheader$(OBJEXT) \ + $(OBJ_DIR)\zipfile$(OBJEXT) \ + $(OBJ_DIR)\zipnew$(OBJEXT) \ + $(OBJ_DIR)\zipcomp$(OBJEXT) \ + $(OBJ_DIR)\zipexception$(OBJEXT) \ + $(OBJ_DIR)\zipcompatibility$(OBJEXT) \ + $(OBJ_DIR)\zipcentraldir$(OBJEXT) \ + $(OBJ_DIR)\zipautobuffer$(OBJEXT) \ + $(OBJ_DIR)\stdafx$(OBJEXT) + +all: \ + $(LIB_PATH) \ diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat index fc0179edff..d802cbcc6c 100644 --- a/harbour/contrib/hbzlib/make_b32.bat +++ b/harbour/contrib/hbzlib/make_b32.bat @@ -3,27 +3,66 @@ rem rem $Id$ rem -if not exist obj md obj -if not exist obj\b32 md obj\b32 +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +set C_USR=-Iinclude -DZLIB_DLL;WIN32;ASSERT -vi -Ve -6 -R- -H- -5 -OS -w- -X- -a8 -b -k- + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL :BUILD - make -fmake_b32.mak %1 %2 %3 > make_b32.log - if "%1" == "clean" goto CLEAN - if "%1" == "CLEAN" goto CLEAN - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - copy ..\..\lib\b32\hbzip.lib ..\..\lib > nul - goto EXIT - -:BUILD_ERR - - notepad make_b32.log + %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 goto EXIT :CLEAN - if exist make_b32.log del make_b32.log + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + 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 + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT :EXIT +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/hbzlib/make_b32.mak b/harbour/contrib/hbzlib/make_b32.mak deleted file mode 100644 index 4bee20f343..0000000000 --- a/harbour/contrib/hbzlib/make_b32.mak +++ /dev/null @@ -1,209 +0,0 @@ -# -# $Id$ -# - -# -# Borland C++ IDE generated makefile -# Generated 11/04/01 at 19:22:16 -# -.AUTODEPEND - - -# -# Borland C++ tools -# -!ifndef BCB -BCB = . -!endif - -OBJ_DIR = obj\b32 -LIB_DIR = ..\..\lib\b32 - -IMPLIB = Implib -BCC32 = Bcc32 -vi -Ve -6 -R- -H- -5 -OS -w- -O2 -X- -a8 -b -k- -TLINK32 = TLink32 -TLIB = TLib -BRC32 = Brc32 -TASM32 = Tasm32 -# -# IDE macros -# - - -# -# Options -# -IDE_LinkFLAGS32 = -L$(BCB)\LIB\b32 -LinkerLocalOptsAtC32_ziparddll = -L$(BCB)\LIB\b32 -Tpe -ap -c -ResLocalOptsAtC32_ziparddll = -BLocalOptsAtC32_ziparddll = -CompInheritOptsAt_ziparddll = -I$(BCB)\INCLUDE -Iinclude -I..\..\include;. -DZLIB_DLL;WIN32;ASSERT -u -LinkerInheritOptsAt_ziparddll = -x -LinkerOptsAt_ziparddll = $(LinkerLocalOptsAtC32_ziparddll) -ResOptsAt_ziparddll = $(ResLocalOptsAtC32_ziparddll) -BOptsAt_ziparddll = $(BLocalOptsAtC32_ziparddll) - -# -# Dependency List -# -Dep_zipar = \ - $(LIB_DIR)\hbzip.lib - -ziparchive : $(Dep_zipar) - echo MakeNode - -CLEAN: - -@if exist $(Dep_zipar) erase $(Dep_zipar) - -@if exist $(OBJ_DIR)\*.obj erase $(OBJ_DIR)\*.obj - -@if exist $(OBJ_DIR)\*.c erase $(OBJ_DIR)\*.c - -@if exist $(OBJ_DIR)\*.res erase $(OBJ_DIR)\*.res - -@if exist $(OBJ_DIR)\*.map erase $(OBJ_DIR)\*.map - -@if exist $(OBJ_DIR)\*.rws erase $(OBJ_DIR)\*.rws - -Dep_ziparddll = \ - $(OBJ_DIR)\ziparchive.obj\ - $(OBJ_DIR)\zip.obj\ - $(OBJ_DIR)\hbcomprs.obj\ - $(OBJ_DIR)\zipplatform.obj\ - $(OBJ_DIR)\zipstorage.obj\ - $(OBJ_DIR)\zipstring.obj\ - $(OBJ_DIR)\zipplatformcomm.obj\ - $(OBJ_DIR)\zippathcomponent.obj\ - $(OBJ_DIR)\zipmemfile.obj\ - $(OBJ_DIR)\zipfileheader.obj\ - $(OBJ_DIR)\zipfile.obj\ - $(OBJ_DIR)\zipnew.obj\ - $(OBJ_DIR)\zipcomp.obj\ - $(OBJ_DIR)\zipexception.obj\ - $(OBJ_DIR)\zipcompatibility.obj\ - $(OBJ_DIR)\zipcentraldir.obj\ - $(OBJ_DIR)\zipautobuffer.obj\ - $(OBJ_DIR)\stdafx.obj - -$(LIB_DIR)\hbzip.lib : $(Dep_ziparddll) - $(TLIB) $< $(IDE_BFLAGS) /P64 $(BOptsAt_ziparddll) @&&| - -+$(OBJ_DIR)\zip.obj & --+$(OBJ_DIR)\hbcomprs.obj & --+$(OBJ_DIR)\zipstorage.obj & --+$(OBJ_DIR)\zipstring.obj & --+$(OBJ_DIR)\zipplatformcomm.obj & --+$(OBJ_DIR)\zipplatform.obj & --+$(OBJ_DIR)\zippathcomponent.obj & --+$(OBJ_DIR)\zipmemfile.obj & --+$(OBJ_DIR)\zipfileheader.obj & --+$(OBJ_DIR)\zipfile.obj & --+$(OBJ_DIR)\zipexception.obj & --+$(OBJ_DIR)\zipcompatibility.obj & --+$(OBJ_DIR)\zipcentraldir.obj & --+$(OBJ_DIR)\zipautobuffer.obj & --+$(OBJ_DIR)\ziparchive.obj & --+$(OBJ_DIR)\zipnew.obj & --+$(OBJ_DIR)\zipcomp.obj & --+$(OBJ_DIR)\stdafx.obj -| - - -$(OBJ_DIR)\zip.obj : zip.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -I\xharbour\include -DZLIB_DLL -o$@ zip.c -| - -$(OBJ_DIR)\hbcomprs.obj : hbcomprs.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -I\xharbour\include -DZLIB_DLL -o$@ hbcomprs.c -| - -$(OBJ_DIR)\zipstorage.obj : zipstorage.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipstorage.cpp -| - -$(OBJ_DIR)\zipstring.obj : zipstring.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipstring.cpp -| - -$(OBJ_DIR)\zipplatformcomm.obj : zipplatformcomm.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipplatformcomm.cpp -| - -$(OBJ_DIR)\zipplatform.obj : zipplatform.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipplatform.cpp -| - -$(OBJ_DIR)\zippathcomponent.obj : zippathcomponent.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zippathcomponent.cpp -| - -$(OBJ_DIR)\zipmemfile.obj : zipmemfile.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipmemfile.cpp -| - -$(OBJ_DIR)\zipnew.obj : zipnew.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipnew.cpp -| - -$(OBJ_DIR)\zipcomp.obj : zipcomp.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcomp.cpp -| - -$(OBJ_DIR)\zipfileheader.obj : zipfileheader.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipfileheader.cpp -| - -$(OBJ_DIR)\zipfile.obj : zipfile.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipfile.cpp -| - -$(OBJ_DIR)\zipexception.obj : zipexception.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipexception.cpp -| - -$(OBJ_DIR)\zipcompatibility.obj : zipcompatibility.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcompatibility.cpp -| - -$(OBJ_DIR)\zipcentraldir.obj : zipcentraldir.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcentraldir.cpp -| - -$(OBJ_DIR)\zipautobuffer.obj : zipautobuffer.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipautobuffer.cpp -| - -$(OBJ_DIR)\ziparchive.obj : ziparchive.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ ziparchive.cpp -| - -$(OBJ_DIR)\stdafx.obj : stdafx.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ stdafx.cpp -| - -# Compiler configuration file -BccW32.cfg : - Copy &&| --vi --Ve --6 --R- --H- --5 --OS --w- --O2 -X- -a8 -b -k- -| $@ - diff --git a/harbour/contrib/hbzlib/make_b32_dll.bat b/harbour/contrib/hbzlib/make_b32_dll.bat index a4b158f1f5..19e6708cda 100644 --- a/harbour/contrib/hbzlib/make_b32_dll.bat +++ b/harbour/contrib/hbzlib/make_b32_dll.bat @@ -4,31 +4,40 @@ REM $Id$ REM REM +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + if not exist obj\dll md obj\dll if not exist obj\dll\b32 md obj\dll\b32 :BUILD make -fmake_b32_dll.mak %1 %2 %3 > make_b32_dll.log - if errorlevel 1 goto BUILD_ERR - if "%1" == "clean" goto CLEAN - if "%1" == "CLEAN" goto CLEAN + if errorlevel 1 goto notepad make_b32_dll.log :BUILD_OK -if exist hdll.tmp del hdll.tmp -if exist ..\..\lib\b32\hbzipdll.dll implib ..\..\lib\b32\hbzipdll.lib ..\..\lib\b32\hbzipdll.dll > nul -if exist ..\..\lib\b32\hbzipdll.dll copy ..\..\lib\b32\hbzipdll.dll ..\..\lib > nul -if exist ..\..\lib\b32\hbzipdll.lib copy ..\..\lib\b32\hbzipdll.lib ..\..\lib > nul + if exist hdll.tmp del hdll.tmp + if exist ..\..\lib\b32\hbzipdll.dll implib ..\..\lib\b32\hbzipdll.lib ..\..\lib\b32\hbzipdll.dll > nul + if exist ..\..\lib\b32\hbzipdll.dll copy ..\..\lib\b32\hbzipdll.dll ..\..\lib > nul + if exist ..\..\lib\b32\hbzipdll.lib copy ..\..\lib\b32\hbzipdll.lib ..\..\lib > nul -goto EXIT - -:BUILD_ERR - -notepad dll_b32.log -goto EXIT + goto EXIT :CLEAN - if exist dll_b32.log del dll_b32.log + + if exist dll_b32.log del dll_b32.log :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/hbzlib/make_b32_dll.mak b/harbour/contrib/hbzlib/make_b32_dll.mak index 09d1d3e5e0..07defe436d 100644 --- a/harbour/contrib/hbzlib/make_b32_dll.mak +++ b/harbour/contrib/hbzlib/make_b32_dll.mak @@ -39,7 +39,7 @@ INCLUDE_DIR = include;..\..\include; C_USR = -tW -DHB_FM_STATISTICS_OFF -D__WIN32__ -D__EXPORT__ -CLIBFLAGS = $(C_USR) -a8 -OS -O2 -6 -c -I$(INCLUDE_DIR) -d -w- -DSIMPLEX -DZLIB_DLL +CLIBFLAGS = $(C_USR) -a8 -OS -O2 -6 -c -I$(INCLUDE_DIR) -d -w- -DZLIB_DLL # ÚÄÄÄÄÄÄÄÄ¿ # ³ output ³Û diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat index 79c905a2d2..38f38336a1 100644 --- a/harbour/contrib/hbzlib/make_vc.bat +++ b/harbour/contrib/hbzlib/make_vc.bat @@ -3,20 +3,66 @@ rem rem $Id$ rem -if not exist obj md obj -if not exist obj\vc md obj\vc +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +set C_USR=-Iinclude -DZLIB_DLL;WIN32;ASSERT + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL :BUILD - nmake -fmake_vc.mak %1 %2 %3 > make_vc.log - if errorlevel 1 goto BUILD_ERR - -:BUILD_OK - copy ..\..\lib\vc\hbzip.lib ..\..\lib > nul + %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 goto EXIT -:BUILD_ERR +:CLEAN - notepad make_vc.log + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + 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 + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/hbzlib/make_vc.mak b/harbour/contrib/hbzlib/make_vc.mak deleted file mode 100644 index e9b63174bc..0000000000 --- a/harbour/contrib/hbzlib/make_vc.mak +++ /dev/null @@ -1,74 +0,0 @@ -# -# $Id$ -# - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -OUTDIR=..\..\lib\vc -INTDIR=obj\vc - -ALL : "$(OUTDIR)\hbzip.lib" - -CLEAN : - -@if exist "$(INTDIR)\*.obj" del "$(INTDIR)\*.obj" >nul - -@if exist "$(INTDIR)\*.c" del "$(INTDIR)\*.c" >nul - -@if exist "$(OUTDIR)\hbzip.lib" del "$(OUTDIR)\hbzip.lib" >nul - -"$(OUTDIR)" : - @if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -"$(INTDIR)" : - @if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -CPP=cl.exe -CPP_PROJ=-Ogt2yb1p -FD -GA -GB -Gs -W3 /nologo /GX /ML /I "..\..\include" /Iinclude\ - /DWIN32 /D_WIN32 /DNDEBUG /D_MBCS /D_LIB\ - /Fp"$(INTDIR)\hbzip.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ - /FD /c $(CFLAGS) - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\hbzip.lib" -LIB32_OBJS= \ - "$(INTDIR)\stdafx.obj" \ - "$(INTDIR)\zip.obj" \ - "$(INTDIR)\hbcomprs.obj" \ - "$(INTDIR)\ziparchive.obj" \ - "$(INTDIR)\zipautobuffer.obj" \ - "$(INTDIR)\zipcentraldir.obj" \ - "$(INTDIR)\zipcomp.obj" \ - "$(INTDIR)\zipcompatibility.obj" \ - "$(INTDIR)\zipexception.obj" \ - "$(INTDIR)\zipfile.obj" \ - "$(INTDIR)\zipfileheader.obj" \ - "$(INTDIR)\zipmemfile.obj" \ - "$(INTDIR)\zipnew.obj" \ - "$(INTDIR)\zippathcomponent.obj" \ - "$(INTDIR)\zipplatform.obj" \ - "$(INTDIR)\zipplatformcomm.obj" \ - "$(INTDIR)\zipstorage.obj" \ - "$(INTDIR)\ZipString.obj" - -"$(OUTDIR)\hbzip.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - diff --git a/harbour/contrib/hgf/win32/form.prg b/harbour/contrib/hgf/win32/form.prg index a725dcbe7a..ae4c7eee3c 100644 --- a/harbour/contrib/hgf/win32/form.prg +++ b/harbour/contrib/hgf/win32/form.prg @@ -132,6 +132,8 @@ return nil METHOD LButtonDown( nKeyFlags, nXPos, nYPos ) CLASS HBForm + HB_SYMBOL_UNUSED( nKeyFlags ) + if ::OnClick != nil return __ObjSendMsg( Self, ::OnClick, Self, nXPos, nYPos ) endif diff --git a/harbour/contrib/hgf/win32/make_b32.bat b/harbour/contrib/hgf/win32/make_b32.bat index f898a4dd60..196f67c091 100644 --- a/harbour/contrib/hgf/win32/make_b32.bat +++ b/harbour/contrib/hgf/win32/make_b32.bat @@ -3,24 +3,26 @@ rem rem $Id$ rem +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN :BUILD make -fmake_b32.mak %1 %2 %3 > make_b32.log - if errorlevel 1 goto BUILD_ERR + if errorlevel 1 notepad make_b32.log :BUILD_OK copy ..\..\..\lib\b32\hgfwin32.lib ..\..\..\lib\*.* > nul goto EXIT -:BUILD_ERR - - notepad make_b32.log - goto EXIT - :CLEAN if exist ..\..\..\lib\b32\hgfwin32.lib del ..\..\..\lib\b32\hgfwin32.lib if exist ..\..\..\lib\b32\hgfwin32.bak del ..\..\..\lib\b32\hgfwin32.bak @@ -36,3 +38,7 @@ if "%1" == "CLEAN" goto CLEAN :EXIT +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/hgf/win32/make_vc.bat b/harbour/contrib/hgf/win32/make_vc.bat index c084fe6866..7cea63b88c 100644 --- a/harbour/contrib/hgf/win32/make_vc.bat +++ b/harbour/contrib/hgf/win32/make_vc.bat @@ -3,6 +3,13 @@ rem rem $Id$ rem +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + SET _LIB=%LIB% SET _PATH=%PATH% SET _INCLUDE=%INCLUDE% @@ -16,3 +23,8 @@ SET INCLUDE=%_INCLUDE% SET _LIB= SET _PATH= SET _INCLUDE= + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/hgf/win32/win32.c b/harbour/contrib/hgf/win32/win32.c index 95aa16532a..4bc4f935a5 100644 --- a/harbour/contrib/hgf/win32/win32.c +++ b/harbour/contrib/hgf/win32/win32.c @@ -207,23 +207,26 @@ HB_FUNC( SENDMESSAGE ) LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - static PHB_DYNS pDynSym = 0; + static PHB_DYNS pDynSym = NULL; if( ! pDynSym ) - pDynSym = hb_dynsymFind( "HB_GUI" ); + pDynSym = hb_dynsymFindName( "HB_GUI" ); - hb_vmPushSymbol( pDynSym->pSymbol ); - hb_vmPushNil(); - hb_vmPushLong( ( LONG ) hWnd ); - hb_vmPushLong( message ); - hb_vmPushLong( wParam ); - hb_vmPushLong( lParam ); - hb_vmDo( 4 ); + if( pDynSym ) + { + hb_vmPushSymbol( hb_dynsymSymbol( pDynSym ) ); + hb_vmPushNil(); + hb_vmPushLong( ( LONG ) hWnd ); + hb_vmPushLong( message ); + hb_vmPushLong( wParam ); + hb_vmPushLong( lParam ); + hb_vmDo( 4 ); - if( hb_arrayGetType( &hb_stack.Return, 1 ) == HB_IT_NIL ) - return DefWindowProc( ( HWND ) hWnd, message, wParam, lParam ); - else - return hb_parnl( -1, 1 ); + if( hb_arrayGetType( hb_stackReturnItem(), 1 ) == HB_IT_NIL ) + return DefWindowProc( ( HWND ) hWnd, message, wParam, lParam ); + } + + return hb_parnl( -1, 1 ); } HB_FUNC( POSTQUITMESSAGE ) diff --git a/harbour/contrib/htmllib/make_b32.bat b/harbour/contrib/htmllib/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/htmllib/make_b32.bat +++ b/harbour/contrib/htmllib/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/htmllib/make_vc.bat b/harbour/contrib/htmllib/make_vc.bat index bf8f375a9a..2ab08989e6 100644 --- a/harbour/contrib/htmllib/make_vc.bat +++ b/harbour/contrib/htmllib/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/libct/make_b32.bat b/harbour/contrib/libct/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/libct/make_b32.bat +++ b/harbour/contrib/libct/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/libct/make_vc.bat b/harbour/contrib/libct/make_vc.bat index bf8f375a9a..2ab08989e6 100644 --- a/harbour/contrib/libct/make_vc.bat +++ b/harbour/contrib/libct/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/libgt/make_b32.bat b/harbour/contrib/libgt/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/libgt/make_b32.bat +++ b/harbour/contrib/libgt/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/libgt/make_vc.bat b/harbour/contrib/libgt/make_vc.bat index bf8f375a9a..2ab08989e6 100644 --- a/harbour/contrib/libgt/make_vc.bat +++ b/harbour/contrib/libgt/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/libmisc/make_b32.bat b/harbour/contrib/libmisc/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/libmisc/make_b32.bat +++ b/harbour/contrib/libmisc/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/libmisc/make_vc.bat b/harbour/contrib/libmisc/make_vc.bat index bf8f375a9a..2ab08989e6 100644 --- a/harbour/contrib/libmisc/make_vc.bat +++ b/harbour/contrib/libmisc/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/libnf/make_b32.bat b/harbour/contrib/libnf/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/libnf/make_b32.bat +++ b/harbour/contrib/libnf/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/libnf/make_vc.bat b/harbour/contrib/libnf/make_vc.bat index bf8f375a9a..2ab08989e6 100644 --- a/harbour/contrib/libnf/make_vc.bat +++ b/harbour/contrib/libnf/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat index f036d54270..c56fbde5b6 100644 --- a/harbour/contrib/mysql/make_b32.bat +++ b/harbour/contrib/mysql/make_b32.bat @@ -29,6 +29,13 @@ set C_USR=%C_USR% -DHB_OS_WIN_32_USED rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -60,3 +67,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/mysql/make_vc.bat b/harbour/contrib/mysql/make_vc.bat index 15e763a89b..24e00c7070 100644 --- a/harbour/contrib/mysql/make_vc.bat +++ b/harbour/contrib/mysql/make_vc.bat @@ -29,6 +29,13 @@ set C_USR=%C_USR% -DHB_OS_WIN_32_USED rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -60,3 +67,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/odbc/make_b32.bat b/harbour/contrib/odbc/make_b32.bat index afeb7476f8..44b23c1479 100644 --- a/harbour/contrib/odbc/make_b32.bat +++ b/harbour/contrib/odbc/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -56,3 +63,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/odbc/make_vc.bat b/harbour/contrib/odbc/make_vc.bat new file mode 100644 index 0000000000..bec8f73542 --- /dev/null +++ b/harbour/contrib/odbc/make_vc.bat @@ -0,0 +1,70 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem +rem Set any of the below settings to customize your build process: +rem set HB_MAKE_PROGRAM= +rem set HB_MAKE_FLAGS= +rem --------------------------------------------------------------- + +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak + +rem --------------------------------------------------------------- + +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +if "%1" == "install" goto INSTALL +if "%1" == "INSTALL" goto INSTALL + +:BUILD + + LIB /MACHINE:X86 /DEF:odbc32.def /OUT:..\..\lib\%HB_CC_NAME%\odbc32.lib + + %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 + goto EXIT + +:CLEAN + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + 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 + +:INSTALL + + if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + + if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin + if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib + + copy ..\..\lib\%HB_CC_NAME%\odbc32.lib ..\..\lib\ + + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + goto EXIT + +:EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/pdflib/make_b32.bat b/harbour/contrib/pdflib/make_b32.bat index f2a16b0a07..4dbb1d5c18 100644 --- a/harbour/contrib/pdflib/make_b32.bat +++ b/harbour/contrib/pdflib/make_b32.bat @@ -27,6 +27,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -58,3 +65,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/pdflib/make_vc.bat b/harbour/contrib/pdflib/make_vc.bat index 79e9a9e770..febd20012d 100644 --- a/harbour/contrib/pdflib/make_vc.bat +++ b/harbour/contrib/pdflib/make_vc.bat @@ -27,6 +27,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -58,3 +65,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/pgsql/make_b32.bat b/harbour/contrib/pgsql/make_b32.bat index cd3dc7838c..a827d6d0a6 100644 --- a/harbour/contrib/pgsql/make_b32.bat +++ b/harbour/contrib/pgsql/make_b32.bat @@ -29,6 +29,13 @@ set C_USR=%C_USR% -DHB_OS_WIN_32_USED -DPG_DIAG_INTERNAL_POSITION rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -60,3 +67,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/pgsql/make_vc.bat b/harbour/contrib/pgsql/make_vc.bat index cdffffe354..06e62bced1 100644 --- a/harbour/contrib/pgsql/make_vc.bat +++ b/harbour/contrib/pgsql/make_vc.bat @@ -29,6 +29,13 @@ set C_USR=%C_USR% -DHB_OS_WIN_32_USED -DPG_DIAG_INTERNAL_POSITION rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -60,3 +67,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat index 5cabbb2fea..7f4932d9f8 100644 --- a/harbour/contrib/rdd_ads/make_b32.bat +++ b/harbour/contrib/rdd_ads/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -56,3 +63,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/rdd_ads/make_vc.bat b/harbour/contrib/rdd_ads/make_vc.bat index efa08b7875..9d446317c1 100644 --- a/harbour/contrib/rdd_ads/make_vc.bat +++ b/harbour/contrib/rdd_ads/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -64,3 +71,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/samples/make_b32.bat b/harbour/contrib/samples/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/samples/make_b32.bat +++ b/harbour/contrib/samples/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/samples/make_vc.bat b/harbour/contrib/samples/make_vc.bat index 96eca5a7e9..0709c7b924 100644 --- a/harbour/contrib/samples/make_vc.bat +++ b/harbour/contrib/samples/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/tip/make_b32.bat b/harbour/contrib/tip/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/tip/make_b32.bat +++ b/harbour/contrib/tip/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/tip/make_vc.bat b/harbour/contrib/tip/make_vc.bat index bf8f375a9a..2ab08989e6 100644 --- a/harbour/contrib/tip/make_vc.bat +++ b/harbour/contrib/tip/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/win32/make_b32.bat b/harbour/contrib/win32/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/win32/make_b32.bat +++ b/harbour/contrib/win32/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/win32/make_vc.bat b/harbour/contrib/win32/make_vc.bat index bf8f375a9a..2ab08989e6 100644 --- a/harbour/contrib/win32/make_vc.bat +++ b/harbour/contrib/win32/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/xhb/make_b32.bat b/harbour/contrib/xhb/make_b32.bat index e2eeba3252..fe7a397dad 100644 --- a/harbour/contrib/xhb/make_b32.bat +++ b/harbour/contrib/xhb/make_b32.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/contrib/xhb/make_vc.bat b/harbour/contrib/xhb/make_vc.bat index bf8f375a9a..2ab08989e6 100644 --- a/harbour/contrib/xhb/make_vc.bat +++ b/harbour/contrib/xhb/make_vc.bat @@ -21,6 +21,13 @@ set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -52,3 +59,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index 285da8d1cf..03c3b7965d 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -27,6 +27,13 @@ set HB_MAKEFILE=make_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -58,3 +65,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD% diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index 688994c075..03514c46b6 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -27,6 +27,13 @@ set HB_MAKEFILE=make_%HB_CC_NAME%.mak rem --------------------------------------------------------------- +rem Save the user value, force silent file overwrite with COPY +rem (not all Windows versions support the COPY /Y flag) +set HB_ORGENV_COPYCMD=%COPYCMD% +set COPYCMD=/Y + +rem --------------------------------------------------------------- + if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN @@ -58,3 +65,8 @@ if "%1" == "INSTALL" goto INSTALL goto EXIT :EXIT + +rem --------------------------------------------------------------- + +rem Restore user value +set COPYCMD=%HB_ORGENV_COPYCMD%