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: r312538 - /httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
Date Mon, 10 Oct 2005 04:19:34 GMT
Author: wrowe
Date: Sun Oct  9 21:19:29 2005
New Revision: 312538

URL: http://svn.apache.org/viewcvs?rev=312538&view=rev
Log:

  manual/style/lang is gone, the .xml's changed a bit, and push forward
  to 2.0.55

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

Modified: httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
URL: http://svn.apache.org/viewcvs/httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism?rev=312538&r1=312537&r2=312538&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism Sun Oct  9 21:19:29 2005
@@ -251,7 +251,6 @@
 		<col key="yes" def="s72">Name</col>
 		<col def="V0">Data</col>
 		<col def="S255">ISBuildSourcePath</col>
-		<row><td>ISSELFREG.DLL</td><td/><td>&lt;ISProductFolder&gt;\redist\language
independent\i386\isregsvr.dll</td></row>
 		<row><td>NewBinary1</td><td/><td>&lt;ISProjectFolder&gt;\top_main.bmp</td></row>
 		<row><td>NewBinary10</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language
Independent\OS Independent\CompleteSetupIco.ibd</td></row>
 		<row><td>NewBinary11</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language
Independent\OS Independent\DestIcon.ibd</td></row>
@@ -390,10 +389,9 @@
 		<row><td>manual_ssl</td><td>{88687526-6A1C-41F2-95B4-B1362740EC26}</td><td>SSL</td><td>0</td><td/><td>F208170_index.html.en</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>manual_style</td><td>{1D2D6112-85C3-41BF-96BA-817471708039}</td><td>STYLE</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>manual_style_css</td><td>{143D8714-91E3-44F1-9237-267F07764FC4}</td><td>CSS</td><td>0</td><td/><td>F213260_manual.css</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>manual_style_lang</td><td>{605CF7D9-8A89-46F6-9E87-8FFA70B85947}</td><td>LANG</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>manual_style_latex</td><td>{3860EB1C-BABB-442D-BE8D-3D3E2119CF72}</td><td>LATEX</td><td>0</td><td/><td>F241989_latex.xsl</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>manual_style_xsl</td><td>{F6DC474C-C4B8-4D6B-9D65-430DDF5926B7}</td><td>XSL</td><td>0</td><td/><td>F213264_common.xsl</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>manual_style_xsl_util</td><td>{778BB9B7-7E46-4E1B-94D0-7AF23E32C3C0}</td><td>UTIL</td><td>0</td><td/><td>F269951_allmodules.xml</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+		<row><td>manual_style_xsl_util</td><td>{778BB9B7-7E46-4E1B-94D0-7AF23E32C3C0}</td><td>UTIL</td><td>0</td><td/><td>modtrans.xsl</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>manual_vhosts</td><td>{B95AF312-511E-47DD-AEF1-C47FBCDA1A6A}</td><td>VHOSTS</td><td>0</td><td/><td>F208249_index.html.en</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>mod_access</td><td>{09392959-715D-43B0-B055-89B343DD0B12}</td><td>APACHEMODULESDIR</td><td>0</td><td/><td>F192628_mod_access.so</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>mod_actions</td><td>{F82E814B-293E-4334-A556-FC75691B0124}</td><td>APACHEMODULESDIR</td><td>0</td><td/><td>F192657_mod_actions.so</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@@ -1116,10 +1114,6 @@
 		<col def="S64">Source</col>
 		<col def="S0">Target</col>
 		<col def="S255">ISComments</col>
-		<row><td>ISSelfRegisterCosting</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterCosting</td><td/></row>
-		<row><td>ISSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFiles</td><td/></row>
-		<row><td>ISSelfRegisterFinalize</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFinalize</td><td/></row>
-		<row><td>ISUnSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISUnSelfRegisterFiles</td><td/></row>
 		<row><td>InstallConfFiles</td><td>1602</td><td>awk_exe</td><td>-f
"[#F46421_InstallConf.awk]" "[SERVERDOMAIN]" "[SERVERNAME]" "[SERVERADMIN]" [SERVERPORT] "[APACHEDIR]
"</td><td>The trailing space within "[APACHEDIR] " is required!</td></row>
 		<row><td>RemovePriorService</td><td>1618</td><td>F98246_Apache.exe</td><td>-k
