You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2013/04/11 02:08:20 UTC
svn commit: r1466739 - /httpd/httpd/branches/2.2.x/build/installwinconf.awk
Author: fuankg
Date: Thu Apr 11 00:08:20 2013
New Revision: 1466739
URL: http://svn.apache.org/r1466739
Log:
install.log output tweaks; reduced path convertion.
Backport r1390511.
Submitted/backported by: fuankg
Reviewed by: druggeri, gsmith
Modified:
httpd/httpd/branches/2.2.x/build/installwinconf.awk
Modified: httpd/httpd/branches/2.2.x/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/installwinconf.awk?rev=1466739&r1=1466738&r2=1466739&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/installwinconf.awk (original)
+++ httpd/httpd/branches/2.2.x/build/installwinconf.awk Thu Apr 11 00:08:20 2013
@@ -46,12 +46,12 @@ BEGIN {
usertree = "C:/Documents and Settings";
}
- print "Installing Apache HTTP 2.0 server with" >tstfl;
+ print "Installing Apache HTTP Server 2.x with" >tstfl;
print " DomainName = " domainname >tstfl;
print " ServerName = " servername >tstfl;
print " ServerAdmin = " serveradmin >tstfl;
print " ServerPort = " serverport >tstfl;
- print " ServerSslPort = " serverport >tstfl;
+ print " ServerSslPort = " serversslport >tstfl;
print " ServerRoot = " serverroot >tstfl;
filelist["httpd.conf"] = "httpd.conf.in";
@@ -191,9 +191,9 @@ BEGIN {
if ( close(dstfl) >= 0 ) {
print "Rewrote " srcfl "\n to " dstfl > tstfl;
- gsub(/\//, "\\", srcfl);
if ( sourceroot != "docs/conf/" ) {
- if (system("del \"" srcfl "\"")) {
+ gsub(/\//, "\\", srcfl);
+ if (system("del 2>NUL \"" srcfl "\"")) {
print "Failed to remove " srcfl > tstfl;
} else {
print "Successfully removed " srcfl > tstfl;
@@ -228,7 +228,7 @@ BEGIN {
if ( sourceroot != "docs/conf/" ) {
srcfl = confdefault "installwinconf.awk";
gsub(/\//, "\\", srcfl);
- if (system("del \"" srcfl "\"")) {
+ if (system("del 2>NUL \"" srcfl "\"")) {
print "Failed to remove " srcfl > tstfl;
} else {
print "Successfully removed " srcfl > tstfl;