httpd-win32-msi-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r577178 - /httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
Date Wed, 19 Sep 2007 07:09:48 GMT
Author: wrowe
Date: Wed Sep 19 00:09:47 2007
New Revision: 577178

URL: http://svn.apache.org/viewvc?rev=577178&view=rev
Log:
Bump for 2.2.6.

httpd.exe -k {something} defaults to Apache2.2 service, use this
as the service name.  Default value of -n and the installer really
*must* agree on this.

Modified:
    httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism

Modified: httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism?rev=577178&r1=577177&r2=577178&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Wed Sep 19 00:09:47 2007
@@ -1206,7 +1206,7 @@
 		<col def="I4">ISAttributes</col>
 		<col def="S255">ISFolderName</col>
 		<row><td>ALLUSERSPROFILE</td><td>TARGETDIR</td><td>.:ALLUSE~1|All
Users</td><td/><td>0</td><td/></row>
-		<row><td>APACHE2.2</td><td>INSTALLDIR</td><td>APACHE~1|Apache2.2</td><td/><td>0</td><td/></row>
+		<row><td>APACHE2.2</td><td>INSTALLDIR</td><td>Apache2.2</td><td/><td>0</td><td/></row>
 		<row><td>APACHEBINDIR</td><td>INSTALLDIR</td><td>bin</td><td/><td/><td/></row>
 		<row><td>APACHECGIDIR</td><td>INSTALLDIR</td><td>cgi-bin</td><td/><td/><td/></row>
 		<row><td>APACHECONFDIR</td><td>INSTALLDIR</td><td>conf</td><td/><td/><td/></row>
@@ -2442,8 +2442,8 @@
 		<col def="S255">Value</col>
 		<col def="S255">TestValue</col>
 		<col def="i4">Type</col>
-		<row><td>ApacheBuildFolder</td><td>d:\asf-build\build-2.2.4\</td><td/><td>2</td></row>
-		<row><td>ApacheTargetFolder</td><td>d:\asf-build\target-2.2.4\</td><td/><td>2</td></row>
+		<row><td>ApacheBuildFolder</td><td>d:\asf-build\build-2.2.6\</td><td/><td>2</td></row>
+		<row><td>ApacheTargetFolder</td><td>d:\asf-build\target-2.2.6\</td><td/><td>2</td></row>
 		<row><td>CommonFilesFolder</td><td/><td/><td>1</td></row>
 		<row><td>ISPROJECTDIR</td><td/><td/><td>1</td></row>
 		<row><td>ISProductFolder</td><td/><td/><td>1</td></row>
@@ -2475,8 +2475,8 @@
 		<row><td>win32</td><td>Comments</td><td>##IDS_Dev_Warning##</td></row>
 		<row><td>win32</td><td>PackageCode</td><td>{69492F41-747E-42B4-BF27-5C49212C5F24}</td></row>
 		<row><td>win32</td><td>ProductCode</td><td>{85262A06-2D8C-4BC1-B6ED-5A705D09CFFC}</td></row>
-		<row><td>win32</td><td>ProductName</td><td>Apache HTTP
Server 2.2.4</td></row>
-		<row><td>win32</td><td>ProductVersion</td><td>2.2.4</td></row>
+		<row><td>win32</td><td>ProductName</td><td>Apache HTTP
Server 2.2.6</td></row>
+		<row><td>win32</td><td>ProductVersion</td><td>2.2.6</td></row>
 		<row><td>win32</td><td>SetupFileName</td><td>setup</td></row>
 		<row><td>win32</td><td>Subject</td><td>##AppProduct_Description##</td></row>
 		<row><td>win32</td><td>Title</td><td>##IDS_Package_Title##</td></row>
@@ -2725,9 +2725,9 @@
 		<col def="I2">Encoded</col>
 		<col def="S0">Comment</col>
 		<col def="I4">TimeStamp</col>
