Author: mladen.turk(a)jboss.com
Date: 2008-05-02 01:03:25 -0400 (Fri, 02 May 2008)
New Revision: 1573
Added:
trunk/httpd/httpd-2.2/installer/install.bat
Modified:
trunk/httpd/httpd-2.2/installer/installconf.awk
Log:
Fix install awk script
Added: trunk/httpd/httpd-2.2/installer/install.bat
===================================================================
--- trunk/httpd/httpd-2.2/installer/install.bat (rev 0)
+++ trunk/httpd/httpd-2.2/installer/install.bat 2008-05-02 05:03:25 UTC (rev 1573)
@@ -0,0 +1,59 @@
+@echo off
+REM Copyright(c) 2007 Red Hat Middleware, LLC,
+REM and individual contributors as indicated by the @authors tag.
+REM See the copyright.txt in the distribution for a
+REM full listing of individual contributors.
+REM
+REM This library is free software; you can redistribute it and/or
+REM modify it under the terms of the GNU Lesser General Public
+REM License as published by the Free Software Foundation; either
+REM version 2 of the License, or (at your option) any later version.
+REM
+REM This library is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+REM Lesser General Public License for more details.
+REM
+REM You should have received a copy of the GNU Lesser General Public
+REM License along with this library in the file COPYING.LIB;
+REM if not, write to the Free Software Foundation, Inc.,
+REM 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+REM
+REM @author Mladen Turk
+REM
+
+
+@if not "%ECHO%" == "" echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+set "DIRNAME=%~dp0%"
+set "PROGNAME=%~nx0%"
+) else (
+echo Detected uncompatible Windows version.
+goto cmdEnd
+)
+
+set LOCAL_DIR=%CD%
+pushd %DIRNAME%..
+set INSTALL_HOME=%CD%
+popd
+
+echo.
+echo Running : %PROGNAME% $LastChangedDate: 2008-04-21 11:25:11 +0200 (Mon, 21 Apr 2008)
$
+echo.
+echo Started : %DATE% %TIME%
+echo Params : %*
+echo.
+
+set HTTPD_SERVERNAME=localhost
+set HTTPD_DOMAINNAME=localdomain
+set HTTPD_PORT=8080
+set HTTPD_SSLPORT=8443
+
+set HTTPD_ADMIN=%USERNAME%(a)%HTTPD_SERVERNAME%.%HTTPD_DOMAINNAME%
+set HTTPD_ROOT=%INSTALL_HOME%
+
+
+nawk.exe -f installconf.awk -v WINDOWS=1 %HTTPD_DOMAINNAME% %HTTPD_SERVERNAME%
%HTTPD_ADMIN% %HTTPD_PORT% %HTTPD_SSLPORT% "%HTTPD_ROOT%"
+:cmdEnd
Property changes on: trunk/httpd/httpd-2.2/installer/install.bat
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/httpd/httpd-2.2/installer/installconf.awk
===================================================================
--- trunk/httpd/httpd-2.2/installer/installconf.awk 2008-05-02 05:00:38 UTC (rev 1572)
+++ trunk/httpd/httpd-2.2/installer/installconf.awk 2008-05-02 05:03:25 UTC (rev 1573)
@@ -1,4 +1,4 @@
-#
+#/*
# InstallConf.awk Apache HTTP 2.2 script to rewrite the @@ServerRoot@@
# tags in httpd-win.conf to httpd.default.conf - then duplicate the
# conf files if they don't already exist.
@@ -10,7 +10,7 @@
# escape backslashes in the assignment. Note also, a trailing space is
# required for paths, or the trailing quote following the backslash is
# escaped, rather than parsed.
-#
+#*/
BEGIN {
domainname = ARGV[1];
servername = ARGV[2];
@@ -46,22 +46,95 @@
print " ServerRoot : " serverroot >tstfl;
filelist["httpd.conf"] = "httpd.conf.in";
- filelist["httpd-autoindex.conf"] = "httpd-autoindex.conf.in";
- filelist["httpd-dav.conf"] = "httpd-dav.conf.in";
- filelist["httpd-default.conf"] = "httpd-default.conf.in";
- filelist["httpd-info.conf"] = "httpd-info.conf.in";
- filelist["httpd-languages.conf"] = "httpd-languages.conf.in";
- filelist["httpd-manual.conf"] = "httpd-manual.conf.in";
- filelist["httpd-mpm.conf"] = "httpd-mpm.conf.in";
- filelist["httpd-multilang-errordoc.conf"] =
"httpd-multilang-errordoc.conf.in";
- filelist["httpd-ssl.conf"] = "httpd-ssl.conf.in";
- filelist["httpd-userdir.conf"] = "httpd-userdir.conf.in";
- filelist["httpd-vhosts.conf"] = "httpd-vhosts.conf.in";
+ filelist["extra/httpd-autoindex.conf"] =
"extra/httpd-autoindex.conf.in";
+ filelist["extra/httpd-dav.conf"] = "extra/httpd-dav.conf.in";
+ filelist["extra/httpd-default.conf"] =
"extra/httpd-default.conf.in";
+ filelist["extra/httpd-info.conf"] = "extra/httpd-info.conf.in";
+ filelist["extra/httpd-languages.conf"] =
"extra/httpd-languages.conf.in";
+ filelist["extra/httpd-manual.conf"] =
"extra/httpd-manual.conf.in";
+ filelist["extra/httpd-mpm.conf"] = "extra/httpd-mpm.conf.in";
+ filelist["extra/httpd-multilang-errordoc.conf"] =
"extra/httpd-multilang-errordoc.conf.in";
+ filelist["extra/httpd-ssl.conf"] = "extra/httpd-ssl.conf.in";
+ filelist["extra/httpd-userdir.conf"] =
"extra/httpd-userdir.conf.in";
+ filelist["extra/httpd-vhosts.conf"] =
"extra/httpd-vhosts.conf.in";
for ( conffile in filelist ) {
srcfl = confdefault filelist[conffile];
dstfl = confdefault conffile;
+
while ( ( getline < srcfl ) > 0 ) {
+ if (WINDOWS) {
+ if ( /@@LoadModule@@/ ) {
+ print "LoadModule actions_module modules/mod_actions.so" >
dstfl;
+ print "LoadModule alias_module modules/mod_alias.so" > dstfl;
+ print "LoadModule asis_module modules/mod_asis.so" > dstfl;
+ print "LoadModule auth_basic_module modules/mod_auth_basic.so" >
dstfl;
+ print "#LoadModule auth_digest_module modules/mod_auth_digest.so"
> dstfl;
+ print "#LoadModule authn_alias_module modules/mod_authn_alias.so"
> dstfl;
+ print "#LoadModule authn_anon_module modules/mod_authn_anon.so" >
dstfl;
+ print "#LoadModule authn_dbd_module modules/mod_authn_dbd.so" >
dstfl;
+ print "#LoadModule authn_dbm_module modules/mod_authn_dbm.so" >
dstfl;
+ print "LoadModule authn_default_module modules/mod_authn_default.so"
> dstfl;
+ print "LoadModule authn_file_module modules/mod_authn_file.so" >
dstfl;
+ print "#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so"
> dstfl;
+ print "#LoadModule authz_dbm_module modules/mod_authz_dbm.so" >
dstfl;
+ print "LoadModule authz_default_module modules/mod_authz_default.so"
> dstfl;
+ print "LoadModule authz_groupfile_module
modules/mod_authz_groupfile.so" > dstfl;
+ print "LoadModule authz_host_module modules/mod_authz_host.so" >
dstfl;
+ print "#LoadModule authz_owner_module modules/mod_authz_owner.so"
> dstfl;
+ print "LoadModule authz_user_module modules/mod_authz_user.so" >
dstfl;
+ print "LoadModule autoindex_module modules/mod_autoindex.so" >
dstfl;
+ print "#LoadModule cache_module modules/mod_cache.so" > dstfl;
+ print "#LoadModule cern_meta_module modules/mod_cern_meta.so" >
dstfl;
+ print "LoadModule cgi_module modules/mod_cgi.so" > dstfl;
+ print "#LoadModule charset_lite_module modules/mod_charset_lite.so"
> dstfl;
+ print "#LoadModule dav_module modules/mod_dav.so" > dstfl;
+ print "#LoadModule dav_fs_module modules/mod_dav_fs.so" > dstfl;
+ print "#LoadModule dav_lock_module modules/mod_dav_lock.so" >
dstfl;
+ print "#LoadModule dbd_module modules/mod_dbd.so" > dstfl;
+ print "#LoadModule deflate_module modules/mod_deflate.so" >
dstfl;
+ print "LoadModule dir_module modules/mod_dir.so" > dstfl;
+ print "#LoadModule disk_cache_module modules/mod_disk_cache.so" >
dstfl;
+ print "#LoadModule dumpio_module modules/mod_dumpio.so" > dstfl;
+ print "LoadModule env_module modules/mod_env.so" > dstfl;
+ print "#LoadModule expires_module modules/mod_expires.so" >
dstfl;
+ print "#LoadModule ext_filter_module modules/mod_ext_filter.so" >
dstfl;
+ print "#LoadModule file_cache_module modules/mod_file_cache.so" >
dstfl;
+ print "#LoadModule filter_module modules/mod_filter.so" > dstfl;
+ print "#LoadModule headers_module modules/mod_headers.so" >
dstfl;
+ print "#LoadModule ident_module modules/mod_ident.so" > dstfl;
+ print "#LoadModule imagemap_module modules/mod_imagemap.so" >
dstfl;
+ print "LoadModule include_module modules/mod_include.so" >
dstfl;
+ print "#LoadModule info_module modules/mod_info.so" > dstfl;
+ print "LoadModule isapi_module modules/mod_isapi.so" > dstfl;
+ print "#LoadModule ldap_module modules/mod_ldap.so" > dstfl;
+ print "#LoadModule logio_module modules/mod_logio.so" > dstfl;
+ print "LoadModule log_config_module modules/mod_log_config.so" >
dstfl;
+ print "#LoadModule log_forensic_module modules/mod_log_forensic.so"
> dstfl;
+ print "#LoadModule mem_cache_module modules/mod_mem_cache.so" >
dstfl;
+ print "LoadModule mime_module modules/mod_mime.so" > dstfl;
+ print "#LoadModule mime_magic_module modules/mod_mime_magic.so" >
dstfl;
+ print "LoadModule negotiation_module modules/mod_negotiation.so"
> dstfl;
+ print "#LoadModule proxy_module modules/mod_proxy.so" > dstfl;
+ print "#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so" >
dstfl;
+ print "#LoadModule proxy_balancer_module
modules/mod_proxy_balancer.so" > dstfl;
+ print "#LoadModule proxy_connect_module
modules/mod_proxy_connect.so" > dstfl;
+ print "#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so" >
dstfl;
+ print "#LoadModule proxy_http_module modules/mod_proxy_http.so" >
dstfl;
+ print "#LoadModule rewrite_module modules/mod_rewrite.so" >
dstfl;
+ print "LoadModule setenvif_module modules/mod_setenvif.so" >
dstfl;
+ print "#LoadModule speling_module modules/mod_speling.so" >
dstfl;
+ print "#LoadModule ssl_module modules/mod_ssl.so" > dstfl;
+ print "#LoadModule status_module modules/mod_status.so" > dstfl;
+ print "#LoadModule substitute_module modules/mod_substitute.so" >
dstfl;
+ print "#LoadModule unique_id_module modules/mod_unique_id.so" >
dstfl;
+ print "#LoadModule userdir_module modules/mod_userdir.so" >
dstfl;
+ print "#LoadModule usertrack_module modules/mod_usertrack.so" >
dstfl;
+ print "#LoadModule version_module modules/mod_version.so" >
dstfl;
+ print "#LoadModule vhost_alias_module modules/mod_vhost_alias.so"
> dstfl;
+ continue;
+ }
+ }
gsub( /@@ServerRoot@@/, serverroot );
gsub( /@exp_cgidir@/, serverroot "/cgi-bin" );
gsub( /@exp_sysconfdir@/, serverroot "/conf" );
@@ -73,6 +146,7 @@
gsub( /@exp_manualdir@/, serverroot "/manual" );
gsub( /@rel_runtimedir@/, "logs" );
gsub( /@rel_logfiledir@/, "logs" );
+ gsub( /@rel_sysconfdir@/, "conf" );
if (WINDOWS) {
gsub( /SSLMutex file:@exp_runtimedir@\/ssl_mutex/, "SSLMutex
default" );
gsub( /\/home\/\*\/public_html/, "\"C:/Documents and Settings/*/My
Documents/My Website\"" );
@@ -106,17 +180,15 @@
} else {
print "Failed to rewrite " srcfl "\n to " dstfl > tstfl;
}
- filelist[conffile] = "extra/";
}
- filelist["httpd.conf"] = "";
- filelist["charset.conv"] = "";
- filelist["magic"] = "";
- filelist["mime.types"] = "";
+ filelist["charset.conv"] = "charset.conv";
+ filelist["magic"] = "magic";
+ filelist["mime.types"] = "mime.types";
for ( conffile in filelist ) {
srcfl = confdefault conffile;
- dstfl = confroot filelist[conffile] conffile;
+ dstfl = confroot conffile;
if ( ( getline < dstfl ) < 0 ) {
while ( ( getline < srcfl ) > 0 ) {
print $0 > dstfl;
@@ -129,14 +201,5 @@
close(dstfl);
}
- srcfl = confdefault "installconf.awk";
- if (WINDOWS) {
- gsub(/\//, "\\", srcfl);
- }
- if (system(delcmd " \"" srcfl "\"")) {
- print "Failed to remove " srcfl > tstfl;
- } else {
- print "Successfully removed " srcfl > tstfl;
- }
close(tstfl);
}
Show replies by date