uninstall -n "[SERVICENAME]" -f "[APACHECONFDIR]httpd.conf" -d "[APACHEDIR]."</td><td>The
-f and -d args are required to ensure we remove a misconfigured service!</td></row>
 		<row><td>ResolveServerName</td><td>1</td><td>real_features_dll</td><td>_ResolveServerName@4</td><td/></row>
@@ -1516,7 +1510,6 @@
 		<row><td>ApacheDocs</td><td>manual_ssl</td></row>
 		<row><td>ApacheDocs</td><td>manual_style</td></row>
 		<row><td>ApacheDocs</td><td>manual_style_css</td></row>
-		<row><td>ApacheDocs</td><td>manual_style_lang</td></row>
 		<row><td>ApacheDocs</td><td>manual_style_latex</td></row>
 		<row><td>ApacheDocs</td><td>manual_style_xsl</td></row>
 		<row><td>ApacheDocs</td><td>manual_style_xsl_util</td></row>
@@ -1699,7 +1692,6 @@
 		<row><td>F208249_index.html.en</td><td>manual_vhosts</td><td>INDEXH~1.EN|index.html.en</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\vhosts\index.html.en</td><td>1</td><td/></row>
 		<row><td>F213107_windows.html.en</td><td>manual_platform</td><td>WINDOW~1.EN|windows.html.en</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\platform\windows.html.en</td><td>1</td><td/></row>
 		<row><td>F213260_manual.css</td><td>manual_style_css</td><td>manual.css</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\style\css\manual.css</td><td>1</td><td/></row>
-		<row><td>F213262_en.xml</td><td>manual_style_lang</td><td>en.xml</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\style\lang\en.xml</td><td>1</td><td/></row>
 		<row><td>F213264_common.xsl</td><td>manual_style_xsl</td><td>common.xsl</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\style\xsl\common.xsl</td><td>1</td><td/></row>
 		<row><td>F216483_index.html.en</td><td>manual_misc</td><td>INDEXH~1.EN|index.html.en</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\misc\index.html.en</td><td>1</td><td/></row>
 		<row><td>F219024__tbl_simple.so</td><td>iconv_bin</td><td>_TBL_S~1.SO|_tbl_simple.so</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\iconv\_tbl_simple.so</td><td>1</td><td/></row>
@@ -1717,7 +1709,6 @@
 		<row><td>F25539_htdigest.exe</td><td>htdigest</td><td>htdigest.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\htdigest.exe</td><td>1</td><td/></row>
 		<row><td>F25540_htpasswd.exe</td><td>htpasswd</td><td>htpasswd.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\htpasswd.exe</td><td>1</td><td/></row>
 		<row><td>F269686_mod_log_forensic.so</td><td>mod_log_forensic</td><td>MOD_LO~1.SO|mod_log_forensic.so</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\modules\mod_log_forensic.so</td><td>1</td><td/></row>
-		<row><td>F269951_allmodules.xml</td><td>manual_style_xsl_util</td><td>ALLMOD~1.XML|allmodules.xml</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\style\xsl\util\allmodules.xml</td><td>1</td><td/></row>
 		<row><td>F45780_mime.types.default</td><td>conf</td><td>MIMETY~1.DEF|mime.types.default</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\conf\mime.types.default</td><td>1</td><td/></row>
 		<row><td>F45781_magic.default</td><td>conf</td><td>MAGIC~1.DEF|magic.default</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\conf\magic.default</td><td>1</td><td/></row>
 		<row><td>F46421_InstallConf.awk</td><td>conf_temp</td><td>INSTAL~1.AWK|InstallConf.awk</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ISProjectFolder&gt;\InstallConf.awk</td><td>1</td><td/></row>
