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: r606374 - in /httpd/httpd/win32-msi/trunk: CHANGES apache_2.2-win32.ism
Date Sat, 22 Dec 2007 01:38:26 GMT
Author: wrowe
Date: Fri Dec 21 17:38:25 2007
New Revision: 606374

URL: http://svn.apache.org/viewvc?rev=606374&view=rev
Log:
Add StopApacheMonitor control for repair/install/uninstall,
and clean up the build (include/lib) feature so it's not
installed for a 'typical' user who won't be compiling.

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

Modified: httpd/httpd/win32-msi/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/CHANGES?rev=606374&r1=606373&r2=606374&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/CHANGES (original)
+++ httpd/httpd/win32-msi/trunk/CHANGES Fri Dec 21 17:38:25 2007
@@ -1,6 +1,16 @@
 Changes to 2.2.7
 ----------------
 
+  * Avoid installing build files (include, lib) by default on 
+    a "typical" installation (as documented).  Custom install
+    allows these to be selected.
+
+  * Stops ApacheMonitor (even older versions) when installing, 
+    removing or repairing.
+
+  * Restored the shortcut to the ApacheMonitor, broken for some 
+    time now.
+
   * The conf\default\ config tree is renamed conf\original\ to 
     eliminate some confusion apparent from user list messages.
 

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=606374&r1=606373&r2=606374&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Fri Dec 21 17:38:25 2007
@@ -1109,6 +1109,7 @@
 		<row><td>SetAllUsersProfileNT</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%SystemRoot]\Profiles\All
Users</td><td/></row>
 		<row><td>SetUserProfileNT</td><td>51</td><td>USERPROFILE</td><td>[%USERPROFILE]</td><td/></row>
 		<row><td>StartApacheMonitor</td><td>1746</td><td>ApacheMonitor.exe</td><td/><td/></row>
+		<row><td>StopApacheMonitor</td><td>3073</td><td>real_features_dll</td><td>_StopApacheMonitor@4</td><td/></row>
 		<row><td>ValidateServerName</td><td>1</td><td>real_features_dll</td><td>_ValidateServerName@4</td><td/></row>
 	</table>
 
@@ -1503,10 +1504,10 @@
 		<row><td>Apache</td><td/><td>##AppProduct##</td><td>##AppProduct_Description##</td><td>3</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
 		<row><td>ApacheDocs</td><td>Apache</td><td>##Feature_ApacheDocs##</td><td>##Feature_ApacheDocs_Description##</td><td>3</td><td>11</td><td>MANUAL</td><td>8</td><td/><td/><td/><td/></row>
 		<row><td>ApacheRuntime</td><td>Apache</td><td>##Feature_ApacheRuntime##</td><td>##Feature_ApacheRuntime_Description##</td><td>1</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
-		<row><td>BuildFiles</td><td>ApacheRuntime</td><td>##Feature_BuildFiles##</td><td>##Feature_BuildFiles_Description##</td><td>1</td><td>31</td><td>INSTALLDIR</td><td>8</td><td/><td>Enter
comments regarding this feature here.</td><td/><td/></row>
-		<row><td>Iconv</td><td>ApacheRuntime</td><td>##Feature_Iconv##</td><td>##Feature_Iconv_Description##</td><td>3</td><td>21</td><td>APACHEICONVDIR</td><td>8</td><td/><td>Enter
comments regarding this feature here.</td><td/><td/></row>
-		<row><td>OpensslBin</td><td>SslBin</td><td>##Feature_OpenSSL##</td><td>##Feature_OpenSSL_Description##</td><td>1</td><td>31</td><td>OPENSSLBINDIR</td><td>8</td><td>IncludeSSL</td><td>Enter
comments regarding this feature here.</td><td/><td/></row>
-		<row><td>SslBin</td><td>ApacheRuntime</td><td>##Feature_SSL##</td><td>##Feature_SSL_Description##</td><td>5</td><td>41</td><td>INSTALLDIR</td><td>8</td><td>IncludeSSL</td><td>Enter
comments regarding this feature here.</td><td/><td/></row>
+		<row><td>BuildFiles</td><td>ApacheRuntime</td><td>##Feature_BuildFiles##</td><td>##Feature_BuildFiles_Description##</td><td>1</td><td>101</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
+		<row><td>Iconv</td><td>ApacheRuntime</td><td>##Feature_Iconv##</td><td>##Feature_Iconv_Description##</td><td>3</td><td>21</td><td>APACHEICONVDIR</td><td>8</td><td/><td/><td/><td/></row>
+		<row><td>OpensslBin</td><td>SslBin</td><td>##Feature_OpenSSL##</td><td>##Feature_OpenSSL_Description##</td><td>1</td><td>31</td><td>OPENSSLBINDIR</td><td>8</td><td>IncludeSSL</td><td/><td/><td/></row>
+		<row><td>SslBin</td><td>ApacheRuntime</td><td>##Feature_SSL##</td><td>##Feature_SSL_Description##</td><td>5</td><td>41</td><td>INSTALLDIR</td><td>8</td><td>IncludeSSL</td><td/><td/><td/></row>
 	</table>
 
 	<table name="FeatureComponents">
@@ -4234,6 +4235,7 @@
 		<row><td>SetUserProfileNT</td><td>VersionNT</td><td>710</td><td/><td/></row>
 		<row><td>StartApacheMonitor</td><td>$ApacheMonitor=3 Or (?ApacheMonitor=3
and $ApacheMonitor&lt;&gt;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>StopApacheMonitor</td><td>$ApacheMonitor=2 Or $ApacheMonitor=3</td><td>2020</td><td>If
removing or repairing ApacheMonitor, kill running instances, first.</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>



---------------------------------------------------------------------
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