-		<row><td>AppProduct</td><td>1033</td><td>Apache HTTP
Server 2.2.4</td><td>0</td><td>SYSTEM_GENERATED</td><td>1578731275</td></row>
+		<row><td>AppProduct</td><td>1033</td><td>Apache HTTP
Server 2.2.6</td><td>0</td><td>SYSTEM_GENERATED</td><td>1578731275</td></row>
 		<row><td>AppProduct_Description</td><td>1033</td><td>The
Apache HTTP Web Server Version 2.2</td><td>0</td><td/><td>1712964623</td></row>
-		<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.3|Apache
HTTP Server 2.2.4</td><td>0</td><td/><td>1712971342</td></row>
+		<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.6|Apache
HTTP Server 2.2.6</td><td>0</td><td/><td>1712971342</td></row>
 		<row><td>AppPublisher</td><td>1033</td><td>Apache Software
Foundation</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>AppPublisherURL</td><td>1033</td><td>http://httpd.apache.org/</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>AppSupportContact</td><td>1033</td><td>Apache
Users Mailing List</td><td>0</td><td/><td>1360611656</td></row>
@@ -4618,7 +4618,7 @@
 		<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
 		<row><td>ProductCode</td><td>{8F721A14-795E-4D11-87DC-CD5778E45D05}</td><td/></row>
 		<row><td>ProductName</td><td>Apache HTTP Server 2.2</td><td/></row>
-		<row><td>ProductVersion</td><td>2.2.4</td><td/></row>
+		<row><td>ProductVersion</td><td>2.2.6</td><td/></row>
 		<row><td>ProgressType0</td><td>install</td><td/></row>
 		<row><td>ProgressType1</td><td>Installing</td><td/></row>
 		<row><td>ProgressType2</td><td>installed</td><td/></row>
@@ -4634,8 +4634,8 @@
 		<row><td>SERVERNAME</td><td/><td/></row>
 		<row><td>SERVERPORT</td><td>80</td><td/></row>
 		<row><td>SERVERSSLPORT</td><td>443</td><td/></row>
-		<row><td>SERVICEINTERNALNAME</td><td>Apache2</td><td>No
Spaces!</td></row>
-		<row><td>SERVICENAME</td><td>Apache2</td><td/></row>
+		<row><td>SERVICEINTERNALNAME</td><td>Apache2.2</td><td>No
Spaces!</td></row>
+		<row><td>SERVICENAME</td><td>Apache2.2</td><td/></row>
 		<row><td>SetupType</td><td>Typical</td><td/></row>
 		<row><td>UpgradeCode</td><td>{B4E8928F-1B3A-4EF6-A495-7E391BA7F021}</td><td/></row>
 		<row><td>_IsMaintenance</td><td>Reinstall</td><td/></row>
@@ -4690,10 +4690,10 @@
 		<col def="S0">Value</col>
 		<col def="s72">Component_</col>
 		<col def="I4">ISAttributes</col>
-		<row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache
Software Foundation\Apache\2.2.4</td><td>ServerRoot</td><td>[INSTALLDIR]</td><td>ApacheAdmin</td><td>0</td></row>
+		<row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache
Software Foundation\Apache\2.2.6</td><td>ServerRoot</td><td>[INSTALLDIR]</td><td>ApacheAdmin</td><td>0</td></row>
 		<row><td>Registry10</td><td>2</td><td>SOFTWARE\Classes\sofile</td><td/><td>Apache
Loadable Module</td><td>ApacheAdmin</td><td>0</td></row>
-		<row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache
Software Foundation\Apache\2.2.4</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
-		<row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache
Software Foundation\Apache\2.2.4</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
+		<row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache
Software Foundation\Apache\2.2.6</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
+		<row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache
Software Foundation\Apache\2.2.6</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
 		<row><td>Registry3</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>
 		<row><td>Registry4</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td>Content
Type</td><td>text/plain</td><td>ApacheAdmin</td><td>0</td></row>
 		<row><td>Registry5</td><td>2</td><td>SOFTWARE\Classes\.log</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>



---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org


Mime
View raw message