[jbossnative-commits] JBoss Native SVN: r1589 - in trunk/httpd/httpd-2.2: installer and 1 other directory.

Author: mladen.turk(a)jboss.com Date: 2008-05-02 08:13:01 -0400 (Fri, 02 May 2008) New Revision: 1589 Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc trunk/httpd/httpd-2.2/installer/installconf.awk trunk/httpd/httpd-2.2/installer/installconf.bat Log: Allow installconf to be run by dbl-click Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc =================================================================== --- trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-05-02 11:59:28 UTC (rev 1588) +++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-05-02 12:13:01 UTC (rev 1589) @@ -71,6 +71,7 @@ $(PREFIX)\error\include\~ \ $(PREFIX)\conf\extra\~ \ $(PREFIX)\conf\default\extra\~ + $(PREFIX)\conf\default\extra\~ $(DISTSUBDIRS): @if not exist "$(@D)\$(NULL)" mkdir $(@D) Modified: trunk/httpd/httpd-2.2/installer/installconf.awk =================================================================== --- trunk/httpd/httpd-2.2/installer/installconf.awk 2008-05-02 11:59:28 UTC (rev 1588) +++ trunk/httpd/httpd-2.2/installer/installconf.awk 2008-05-02 12:13:01 UTC (rev 1589) @@ -33,17 +33,16 @@ gsub( /\\/, "/", serverroot ); gsub( /[ \/]+$/, "", serverroot ); - tstfl = serverroot "/logs/install.log" confroot = serverroot "/conf/"; confdefault = confroot "default/"; - print "Installing Apache HTTP 2.2 server with" >tstfl; - print " DomainName : " domainname >tstfl; - print " ServerName : " servername >tstfl; - print " ServerAdmin : " serveradmin >tstfl; - print " ServerPort : " serverport >tstfl; - print " ServerSslPort : " serverport >tstfl; - print " ServerRoot : " serverroot >tstfl; + print "Installing Apache HTTP 2.2 server with"; + print " DomainName : " domainname; + print " ServerName : " servername; + print " ServerAdmin : " serveradmin; + print " ServerPort : " serverport; + print " ServerSslPort : " serverport; + print " ServerRoot : " serverroot; filelist["httpd.conf"] = "httpd.conf.in"; filelist["extra/httpd-autoindex.conf"] = "extra/httpd-autoindex.conf.in"; @@ -168,17 +167,17 @@ close(srcfl); if ( close(dstfl) >= 0 ) { - print "Rewrote " srcfl "\n to " dstfl > tstfl; + print "Rewrote " srcfl "\n to " dstfl; if (WINDOWS) { gsub(/\//, "\\", srcfl); } if (system(delcmd " \"" srcfl "\"")) { - print "Failed to remove " srcfl > tstfl; + print "Failed to remove " srcfl; } else { - print "Successfully removed " srcfl > tstfl; + print "Successfully removed " srcfl; } } else { - print "Failed to rewrite " srcfl "\n to " dstfl > tstfl; + print "Failed to rewrite " srcfl "\n to " dstfl; } } @@ -193,9 +192,9 @@ while ( ( getline < srcfl ) > 0 ) { print $0 > dstfl; } - print "Duplicated " srcfl "\n to " dstfl > tstfl; + print "Duplicated " srcfl "\n to " dstfl; } else { - print "Existing file " dstfl " preserved" > tstfl; + print "Existing file " dstfl " preserved"; } close(srcfl); close(dstfl); Modified: trunk/httpd/httpd-2.2/installer/installconf.bat =================================================================== --- trunk/httpd/httpd-2.2/installer/installconf.bat 2008-05-02 11:59:28 UTC (rev 1588) +++ trunk/httpd/httpd-2.2/installer/installconf.bat 2008-05-02 12:13:01 UTC (rev 1589) @@ -56,4 +56,5 @@ nawk.exe -f installconf.awk -v WINDOWS=1 %HTTPD_DOMAINNAME% %HTTPD_SERVERNAME% %HTTPD_ADMIN% %HTTPD_PORT% %HTTPD_SSLPORT% "%HTTPD_ROOT%" +if "x%NOPAUSE%" == "x" pause :cmdEnd