2006-11-29 23:30 UTC+0100 J. Lefebvre (jfl/at/mafact.com)

harbour/ChangeLog

@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2006-11-29 23:30 UTC+0100 J. Lefebvre (jfl/at/mafact.com)
+  * makefile.vc
+  * make_vc.bat
+    ! Fixed the COPY command to work on Windows-NT (/Y flag isn't supported)
+    * Sync. with makefile.bc & make_b32.bat.
+
 2006-11-28 16:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/Makefile
     + added hbcompdf.h and hbstdgen.ch

harbour/make_vc.bat

@@ -21,6 +21,11 @@ rem ---------------------------------------------------------------
 
 if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe
 
+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
@@ -71,3 +76,6 @@ rem ---------------------------------------------------------------
 rem ---------------------------------------------------------------
 
 :EXIT
+rem Restore user value
+set COPYCMD=%HB_ORGENV_COPYCMD%
+set HB_ORGENV_COPYCMD=

harbour/makefile.vc

@@ -974,12 +974,12 @@ $(OBJ_DIR)\harboury.c : $(HARBOUR_DIR)\harbour.y
 !else
 
 $(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc
-    copy /A /Y $** $@ >> inst_$(CC_DIRNAME).log
-    copy /A /Y $(**:.yyc=.yyh) $(@:.c=.h) >> inst_$(CC_DIRNAME).log
+    copy /A $** $@
+    copy /A $(**:.yyc=.yyh) $(@:.c=.h)
 
 $(OBJ_DIR)\harboury.c : $(HARBOUR_DIR)\harbour.yyc
-    copy /A /Y $** $@ >> inst_$(CC_DIRNAME).log
-    copy /A /Y $(**:.yyc=.yyh) $(@:.c=.h) >> inst_$(CC_DIRNAME).log
+    copy /A $** $@
+    copy /A $(**:.yyc=.yyh) $(@:.c=.h)
 
 !endif