You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/12/20 17:26:48 UTC
cvs commit: apache-1.3/src/os/win32/win9xconhook .cvsignore Win9xConHook.c Win9xConHook.def Win9xConHook.dsp Win9xConHook.h Win9xConHook.mak
wrowe 00/12/20 08:26:46
Modified: src makefile.win Apache.dsw
Removed: src/os/win32/win9xconhook .cvsignore Win9xConHook.c
Win9xConHook.def Win9xConHook.dsp Win9xConHook.h
Win9xConHook.mak
Log:
move win9xconhook into the src/os/win32 tree rather than it's own branch.
fix xcopy args from /[s]dy to [/s ]/d /q for some win32 platforms.
Revision Changes Path
1.15 +11 -13 apache-1.3/src/makefile.win
Index: makefile.win
===================================================================
RCS file: /home/cvs/apache-1.3/src/makefile.win,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- makefile.win 2000/12/20 00:19:45 1.14
+++ makefile.win 2000/12/20 16:26:34 1.15
@@ -63,10 +63,8 @@
# echo LONG $(LONG) SHORT $(SHORT) x
cd os\win32
$(MAKE) $(MAKEOPT) -f ApacheOS.mak CFG="ApacheOS - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
- cd os\win32\win9xconhook
$(MAKE) $(MAKEOPT) -f Win9xConHook.mak CFG="Win9xConHook - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..\..
+ cd ..\..
cd regex
$(MAKE) $(MAKEOPT) -f regex.mak CFG="regex - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..
@@ -128,7 +126,7 @@
-mkdir "$(INSTDIR)\proxy"
copy $(LONG)\Apache.exe "$(INSTDIR)"
copy $(LONG)\ApacheCore.dll "$(INSTDIR)"
- copy os\win32\win9xconhook\$(LONG)\Win9xConHook.dll "$(INSTDIR)"
+ copy os\win32\$(LONG)\Win9xConHook.dll "$(INSTDIR)"
copy lib\expat-lite\$(LONG)\xmltok.dll "$(INSTDIR)"
copy lib\expat-lite\$(LONG)\xmlparse.dll "$(INSTDIR)"
copy os\win32\$(LONG)\ApacheModuleStatus.dll "$(INSTDIR)\modules"
@@ -148,22 +146,22 @@
copy support\$(LONG)\htdigest.exe "$(INSTDIR)\bin"
copy support\$(LONG)\logresolve.exe "$(INSTDIR)\bin"
copy support\$(LONG)\rotatelogs.exe "$(INSTDIR)\bin"
- -xcopy ..\htdocs "$(INSTDIR)\htdocs" /sdy
+ -xcopy ..\htdocs "$(INSTDIR)\htdocs" /s /d /q
copy ..\cgi-bin\printenv "$(INSTDIR)\cgi-bin\printenv.pl"
- xcopy include\*.h "$(INSTDIR)\include" /dy
- xcopy os\win32\*.h "$(INSTDIR)\include" /dy
- xcopy regex\*.h "$(INSTDIR)\include\regex" /dy
- xcopy lib\sdbm\*.h "$(INSTDIR)\include\sdbm" /dy
- xcopy lib\expat-lite\*.h "$(INSTDIR)\include\xml" /dy
- -xcopy ..\icons "$(INSTDIR)\icons" /sdy
+ xcopy include\*.h "$(INSTDIR)\include" /d /q
+ xcopy os\win32\*.h "$(INSTDIR)\include" /d /q
+ xcopy regex\*.h "$(INSTDIR)\include\regex" /d /q
+ xcopy lib\sdbm\*.h "$(INSTDIR)\include\sdbm" /d /q
+ xcopy lib\expat-lite\*.h "$(INSTDIR)\include\xml" /d /q
+ -xcopy ..\icons "$(INSTDIR)\icons" /s /d /q
copy ap\Lib$(SHORT)\ap.lib "$(INSTDIR)\lib"
copy os\win32\Lib$(SHORT)\ApacheOS.lib "$(INSTDIR)\lib"
copy regex\Lib$(SHORT)\regex.lib "$(INSTDIR)\lib"
copy lib\sdbm\Lib$(SHORT)\sdbm.lib "$(INSTDIR)\lib"
copy $(LONG)\ApacheCore.exp "$(INSTDIR)\libexec"
copy $(LONG)\ApacheCore.lib "$(INSTDIR)\libexec"
- copy os\win32\win9xconhook\$(LONG)\Win9xConHook.exp "$(INSTDIR)\libexec"
- copy os\win32\win9xconhook\$(LONG)\Win9xConHook.lib "$(INSTDIR)\libexec"
+ copy os\win32\$(LONG)\Win9xConHook.exp "$(INSTDIR)\libexec"
+ copy os\win32\$(LONG)\Win9xConHook.lib "$(INSTDIR)\libexec"
copy lib\expat-lite\$(LONG)\xmltok.exp "$(INSTDIR)\libexec"
copy lib\expat-lite\$(LONG)\xmltok.lib "$(INSTDIR)\libexec"
copy lib\expat-lite\$(LONG)\xmlparse.exp "$(INSTDIR)\libexec"
1.6 +1 -1 apache-1.3/src/Apache.dsw
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/apache-1.3/src/Apache.dsw,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Apache.dsw 2000/12/19 23:21:19 1.5
+++ Apache.dsw 2000/12/20 16:26:35 1.6
@@ -333,7 +333,7 @@
###############################################################################
-Project: "Win9xConHook"=".\os\win32\win9xconhook\Win9xConHook.dsp" - Package Owner=<4>
+Project: "Win9xConHook"=".\os\win32\Win9xConHook.dsp" - Package Owner=<4>
Package=<5>
{{{
RE: cvs commit: apache-1.3/src/os/win32/win9xconhook .cvsignore Win9xConHook.c Win9xConHook.def Win9xConHook.dsp Win9xConHook.h Win9xConHook.mak
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Skip it... NT4 doesn't accept it. It seems NT always overwrites without
querying the user anyway. I'm looking for some test that gets us by
this problem now.
> -----Original Message-----
> From: William A. Rowe, Jr. [mailto:wrowe@rowe-clan.net]
> Sent: Wednesday, December 20, 2000 11:08 AM
> To: new-httpd@apache.org
> Subject: RE: cvs commit: apache-1.3/src/os/win32/win9xconhook
> .cvsignore
> Win9xConHook.c Win9xConHook.def Win9xConHook.dsp Win9xConHook.h
> Win9xConHook.mak
>
>
> This is messed up...
>
> > wrowe 00/12/20 08:26:46
> > Log:
> > fix xcopy args from /[s]dy to [/s ]/d /q for some win32
> platforms.
>
> Win2K won't accept /d /q as an override not to prompt the user.
>
> Bill, as you reported the problem, would you try this exact syntax;
>
> xcopy /Y src dst /d
>
> and let me know what your NT4 says? I know it isn't
> documented, but it's
> pretty standard.
>
RE: cvs commit: apache-1.3/src/os/win32/win9xconhook .cvsignore Win9xConHook.c Win9xConHook.def Win9xConHook.dsp Win9xConHook.h Win9xConHook.mak
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
This is messed up...
> wrowe 00/12/20 08:26:46
> Log:
> fix xcopy args from /[s]dy to [/s ]/d /q for some win32 platforms.
Win2K won't accept /d /q as an override not to prompt the user.
Bill, as you reported the problem, would you try this exact syntax;
xcopy /Y src dst /d
and let me know what your NT4 says? I know it isn't documented, but it's
pretty standard.