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 2007/12/21 12:45:35 UTC
svn commit: r606167 - in /httpd/httpd/branches/2.2.x: Makefile.win
docs/conf/httpd-win.conf
Author: wrowe
Date: Fri Dec 21 03:45:33 2007
New Revision: 606167
URL: http://svn.apache.org/viewvc?rev=606167&view=rev
Log:
Unplug win32 specific config, plug in build/installwinconf.awk
Backports: r606158
Removed:
httpd/httpd/branches/2.2.x/docs/conf/httpd-win.conf
Modified:
httpd/httpd/branches/2.2.x/Makefile.win
Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?rev=606167&r1=606166&r2=606167&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 21 03:45:33 2007
@@ -16,7 +16,9 @@
# INSTDIR \Apache22
# PORT 80
# SSLPORT 443
-# SERVERNAME localhost
+# DOMAINNAME example.com
+# SERVERNAME www.example.com
+# SERVERNAME admin@example.com
#
# ALL (unset) Includes additional modules for build testing
#
@@ -124,8 +126,14 @@
!IF "$(INSTDIR)" == ""
INSTDIR=\Apache22
!ENDIF
+!IF "$(DOMAINNAME)" == ""
+DOMAINNAME=example.com
+!ENDIF
!IF "$(SERVERNAME)" == ""
-SERVERNAME=localhost
+SERVERNAME=www.$(DOMAINNAME)
+!ENDIF
+!IF "$(SERVERADMIN)" == ""
+SERVERADMIN=admin@$(DOMAINNAME)
!ENDIF
!IF "$(PORT)" == ""
PORT=80
@@ -136,11 +144,13 @@
!IF "$(LONG)" == ""
!MESSAGE
-!MESSAGE INSTDIR = $(INSTDIR)
-!MESSAGE SERVERNAME = $(SERVERNAME)
-!MESSAGE PORT = $(PORT)
+!MESSAGE INSTDIR = $(INSTDIR)
+!MESSAGE DOMAINNAME = $(DOMAINNAME)
+!MESSAGE SERVERNAME = $(SERVERNAME)
+!MESSAGE SERVERADMIN = $(SERVERADMIN)
+!MESSAGE PORT = $(PORT)
!IF EXIST("srclib\openssl")
-!MESSAGE SSLPORT = $(SSLPORT)
+!MESSAGE SSLPORT = $(SSLPORT)
!ENDIF
!MESSAGE
!MESSAGE To change these options use 'nmake -f Makefile.win [option=value]'
@@ -548,6 +558,8 @@
-mkdir "$(INSTDIR)\cgi-bin"
-mkdir "$(INSTDIR)\conf"
-mkdir "$(INSTDIR)\conf\extra"
+ -mkdir "$(INSTDIR)\conf\original"
+ -mkdir "$(INSTDIR)\conf\original\extra"
-mkdir "$(INSTDIR)\error"
-mkdir "$(INSTDIR)\htdocs"
-mkdir "$(INSTDIR)\manual"
@@ -713,65 +725,10 @@
copy $(LONG)\libhttpd.lib "$(INSTDIR)\lib" <.y
copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\lib" <.y
copy modules\dav\main\$(LONG)\mod_dav.lib "$(INSTDIR)\lib" <.y
- echo Y >.y
for %f in ( charset.conv magic mime.types ) do ( \
- copy docs\conf\%f "$(INSTDIR)\conf\%f.default" <.y && \
- if not exist "$(INSTDIR)\conf\%f" \
- copy "$(INSTDIR)\conf\%f.default" "$(INSTDIR)\conf\%f" \
- )
- copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.conf.default" <.y
- -awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\httpd.conf.default"
- BEGIN {
- serverroot = ARGV[2];
- delete ARGV[2];
- gsub( /\\/, "/", serverroot );
- "cd" | getline root;
- gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
- }
- {
- gsub( /@@ServerRoot@@/, serverroot );
- gsub( /@@ServerName@@/, "$(SERVERNAME)" );
- gsub( /@@Port@@/, "$(PORT)" );
- print $$0;
- }
-<<
- if not exist "$(INSTDIR)\conf\httpd.conf" \
- copy "$(INSTDIR)\conf\httpd.conf.default" "$(INSTDIR)\conf\httpd.conf"
- for %f in ( docs\conf\extra\*.in ) do ( \
- copy %f "$(INSTDIR)\conf\extra\%~nf.default" <.y && \
- awk -f <<script.awk "docs/conf/extra/%~nf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\extra\%~nf.default" )
- BEGIN {
- serverroot = ARGV[2];
- delete ARGV[2];
- gsub( /\\/, "/", serverroot );
- "cd" | getline root;
- gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
- }
- {
- gsub( /SSLMutex file:@exp_runtimedir@\/ssl_mutex/, "SSLMutex default" );
- gsub( /@@ServerRoot@@/, serverroot );
- gsub( /@exp_cgidir@/, serverroot "/cgi-bin" );
- gsub( /@exp_sysconfdir@/, serverroot "/conf" );
- gsub( /@exp_errordir@/, serverroot "/error" );
- gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
- gsub( /@exp_iconsdir@/, serverroot "/icons" );
- gsub( /@exp_logfiledir@/, serverroot "/logs" );
- gsub( /@exp_runtimedir@/, serverroot "/logs" );
- gsub( /@exp_manualdir@/, serverroot "/manual" );
- gsub( /@rel_runtimedir@/, "logs" );
- gsub( /@rel_logfiledir@/, "logs" );
- gsub( /\/home\/\*\/public_html/, "\"C:/Documents and Settings/*/My Documents/My Website\"" );
- gsub( /UserDir public_html/, "UserDir \"My Documents/My Website\"" );
- gsub( /@@ServerName@@/, "$(SERVERNAME)" );
- gsub( /@@Port@@/, "$(PORT)" );
- gsub( /443/, "$(SSLPORT)" );
- print $$0;
- }
-<<
- for %f in ( docs\conf\extra\*.in ) do ( \
- if not exist "$(INSTDIR)\conf\extra\%~nf" \
- copy "$(INSTDIR)\conf\extra\%~nf.default" "$(INSTDIR)\conf\extra\%~nf" \
- )
+ copy docs\conf\%f "$(INSTDIR)\conf\original\%f" <.y )
+ awk -f build\installwinconf.awk $(DOMAINNAME) $(SERVERNAME) \
+ $(SERVERADMIN) $(PORT) $(SSLPORT) "$(INSTDIR) " docs/conf/
copy "support\dbmmanage.in" "$(INSTDIR)\bin\dbmmanage.pl"
-awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"
{ if ( $$0 ~ /^BEGIN \{ @AnyDBM_File::/ ) {