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/03/31 21:02:44 UTC
svn commit: r159626 - in httpd/httpd/trunk: Apache.dsp Apache.dsw Makefile.win httpd.dsp

Author: wrowe
Date: Thu Mar 31 11:02:44 2005
New Revision: 159626

URL: http://svn.apache.org/viewcvs?view=rev&rev=159626
Log:

  Apache.exe -> httpd.exe - per discussion on dev@httpd
  to make Win32 consistent with Unix, and as importantly,
  quitclaim the 'Apache HTTP Server' project's claim on
  something not in the spirit of the greater Foundation.

Added:
    httpd/httpd/trunk/httpd.dsp
      - copied unchanged from r159614, httpd/httpd/trunk/Apache.dsp
Removed:
    httpd/httpd/trunk/Apache.dsp
Modified:
    httpd/httpd/trunk/Apache.dsw
    httpd/httpd/trunk/Makefile.win

Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Apache.dsw?view=diff&r1=159625&r2=159626
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Thu Mar 31 11:02:44 2005
@@ -3,7 +3,7 @@
 
 ###############################################################################
 
-Project: "Apache"=.\Apache.dsp - Package Owner=<4>
+Project: "httpd"=".\httpd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -51,7 +51,7 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name Apache
+    Project_Dep_Name httpd
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name ApacheMonitor

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.win?view=diff&r1=159625&r2=159626
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Thu Mar 31 11:02:44 2005
@@ -160,7 +160,7 @@
 y
 <<
 
-!IF EXIST("Apache.mak")
+!IF EXIST("httpd.mak")
 
 _cleanr:
 	$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build
@@ -207,7 +207,7 @@
 	 $(MAKE) $(MAKEOPT) -f gen_test_char.mak   CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..
 	 $(MAKE) $(MAKEOPT) -f libhttpd.mak        CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f Apache.mak          CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	 $(MAKE) $(MAKEOPT) -f httpd.mak           CFG="httpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 # build ldap prior to authnz_ldap
 	cd modules\ldap
 	 $(MAKE) $(MAKEOPT) -f mod_ldap.mak        CFG="mod_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -373,7 +373,7 @@
 
 
 _copybin:
-	copy $(LONG)\Apache.$(src_exe) 				"$(inst_exe)" <.y
+	copy $(LONG)\httpd.$(src_exe) 				"$(inst_exe)" <.y
 	copy $(LONG)\libhttpd.$(src_dll) 			"$(inst_dll)" <.y
 	copy srclib\apr\$(LONG)\libapr-1.$(src_dll) 		"$(inst_dll)" <.y
 	copy srclib\apr-iconv\$(LONG)\libapriconv-1.$(src_dll) 	"$(inst_dll)" <.y