@@ -1726,6 +1717,7 @@
 		<row><td>F98246_Apache.exe</td><td>Apache</td><td>Apache.exe</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\bin\Apache.exe</td><td>1</td><td/></row>
 		<row><td>F98940_httpdwin.conf</td><td>conf_temp</td><td>HTTPD-~1.CON|httpd-win.conf</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheBuildFolder&gt;\docs\conf\httpd-win.conf</td><td>1</td><td/></row>
 		<row><td>index.html.en</td><td>manual_rewrite</td><td>INDEXH~1.EN|index.html.en</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\rewrite\index.html.en</td><td>1</td><td/></row>
+		<row><td>modtrans.xsl</td><td>manual_style_xsl_util</td><td>modtrans.xsl</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\style\xsl\util\modtrans.xsl</td><td>1</td><td/></row>
 	</table>
 
 	<table name="FileSFPCatalog">
@@ -1933,7 +1925,6 @@
 		<row><td>manual_ssl</td><td/><td/><td>_687B1F36_EF43_4EC0_B9F4_19CD6D8C56BE_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>manual_style</td><td/><td/><td>_8ED6068F_9C33_4114_A735_683A67AA9A4C_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>manual_style_css</td><td/><td/><td>_6144A3C8_BAD0_4C97_95E5_EE26B43899E5_FILTER</td><td/><td/><td/><td/></row>
-		<row><td>manual_style_lang</td><td/><td/><td>_EC892979_652A_420F_9823_C618FD5EB601_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>manual_style_latex</td><td/><td/><td>_9983BDC1_F658_4001_B270_B6AC7E966E8F_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>manual_style_xsl</td><td/><td/><td>_39817A19_6227_4C42_BCA5_D4355BBF6892_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>manual_style_xsl_util</td><td/><td/><td>_8B81483F_EDC9_4EE6_8C6C_A81FCCCB3695_FILTER</td><td/><td/><td/><td/></row>
@@ -2042,10 +2033,9 @@
 		<row><td>manual_ssl</td><td>&lt;ApacheTargetFolder&gt;\manual\ssl</td><td>4</td><td>LICENSE,*.html*,*.xml*,*.gif,*.png,*.fig,*.jpg,*.inc</td><td>index.html.en</td><td>0</td></row>
 		<row><td>manual_style</td><td>&lt;ApacheTargetFolder&gt;\manual\style</td><td>4</td><td/><td>*.sh</td><td>0</td></row>
 		<row><td>manual_style_css</td><td>&lt;ApacheTargetFolder&gt;\manual\style\css</td><td>4</td><td/><td>manual.css</td><td>0</td></row>
-		<row><td>manual_style_lang</td><td>&lt;ApacheTargetFolder&gt;\manual\style\lang</td><td>4</td><td/><td>en.xml</td><td>0</td></row>
 		<row><td>manual_style_latex</td><td>&lt;ApacheTargetFolder&gt;\manual\style\latex</td><td>4</td><td/><td>latex.xsl</td><td>0</td></row>
 		<row><td>manual_style_xsl</td><td>&lt;ApacheTargetFolder&gt;\manual\style\xsl</td><td>4</td><td/><td>common.xsl</td><td>0</td></row>
-		<row><td>manual_style_xsl_util</td><td>&lt;ApacheTargetFolder&gt;\manual\style\xsl\util</td><td>4</td><td/><td>allmodules.xml</td><td>0</td></row>
+		<row><td>manual_style_xsl_util</td><td>&lt;ApacheTargetFolder&gt;\manual\style\xsl\util</td><td>4</td><td/><td>allmodules.xml,
modtrans.xsl</td><td>0</td></row>
 		<row><td>manual_vhosts</td><td>&lt;ApacheTargetFolder&gt;\manual\vhosts</td><td>4</td><td>LICENSE,*.html*,*.xml*,*.gif,*.png,*.fig,*.jpg</td><td>index.html.en</td><td>0</td></row>
 	</table>
 
@@ -2256,8 +2246,8 @@
 		<col def="S255">Value</col>
 		<col def="S255">TestValue</col>
 		<col def="i4">Type</col>
