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...@apache.org on 2005/04/07 21:19:59 UTC
svn commit: r160441 - httpd/httpd/trunk/httpd.dsp
Author: wrowe
Date: Thu Apr 7 12:19:58 2005
New Revision: 160441
URL: http://svn.apache.org/viewcvs?view=rev&rev=160441
Log:
Catch up with Apache.exe->httpd.exe rename; it seems svn rn can't
be combined with svn commit and source changes.
Modified:
httpd/httpd/trunk/httpd.dsp
Modified: httpd/httpd/trunk/httpd.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/httpd.dsp?view=diff&r1=160440&r2=160441
==============================================================================
--- httpd/httpd/trunk/httpd.dsp (original)
+++ httpd/httpd/trunk/httpd.dsp Thu Apr 7 12:19:58 2005
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="Apache" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="httpd" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Apache - Win32 Release
+CFG=httpd - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "Apache.mak".
+!MESSAGE NMAKE /f "httpd.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Apache.mak" CFG="Apache - Win32 Release"
+!MESSAGE NMAKE /f "httpd.mak" CFG="httpd - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Apache - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Apache - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "httpd - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "httpd - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Apache - Win32 Release"
+!IF "$(CFG)" == "httpd - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Release\Apache" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Release\httpd" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -52,7 +52,7 @@
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /stack:0x40000 /subsystem:console /debug /machine:I386 /opt:ref
-!ELSEIF "$(CFG)" == "Apache - Win32 Debug"
+!ELSEIF "$(CFG)" == "httpd - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -66,7 +66,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\Apache" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\httpd" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -81,15 +81,15 @@
# Begin Target
-# Name "Apache - Win32 Release"
-# Name "Apache - Win32 Debug"
+# Name "httpd - Win32 Release"
+# Name "httpd - Win32 Debug"
# Begin Source File
SOURCE=.\build\win32\Apache.ico
# End Source File
# Begin Source File
-SOURCE=.\build\win32\Apache.rc
+SOURCE=.\build\win32\httpd.rc
# End Source File
# Begin Source File
@@ -99,25 +99,25 @@
SOURCE=.\build\win32\win32ver.awk
-!IF "$(CFG)" == "Apache - Win32 Release"
+!IF "$(CFG)" == "httpd - Win32 Release"
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Creating Version Resource
InputPath=.\build\win32\win32ver.awk
-".\build\win32\Apache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ./build/win32/win32ver.awk Apache.exe "Apache HTTP Server" ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc
+".\build\win32\httpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ./build/win32/win32ver.awk httpd.exe "Apache HTTP Server" ./include/ap_release.h icon=apache.ico > .\build\win32\httpd.rc
# End Custom Build
-!ELSEIF "$(CFG)" == "Apache - Win32 Debug"
+!ELSEIF "$(CFG)" == "httpd - Win32 Debug"
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Creating Version Resource
InputPath=.\build\win32\win32ver.awk
-".\build\win32\Apache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ./build/win32/win32ver.awk Apache.exe "Apache HTTP Server" ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc
+".\build\win32\httpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ./build/win32/win32ver.awk httpd.exe "Apache HTTP Server" ./include/ap_release.h icon=apache.ico > .\build\win32\httpd.rc
# End Custom Build
Re: svn commit: r160441 - httpd/httpd/trunk/httpd.dsp
Posted by Paul Querna <ch...@force-elite.com>.
William A. Rowe, Jr. wrote:
> At 03:39 PM 4/7/2005, you wrote:
>
>>wrowe@apache.org wrote:
>>
>>>Log:
>>> Catch up with Apache.exe->httpd.exe rename; it seems svn rn can't
>>> be combined with svn commit and source changes.
>>
>>Can you please save these comments for the dev@ list and not
>>put them in the log message? What exactly didn't go as you
>>expected?
>
>
> Was informational. Using version 1.0.5 (r9954) - did something
> like
>
> svn mv Apache.dsp httpd.dsp (local move)
> notepad httpd.dsp (edit strings)
> svn commit Apache.dsp httpd.dsp
>
> It correctly removed Apache.dsp, added httpd.dsp, but set it to
> the previous state of Apache.dsp. Guess I wasn't supposed to do
> that :)
FWIW, Editing after a move works fine for me on OS X. I did it several
times last night for the imap rename. I am using 1.1.1, but I am pretty
sure this worked before 1.0.0.
Re: svn commit: r160441 - httpd/httpd/trunk/httpd.dsp
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
At 03:39 PM 4/7/2005, you wrote:
>wrowe@apache.org wrote:
>>Log:
>> Catch up with Apache.exe->httpd.exe rename; it seems svn rn can't
>> be combined with svn commit and source changes.
>
>Can you please save these comments for the dev@ list and not
>put them in the log message? What exactly didn't go as you
>expected?
Was informational. Using version 1.0.5 (r9954) - did something
like
svn mv Apache.dsp httpd.dsp (local move)
notepad httpd.dsp (edit strings)
svn commit Apache.dsp httpd.dsp
It correctly removed Apache.dsp, added httpd.dsp, but set it to
the previous state of Apache.dsp. Guess I wasn't supposed to do
that :)
Re: svn commit: r160441 - httpd/httpd/trunk/httpd.dsp
Posted by Sander Striker <st...@apache.org>.
wrowe@apache.org wrote:
> Author: wrowe
> Date: Thu Apr 7 12:19:58 2005
> New Revision: 160441
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=160441
> Log:
>
> Catch up with Apache.exe->httpd.exe rename; it seems svn rn can't
> be combined with svn commit and source changes.
Can you please save these comments for the dev@ list and not
put them in the log message? What exactly didn't go as you
expected?
Sander