You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2006/07/07 05:05:07 UTC
svn commit: r419778 - in /httpd/mod_aspdotnet/trunk: installer.ism
mod_aspdotnet.sln
Author: wrowe
Date: Thu Jul 6 20:05:06 2006
New Revision: 419778
URL: http://svn.apache.org/viewvc?rev=419778&view=rev
Log:
Final tweaks for mod_aspdotnet build 2004
Modified:
httpd/mod_aspdotnet/trunk/installer.ism
httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln
Modified: httpd/mod_aspdotnet/trunk/installer.ism
URL: http://svn.apache.org/viewvc/httpd/mod_aspdotnet/trunk/installer.ism?rev=419778&r1=419777&r2=419778&view=diff
==============================================================================
--- httpd/mod_aspdotnet/trunk/installer.ism (original)
+++ httpd/mod_aspdotnet/trunk/installer.ism Thu Jul 6 20:05:06 2006
@@ -250,7 +250,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><ISProductFolder>\redist\language independent\i386\isregsvr.dll</td></row>
<row><td>NewBinary1</td><td/><td><ISProjectFolder>\resource\ApacheBanner.jpeg</td></row>
<row><td>NewBinary10</td><td/><td><ISProductFolder>\Redist\Language Independent\OS Independent\CompleteSetupIco.ibd</td></row>
<row><td>NewBinary11</td><td/><td><ReleaseBinaryFolder>\resolve_apache.dll</td></row>
@@ -336,7 +335,7 @@
<col def="S0">ISDotNetInstallerArgsCommit</col>
<col def="S0">ISDotNetInstallerArgsUninstall</col>
<col def="S0">ISDotNetInstallerArgsRollback</col>
- <row><td>Apache.Web</td><td>{0C479A89-29CD-4979-B4EF-5899EE72DD5A}</td><td>GlobalAssemblyCache</td><td>8</td><td/><td>Apache.Web.dll</td><td>52</td><td/><td/><td/><td/><td/><td/><td/></row>
+ <row><td>Apache.Web</td><td>{0C479A89-29CD-4979-B4EF-5899EE72DD5A}</td><td>GlobalAssemblyCache</td><td>8</td><td/><td>Apache.Web.dll</td><td>41</td><td/><td/><td/><td/><td/><td/><td/></row>
<row><td>manual_mod</td><td>{F9BFC5A4-B70E-4F98-9FA5-A496C125590F}</td><td>MANUAL_MOD</td><td>8</td><td/><td>mod_aspdotnet.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_aspdotnet.so</td><td>{BA7DB173-11D7-4873-8F28-8A4FA6B86E33}</td><td>APACHE_MODULES</td><td>8</td><td/><td>mod_aspdotnet.so</td><td>1</td><td/><td/><td/><td/><td/><td/><td/></row>
</table>
@@ -991,10 +990,6 @@
<col def="S0">Target</col>
<col def="S255">ISComments</col>
<row><td>ISInitAllUsers</td><td>307</td><td>ALLUSERS</td><td>2</td><td>Initializes ALLUSERS property</td></row>
- <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>ResolveApacheInstances</td><td>257</td><td>NewBinary11</td><td>_ResolveApacheInstances@4</td><td>Initialize the INSTALLDIR combo to valid Apache paths</td></row>
<row><td>SetARPReadme</td><td>51</td><td>ARPREADME</td><td>http://httpd.apache.org/mod_aspdotnet/introduction.html</td><td/></row>
<row><td>SetAllUsersProfileNT</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%SystemRoot]\Profiles\All Users</td><td/></row>
@@ -1869,17 +1864,15 @@
<col def="S255">Value</col>
<col def="S255">TestValue</col>
<col def="i4">Type</col>
- <row><td>Apache.Web</td><td>Apache.Web\Apache.Web.vcproj</td><td/><td>2</td></row>
<row><td>CommonFilesFolder</td><td/><td/><td>1</td></row>
<row><td>ISProductFolder</td><td/><td/><td>1</td></row>
<row><td>ISProjectDataFolder</td><td/><td/><td>1</td></row>
<row><td>ISProjectFolder</td><td/><td/><td>1</td></row>
- <row><td>Objects</td><td>Release</td><td/><td>2</td></row>
+ <row><td>Objects</td><td>Release22</td><td/><td>2</td></row>
<row><td>ProgramFilesFolder</td><td/><td/><td>1</td></row>
- <row><td>ReleaseBinaryFolder</td><td><ISProjectFolder>\<Objects></td><td/><td>2</td></row>
+ <row><td>ReleaseBinaryFolder</td><td><ISProjectFolder><Objects>\</td><td/><td>2</td></row>
<row><td>SystemFolder</td><td/><td/><td>1</td></row>
<row><td>WindowsFolder</td><td/><td/><td>1</td></row>
- <row><td>mod_aspdotnet</td><td>mod\mod_aspdotnet.vcproj</td><td/><td>2</td></row>
</table>
<table name="ISProductConfiguration">
@@ -3214,10 +3207,6 @@
<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
<row><td>FindRelatedProducts</td><td>NOT ISSETUPDRIVEN</td><td>420</td><td>FindRelatedProducts</td><td/></row>
<row><td>ISInitAllUsers</td><td>VersionNT And NOT Installed</td><td>1010</td><td>ISInitAllUsers</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>InstallFiles</td><td/><td>4000</td><td>InstallFiles</td><td/></row>
<row><td>InstallFinalize</td><td/><td>6600</td><td>InstallFinalize</td><td/></row>
<row><td>InstallInitialize</td><td/><td>1500</td><td>InstallInitialize</td><td/></row>
@@ -3285,8 +3274,8 @@
<row><td>ActiveLanguage</td><td>1033</td></row>
<row><td>ApplicationType</td><td>Apache HTTP Server Module</td></row>
<row><td>Comments</td><td/></row>
- <row><td>CurrentMedia</td><td dt:dt="bin.base64" md5="01740888d717c3579162e8ff829c3fed">
-UgBlAGwAZQBhAHMAZQABAG0AbwBkAF8AYQBzAHAAZABvAHQAbgBlAHQAMgAuADIA
+ <row><td>CurrentMedia</td><td dt:dt="bin.base64" md5="a562d2a626f13ad139eb2cf318fa2693">
+UgBlAGwAZQBhAHMAZQABAG0AbwBkAF8AYQBzAHAAZABvAHQAbgBlAHQAMgAuADAA
</td></row>
<row><td>DefaultProductConfiguration</td><td>mod_aspdotnet</td></row>
<row><td>ISCompilerOption_Debug</td><td>1</td></row>
@@ -3413,7 +3402,6 @@
<col def="S72">File_Manifest</col>
<col def="S72">File_Application</col>
<col def="I2">Attributes</col>
- <row><td>Apache.Web</td><td>mod_aspdotnet</td><td/><td/><td>0</td></row>
</table>
<table name="MsiAssemblyName">
Modified: httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln
URL: http://svn.apache.org/viewvc/httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln?rev=419778&r1=419777&r2=419778&view=diff
==============================================================================
--- httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln (original)
+++ httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln Thu Jul 6 20:05:06 2006
@@ -3,8 +3,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Apache.Web", "Apache.Web\Apache.Web.vcproj", "{4B4F627E-C6DE-4614-9135-306D94F8755B}"
EndProject
-Project("{E729F059-12D4-455F-A2A4-FDA8DD25E08A}") = "installer", "installer.ism", "{D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resolve_apache", "msi_dll\resolve_apache.vcproj", "{5149E89D-79D2-4FE7-B088-4987CF385D46}"
EndProject
Global