-		<row><td>ApacheBuildFolder</td><td>c:\asf-build\build-2.0.54\</td><td/><td>2</td></row>
-		<row><td>ApacheTargetFolder</td><td>c:\asf-build\target-2.0.54\</td><td/><td>2</td></row>
+		<row><td>ApacheBuildFolder</td><td>c:\asf-build\build-2.0.55\</td><td/><td>2</td></row>
+		<row><td>ApacheTargetFolder</td><td>c:\asf-build\target-2.0.55\</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>
@@ -2289,8 +2279,8 @@
 		<row><td>win32</td><td>Comments</td><td>##IDS_Dev_Warning##</td></row>
 		<row><td>win32</td><td>PackageCode</td><td>{495826D5-C9CF-4E88-B694-382EE6A85AEC}</td></row>
 		<row><td>win32</td><td>ProductCode</td><td>{3A862C7D-0504-48BC-AEF8-7F7479C7C158}</td></row>
-		<row><td>win32</td><td>ProductName</td><td>Apache HTTP
Server 2.0.54</td></row>
-		<row><td>win32</td><td>ProductVersion</td><td>2.0.54</td></row>
+		<row><td>win32</td><td>ProductName</td><td>Apache HTTP
Server 2.0.55</td></row>
+		<row><td>win32</td><td>ProductVersion</td><td>2.0.55</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>
@@ -2487,9 +2477,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.0.54</td><td>0</td><td>SYSTEM_GENERATED</td><td>1360611656</td></row>
+		<row><td>AppProduct</td><td>1033</td><td>Apache HTTP
Server 2.0.55</td><td>0</td><td>SYSTEM_GENERATED</td><td>1360611656</td></row>
 		<row><td>AppProduct_Description</td><td>1033</td><td>The
Apache HTTP Web Server</td><td>0</td><td/><td>1360611656</td></row>
-		<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.53|Apache
HTTP Server 2.0.54</td><td>0</td><td/><td>1360611656</td></row>
+		<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.55|Apache
HTTP Server 2.0.55</td><td>0</td><td/><td>1360611656</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>
@@ -3870,10 +3860,6 @@
 		<row><td>DuplicateFiles</td><td/><td>4210</td><td>DuplicateFiles</td><td/></row>
 		<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
 		<row><td>FindRelatedProducts</td><td/><td>420</td><td>FindRelatedProducts</td><td/></row>
-		<row><td>ISSelfRegisterCosting</td><td/><td>2201</td><td/><td/></row>
-		<row><td>ISSelfRegisterFiles</td><td/><td>5911</td><td/><td/></row>
-		<row><td>ISSelfRegisterFinalize</td><td/><td>6601</td><td/><td/></row>
-		<row><td>ISUnSelfRegisterFiles</td><td/><td>2202</td><td/><td/></row>
 		<row><td>InstallConfFiles</td><td>$conf=3 Or (?conf=3 And $conf&lt;&gt;2)</td><td>4010</td><td>If
we are installing (or installed and not uninstalling) run the conf script</td><td/></row>
 		<row><td>InstallFiles</td><td/><td>4000</td><td>InstallFiles</td><td/></row>
 		<row><td>InstallFinalize</td><td/><td>6600</td><td>InstallFinalize</td><td/></row>
@@ -4243,7 +4229,7 @@
 		<row><td>PROGMSG_IIS_ROLLBACKVROOTS</td><td>##IDS_PROGMSG_IIS_ROLLBACKVROOTS##</td><td/></row>
 		<row><td>ProductCode</td><td>{50B6484E-E43A-473B-A97A-710439BAEF58}</td><td/></row>
 		<row><td>ProductName</td><td>Apache HTTP Server 2.0</td><td/></row>
-		<row><td>ProductVersion</td><td>2.0.54</td><td/></row>
+		<row><td>ProductVersion</td><td>2.0.55</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>
@@ -4314,10 +4300,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
Group\Apache\2.0.54</td><td>ServerRoot</td><td>[APACHEDIR]</td><td>ApacheAdmin</td><td>0</td></row>
+		<row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache
Group\Apache\2.0.55</td><td>ServerRoot</td><td>[APACHEDIR]</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
Group\Apache\2.0.54</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
-		<row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache
Group\Apache\2.0.54</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
+		<row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache
Group\Apache\2.0.55</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
+		<row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache
Group\Apache\2.0.55</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