You are viewing a plain text version of this content. The canonical link for it is here.
Posted to win32-msi-cvs@httpd.apache.org by wr...@apache.org on 2005/02/13 22:26:27 UTC
svn commit: r153673 - httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
Author: wrowe
Date: Sun Feb 13 13:26:27 2005
New Revision: 153673
URL: http://svn.apache.org/viewcvs?view=rev&rev=153673
Log:
Fixes for the final 2.0.53 installer as posted 2-12 to /dev/dist/
Although you would think Deferred sounds like it won't run in the
right sequence, it is the actual sequence that files are added or
removed at install time. This is correct for Stop/Remove service.
While Commit execution sounds nice, it's only useful for post
install/uninstall, perfect for Install/Start service. But a very
bad choice to pre-stop/remove an existing service, and this caused
1.3.x installers, and our first 2.0.53 alpha test to never stop
and remove the existing Apache service.
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?view=diff&r1=153672&r2=153673
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism Sun Feb 13 13:26:27 2005
@@ -1122,14 +1122,13 @@
<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>193</td><td>real_features_dll</td><td>_ResolveServerName@4</td><td/></row>
+ <row><td>ResolveServerName</td><td>1</td><td>real_features_dll</td><td>_ResolveServerName@4</td><td/></row>
<row><td>SelfInstallService</td><td>1618</td><td>F98246_Apache.exe</td><td>-w -k install -n "[SERVICENAME]" -f "[APACHECONFDIR]httpd.conf" -d "[APACHEDIR]."</td><td/></row>
- <row><td>SelfRemoveService</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>SelfRemoveService</td><td>1106</td><td>F98246_Apache.exe</td><td>-k uninstall -n "[SERVICENAME]"</td><td>The -f and -d args are required to ensure we remove a misconfigured service!</td></row>
<row><td>SelfStartService</td><td>1746</td><td>F98246_Apache.exe</td><td>-w -k start -n "[SERVICENAME]"</td><td/></row>
- <row><td>SelfStopService</td><td>1618</td><td>F98246_Apache.exe</td><td>-k stop -n "[SERVICENAME]" -f "[APACHECONFDIR]httpd.conf" -d "[APACHEDIR]."</td><td>The -f and -d args are required to ensure we stop a misconfigured service!</td></row>
+ <row><td>SelfStopService</td><td>1106</td><td>F98246_Apache.exe</td><td>-k stop -n "[SERVICENAME]"</td><td>The -f and -d args are required to ensure we stop a misconfigured service!</td></row>
<row><td>SetAllUsersProfileNT</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%SystemRoot]\Profiles\All Users</td><td/></row>
<row><td>StartApacheMonitor</td><td>1746</td><td>F161005_ApacheMonitor.exe</td><td/><td/></row>
- <row><td>StopPriorService</td><td>1618</td><td>F98246_Apache.exe</td><td>-k stop -n "[SERVICENAME]" -f "[APACHECONFDIR]httpd.conf" -d "[APACHEDIR]."</td><td>The -f and -d args are required to ensure we stop a misconfigured service!</td></row>
<row><td>ValidateServerName</td><td>1</td><td>real_features_dll</td><td>_ValidateServerName@4</td><td/></row>
<row><td>setAllUsersProfile2K</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%ALLUSERSPROFILE]</td><td/></row>
<row><td>setUserProfileNT</td><td>51</td><td>USERPROFILE</td><td>[%USERPROFILE]</td><td/></row>
@@ -3910,21 +3909,20 @@
<row><td>RemoveFolders</td><td/><td>3600</td><td>RemoveFolders</td><td/></row>
<row><td>RemoveIniValues</td><td/><td>3100</td><td>RemoveIniValues</td><td/></row>
<row><td>RemoveODBC</td><td/><td>2400</td><td>RemoveODBC</td><td/></row>
- <row><td>RemovePriorService</td><td>$ApacheAdmin=3 And EXISTING_APACHE_SERVICE_PATH</td><td>4520</td><td>If we are installing as a service, uninstall the existing service</td><td/></row>
+ <row><td>RemovePriorService</td><td>$ApacheAdmin=3 And EXISTING_APACHE_SERVICE_PATH > ""</td><td>4520</td><td>If we are installing as a service, uninstall the existing service</td><td/></row>
<row><td>RemoveRegistryValues</td><td/><td>2600</td><td>RemoveRegistryValues</td><td/></row>
<row><td>RemoveShortcuts</td><td/><td>3200</td><td>RemoveShortcuts</td><td/></row>
<row><td>ScheduleReboot</td><td>ISSCHEDULEREBOOT</td><td>1010</td><td/><td/></row>
<row><td>SelfInstallService</td><td>$ApacheAdmin=3</td><td>5710</td><td>If we are installing as a service, install ourself</td><td/></row>
<row><td>SelfRegModules</td><td/><td>5910</td><td>SelfRegModules</td><td/></row>
- <row><td>SelfRemoveService</td><td>$ApacheAdmin=2 And EXISTING_APACHE_SERVICE_PATH</td><td>2010</td><td>If we are removing ourself as a service, and the service is found, remove it ourself</td><td/></row>
+ <row><td>SelfRemoveService</td><td>$ApacheAdmin=2 And EXISTING_APACHE_SERVICE_PATH > ""</td><td>2010</td><td>If we are removing ourself as a service, and the service is found, remove it ourself</td><td/></row>
<row><td>SelfStartService</td><td>$ApacheAdmin=3 Or (?ApacheAdmin=3 and $ApacheAdmin<>2)</td><td>5810</td><td>If we are installing as a service (or were installed and not removed) start ourself</td><td/></row>
- <row><td>SelfStopService</td><td>?ApacheAdmin=3 And EXISTING_APACHE_SERVICE_PATH</td><td>1910</td><td>If we are removing or repairing ourself as a service, and the service is installed, stop it ourself</td><td/></row>
+ <row><td>SelfStopService</td><td>($ApacheAdmin=2 Or ?ApacheAdmin=3) And EXISTING_APACHE_SERVICE_PATH > ""</td><td>1910</td><td>If we are removing or repairing ourself as a service, and the service is installed, stop it ourself</td><td/></row>
<row><td>SelfUnregModules</td><td/><td>2200</td><td>SelfUnregModules</td><td/></row>
<row><td>SetAllUsersProfileNT</td><td>VersionNT = 400</td><td>720</td><td/><td/></row>
<row><td>SetODBCFolders</td><td/><td>1100</td><td>SetODBCFolders</td><td/></row>
<row><td>StartApacheMonitor</td><td>$ApacheMonitor=3 Or (?ApacheMonitor=3 and $ApacheMonitor<>2)</td><td>5930</td><td>If we are installing ApacheMonitor (or it was installed and not removed), then launch it</td><td/></row>
<row><td>StartServices</td><td>VersionNT</td><td>5900</td><td>StartServices</td><td/></row>
- <row><td>StopPriorService</td><td>$ApacheAdmin=3 And ?ApacheAdmin<>3 And EXISTING_APACHE_SERVICE_PATH</td><td>4510</td><td>If we are installing as a service, uninstall the existing service</td><td/></row>
<row><td>StopServices</td><td>VersionNT</td><td>1900</td><td>StopServices</td><td/></row>
<row><td>UnpublishComponents</td><td/><td>1700</td><td>UnpublishComponents</td><td/></row>
<row><td>UnpublishFeatures</td><td/><td>1800</td><td>UnpublishFeatures</td><td/></row>
@@ -3949,8 +3947,8 @@
<row><td>ActiveLanguage</td><td>1033</td></row>
<row><td>ApplicationType</td><td>Internet Application</td></row>
<row><td>Comments</td><td/></row>
- <row><td>CurrentMedia</td><td dt:dt="bin.base64" md5="00269d8abe524138da42c27c36e13c9c">
-bQBzAGkALQBzAHMAbAAtADIALgAwAAEAdwBpAG4AMwAyAA==
+ <row><td>CurrentMedia</td><td dt:dt="bin.base64" md5="8cf7e6cd72e315db7bc3204d12cacd88">
+bQBzAGkALQBuAG8AXwBzAHMAbAAtADIALgAwAAEAdwBpAG4AMwAyAA==
</td></row>
<row><td>ISCompilerOption_CompileBeforeBuild</td><td>1</td></row>
<row><td>ISCompilerOption_Debug</td><td>1</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