Return-Path: Delivered-To: apmail-httpd-win32-msi-cvs-archive@httpd.apache.org Received: (qmail 15671 invoked by uid 500); 9 Apr 2002 03:44:09 -0000 Mailing-List: contact win32-msi-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: win32-msi-cvs@httpd.apache.org Delivered-To: mailing list win32-msi-cvs@httpd.apache.org Received: (qmail 15659 invoked from network); 9 Apr 2002 03:44:09 -0000 Date: 9 Apr 2002 03:44:08 -0000 Message-ID: <20020409034408.5931.qmail@icarus.apache.org> From: wrowe@apache.org To: httpd-win32-msi-cvs@apache.org Subject: cvs commit: httpd-win32-msi apache_2.0-win32.isv X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wrowe 02/04/08 20:44:08 Modified: . apache_2.0-win32.isv Log: Replace HKLM\SOFTWARE\Microsoft\CurrentVersion\Run ... with the corresponding StartUp group shortcut to ApacheMonitor, so the user has more control, and we eliminate our 'destroyed the Run key' bug. Also grab ab/abs [w/o or w/ SSL] from the build tree since we can't distingush which 'target\bin\ab.exe' was copied. Finally, bumps for .35 - horah! Revision Changes Path 1.7 +18 -41 httpd-win32-msi/apache_2.0-win32.isv Index: apache_2.0-win32.isv =================================================================== RCS file: /home/cvs/httpd-win32-msi/apache_2.0-win32.isv,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apache_2.0-win32.isv 17 Feb 2002 03:25:08 -0000 1.6 +++ apache_2.0-win32.isv 9 Apr 2002 03:44:07 -0000 1.7 @@ -1,7 +1,7 @@ # InstallShield for Windows Installer Generated Project File # ** Do Not Edit ** -------------------------------------------------------- -KeyCount199846 +KeyCount202121 -------------------------------------------------------- 1 035 133ACTION 233 333 1033 2 035 133ACTIONTEXT 233 333 TKey33f 1033f 1133f @@ -1051,7 +1051,7 @@ R55608(Default) REGISTRYKEY R55608 (Default) %%%%NOVALUESET%%%% 1 Apache REGISTRYKEY R55609 2 0 0 -1 -1 0 0 0 0 R55609(Default) REGISTRYKEY R55609 (Default) %%%%NOVALUESET%%%% 1 -2.0.32 REGISTRYKEY R55610 2 0 0 -1 -1 0 0 0 0 +2.0.35 REGISTRYKEY R55610 2 0 0 -1 -1 0 0 0 0 R55610(Default) REGISTRYKEY R55610 (Default) %%%%NOVALUESET%%%% 1 R55610ServerRoot REGISTRYKEY R55610 ServerRoot [APACHEDIR] 1 R55610Shared REGISTRYKEY R55610 Shared 1 0 @@ -1090,15 +1090,6 @@ R55622(Default) REGISTRYKEY R55622 (Default) Apache Loadable Module 1 DefaultIcon REGISTRYKEY R176909 2 0 0 -1 -1 0 0 0 0 R176909(Default) REGISTRYKEY R176909 (Default) [APACHEBINDIR]Apache.exe 1 -Microsoft REGISTRYKEY R176410 2 0 0 -1 -1 0 0 0 0 -R176410(Default) REGISTRYKEY R176410 (Default) %%%%NOVALUESET%%%% 1 -Windows REGISTRYKEY R176411 2 0 0 -1 -1 0 0 0 0 -R176411(Default) REGISTRYKEY R176411 (Default) %%%%NOVALUESET%%%% 1 -CurrentVersion REGISTRYKEY R176412 2 0 0 -1 -1 0 0 0 0 -R176412(Default) REGISTRYKEY R176412 (Default) %%%%NOVALUESET%%%% 1 -Run REGISTRYKEY R176413 2 0 0 -1 -1 0 0 0 0 -R176413(Default) REGISTRYKEY R176413 (Default) %%%%NOVALUESET%%%% 1 -R176413ApacheMonitor.exe REGISTRYKEY R176413 ApacheMonitor.exe [APACHEBINDIR]ApacheMonitor.exe 1 REG_HKU REGISTRYKEY R55601 2 0 0 -1 -1 0 0 0 0 REG_HKUS REGISTRYKEY R55602 2 0 0 -1 -1 0 0 0 0 ApacheNonAdmin COMPONENT C151062 1 Not ALLUSERS {DFE85255-CA1B-48E9-B4A8-93565D3F44BA} 0 1 -1 0 0 0 0 [APACHEDIR] 0 0 1 0 R173773|Installed @@ -1135,18 +1126,9 @@ R173771(Default) REGISTRYKEY R173771 (Default) %%%%NOVALUESET%%%% 1 Apache REGISTRYKEY R173772 2 0 0 -1 -1 0 0 0 0 R173772(Default) REGISTRYKEY R173772 (Default) %%%%NOVALUESET%%%% 1 -2.0.32 REGISTRYKEY R173773 2 0 0 -1 -1 0 0 0 0 +2.0.35 REGISTRYKEY R173773 2 0 0 -1 -1 0 0 0 0 R173773(Default) REGISTRYKEY R173773 (Default) %%%%NOVALUESET%%%% 1 R173773Installed REGISTRYKEY R173773 Installed 1 0 -Microsoft REGISTRYKEY R176905 2 0 0 -1 -1 0 0 0 0 -R176905(Default) REGISTRYKEY R176905 (Default) %%%%NOVALUESET%%%% 1 -Windows REGISTRYKEY R176906 2 0 0 -1 -1 0 0 0 0 -R176906(Default) REGISTRYKEY R176906 (Default) %%%%NOVALUESET%%%% 1 -CurrentVersion REGISTRYKEY R176907 2 0 0 -1 -1 0 0 0 0 -R176907(Default) REGISTRYKEY R176907 (Default) %%%%NOVALUESET%%%% 1 -Run REGISTRYKEY R176908 2 0 0 -1 -1 0 0 0 0 -R176908(Default) REGISTRYKEY R176908 (Default) %%%%NOVALUESET%%%% 1 -R176908ApacheMonitor.exe REGISTRYKEY R176908 ApacheMonitor.exe [APACHEBINDIR]ApacheMonitor.exe 1 REG_HKLM REGISTRYKEY R151086 2 0 0 -1 -1 0 0 0 0 REG_HKU REGISTRYKEY R151087 2 0 0 -1 -1 0 0 0 0 REG_HKUS REGISTRYKEY R151088 2 0 0 -1 -1 0 0 0 0 @@ -1238,7 +1220,7 @@ REG_HKLM REGISTRYKEY R159909 2 0 0 -1 -1 0 0 0 0 REG_HKU REGISTRYKEY R159910 2 0 0 -1 -1 0 0 0 0 REG_HKUS REGISTRYKEY R159911 2 0 0 -1 -1 0 0 0 0 -ab COMPONENT C159914 1 {8DBE137D-104D-426A-A4C3-3445383AD12B} 0 1 -1 0 0 0 0 [APACHEBINDIR] 0 0 2 0 F159942_ab.exe +ab COMPONENT C159914 1 {8DBE137D-104D-426A-A4C3-3445383AD12B} 0 1 -1 0 0 0 0 [APACHEBINDIR] 0 0 2 0 F200415_ab.exe Default COMCLASS_GROUP C159915 1 Default TYPELIB_GROUP T159916 1 Default PROGID_GROUP P159917 1 @@ -1252,7 +1234,7 @@ Default FILELINKING_GROUP F159925 1 Default FILELINKING F159941 2 Default FILES F159926 2 -F159926F159942_ab.exe FILES F159926 F159942_ab.exe \bin\ab.exe 0 0 0 0 0 -1 0 -1 0 ab.exe 0 -1 1033 0 0 0 -1 +F159926F200415_ab.exe FILES F159926 F200415_ab.exe \support\Release\ab.exe 0 0 0 0 0 -1 0 -1 0 ab.exe 0 -1 1033 0 0 0 -1 Default SHORTCUT S159927 1 Default SHORTCUTTASKBAR S159928 1 Default SHORTCUTSTARTMENU S159929 1 @@ -1288,8 +1270,9 @@ Default SHORTCUTPROGRAMMENU S160993 1 AdministerApache SHORTCUTFOLDER S185727 1 Description of folder 0 0 ##AppProduct## 1 ShortcutsServerControl SHORTCUTFOLDER S185737 1 Description of folder 0 0 ##Shortcut_Services## 1 -ShortcutApacheMonitor SHORTCUTSHORTCUT S185738 1 ##Shortcuts_ApacheMonitorDesc## 0 [APACHEDIR] [#F161005_ApacheMonitor.exe] 0 ##Shortcut_ApacheMonitor## 1 +ShortcutApacheMonitor SHORTCUTSHORTCUT S185738 1 ##Shortcut_ApacheMonitor_desc## 0 [APACHEDIR] [#F161005_ApacheMonitor.exe] 0 ##Shortcut_ApacheMonitor## 1 Default SHORTCUTSTARTUP S160994 1 +New Shortcut SHORTCUTSHORTCUT S201552 1 ##Shortcut_ApacheMonitor_desc## 0 [#F161005_ApacheMonitor.exe] 0 ##Shortcut_ApacheMonitor## 1 Default SHORTCUTSENDTO S160995 1 Default SHORTCUTDESKTOP S160996 1 Default APPPATH A160997 2 @@ -2323,7 +2306,7 @@ REG_HKLM REGISTRYKEY R181246 2 0 0 -1 -1 0 0 0 0 REG_HKU REGISTRYKEY R181247 2 0 0 -1 -1 0 0 0 0 REG_HKUS REGISTRYKEY R181248 2 0 0 -1 -1 0 0 0 0 -abs COMPONENT C181251 1 {581AB144-8BA2-4089-8B92-C61E3806B712} 0 1 -1 0 0 0 0 [APACHEBINDIR] 0 0 2 0 F181279_abs.exe +abs COMPONENT C181251 1 {581AB144-8BA2-4089-8B92-C61E3806B712} 0 1 -1 0 0 0 0 [APACHEBINDIR] 0 0 2 0 F200414_abs.exe Default COMCLASS_GROUP C181252 1 Default TYPELIB_GROUP T181253 1 Default PROGID_GROUP P181254 1 @@ -2337,7 +2320,7 @@ Default FILELINKING_GROUP F181262 1 Default FILELINKING F181278 2 Default FILES F181263 2 -F181263F181279_abs.exe FILES F181263 F181279_abs.exe \bin\abs.exe 0 0 0 0 0 -1 0 -1 0 abs.exe 0 -1 1033 0 0 0 -1 +F181263F200414_abs.exe FILES F181263 F200414_abs.exe \support\Release\abs.exe 0 0 0 0 0 -1 0 -1 0 abs.exe 0 -1 1033 0 0 0 -1 Default SHORTCUT S181264 1 Default SHORTCUTTASKBAR S181265 1 Default SHORTCUTSTARTMENU S181266 1 @@ -2959,7 +2942,7 @@ ISPATCH_LAYOUT ISPATCH_LAYOUT ISPATCH_LAYOUT 1 ISPATCHPACKAGE_LAYOUT ISPATCHPACKAGE_LAYOUT ISPATCHPACKAGE_LAYOUT 1 PRODUCT_LAYOUT PRODUCT_LAYOUT PRODUCT_LAYOUT 1 -Apache HTTP Server 2.0 PRODUCT P794 1 M194225 http://www.yourcompany.com ##AppProduct## 0 0 Default 555-555-1234 http://www.yourcompany.com MS Visual Basic 2.0.32 http://www.yourcompany.com {C49BD74F-8B16-47B5-88A5-B86D3D15AEB5} ##AppPublisher## Internet Application [ProgramFilesFolder]\Apache Group\ Intel +Apache HTTP Server 2.0 PRODUCT P794 1 M194225 http://www.yourcompany.com ##AppProduct## 0 0 Default 555-555-1234 http://www.yourcompany.com MS Visual Basic 2.0.35 http://www.yourcompany.com {C49BD74F-8B16-47B5-88A5-B86D3D15AEB5} ##AppPublisher## Internet Application [ProgramFilesFolder]\Apache Group\ Intel Default MEDIA_GROUP M795 1 Default LAUNCHCONDITION_GROUP L796 1 Default ADMIN_EXESEQUENCE_GROUP A139 1 @@ -4088,7 +4071,7 @@ S1075IDS_SetupTips_16 STRINGS S1075 IDS_SetupTips_16 \Redist\Language Independent\OS Independent\InstallFirstUse.ico 0 S1075IDS_SetupTips_17 STRINGS S1075 IDS_SetupTips_17 \Redist\Language Independent\OS Independent\InstallPartial.ico 0 S1075IDS_SetupTips_19 STRINGS S1075 IDS_SetupTips_19 \Redist\Language Independent\OS Independent\InstallStateMenu.ico 0 -S1075AppProduct STRINGS S1075 AppProduct Apache HTTP Server 2.0.32 Beta 37303.5445601852 SYSTEM_GENERATED +S1075AppProduct STRINGS S1075 AppProduct Apache HTTP Server 2.0.35 37303.5445601852 SYSTEM_GENERATED S1075IDS__IsReadmeDlg_1 STRINGS S1075 IDS__IsReadmeDlg_1 Please read the following readme information carefully. 0 S1075IDS__IsDatabaseLocation_12 STRINGS S1075 IDS__IsDatabaseLocation_12 {&MSSWhiteSerif8}InstallShield 0 S1075IDS__IsDatabaseLocation_13 STRINGS S1075 IDS__IsDatabaseLocation_13 [ApplicationName] - Installation Wizard 0 @@ -4170,7 +4153,7 @@ S1075IDS_License_Refuse STRINGS S1075 IDS_License_Refuse I &do not accept the terms in the license agreement 36894.8526851852 S1075IDS_License_Accept STRINGS S1075 IDS_License_Accept I &accept the terms in the license agreement 36894.8525810185 S1075IDS__ReadMe_7 STRINGS S1075 IDS__ReadMe_7 \Readme-2.0.rtf 36894.8569675926 -S1075IDS_Dev_Warning STRINGS S1075 IDS_Dev_Warning This is a Beta Release of Apache 2.0. It is not yet considered Production Quality. 37303.7612268519 +S1075IDS_Dev_Warning STRINGS S1075 IDS_Dev_Warning 37303.7612268519 S1075IDS__ReadMe_0 STRINGS S1075 IDS__ReadMe_0 [ApplicationName] - Installation Wizard 36894.4960069444 S1075IDS__ReadMe_1 STRINGS S1075 IDS__ReadMe_1 {&MSSansBold8}Read This First 36894.4960069444 S1075IDS__ReadMe_2 STRINGS S1075 IDS__ReadMe_2 Read this Before Running Apache on Windows. 36895.9661805556 @@ -4249,11 +4232,12 @@ S1075Feature_BuildFiles_Description STRINGS S1075 Feature_BuildFiles_Description This feature installs the headers and libraries required to compile and link additional modules. 37120.7139930556 S1075Prog_so_desc STRINGS S1075 Prog_so_desc Apache Loadable Module 37120.8929976852 S1075Prog_conf_desc STRINGS S1075 Prog_conf_desc Configuration File 37120.8954513889 -S1075Shortcut_ApacheMonitor STRINGS S1075 Shortcut_ApacheMonitor Monitor 37121.5065509259 +S1075Shortcut_ApacheMonitor STRINGS S1075 Shortcut_ApacheMonitor Monitor Apache Servers 37354.8415046296 S1075Shortcuts_ApacheMonitorDesc STRINGS S1075 Shortcuts_ApacheMonitorDesc Show the Apache Service Monitor taskbar icon 37121.519212963 S1075Feature_SSL STRINGS S1075 Feature_SSL Ssl Binaries 37208.0862847222 S1075Feature_SSL_Description STRINGS S1075 Feature_SSL_Description The ssl_module and abs (ApacheBench/SSL) 37208.0863888889 S1075IDS_Package_Title STRINGS S1075 IDS_Package_Title Installation Database 37303.7598032407 +S1075Shortcut_ApacheMonitor_desc STRINGS S1075 Shortcut_ApacheMonitor_desc Apache Service Taskbar Icon 37354.8409490741 CHECKBOX_LAYOUT CHECKBOX_LAYOUT CHECKBOX_LAYOUT 1 LAUNCHPROGRAM CHECKBOX C16328 1 LAUNCHREADME CHECKBOX C16329 1 @@ -5123,12 +5107,12 @@ P791CommonFilesFolder PATHVARIABLES P791 CommonFilesFolder 1 P791ISProjectFolder PATHVARIABLES P791 ISProjectFolder 1 P791ISProductFolder PATHVARIABLES P791 ISProductFolder 1 -P791ApacheBuildFolder PATHVARIABLES P791 ApacheBuildFolder c:\asf-build\build-2.0.32 2 -P791ApacheTargetFolder PATHVARIABLES P791 ApacheTargetFolder c:\asf-build\target-2.0.32 2 +P791ApacheBuildFolder PATHVARIABLES P791 ApacheBuildFolder c:\asf-build\build-2.0.35 2 +P791ApacheTargetFolder PATHVARIABLES P791 ApacheTargetFolder c:\asf-build\target-2.0.35 2 ISAUTMERGEMODULE_LAYOUT ISAUTMERGEMODULE_LAYOUT ISAUTMERGEMODULE_LAYOUT 1 DISKMAP_LAYOUT DISKMAP_LAYOUT DISKMAP_LAYOUT 1 BUILDLABEL_LAYOUT BUILDLABEL_LAYOUT BUILDLABEL_LAYOUT 1 -win32 BUILDLABEL B4077 1 ##AppProduct_Description## 2.0.32 ##IDS_Dev_Warning## ##IDS_Package_Title## Apache HTTP Server 2.0.32 Beta {495826D5-C9CF-4E88-B694-382EE6A85AEC} 0 0 1 +win32 BUILDLABEL B4077 1 ##AppProduct_Description## 2.0.35 ##IDS_Dev_Warning## ##IDS_Package_Title## Apache HTTP Server 2.0.35 {495826D5-C9CF-4E88-B694-382EE6A85AEC} 0 0 1 Default PROPERTIES P4078 2 P4078ProductCode PROPERTIES P4078 ProductCode {3A862C7D-0504-48BC-AEF8-7F7479C7C158} 0 P4078UpgradeCode PROPERTIES P4078 UpgradeCode {0EA14757-3D48-4F78-878E-B9AF261753D9} 0 @@ -5972,10 +5956,6 @@ R171766R55613 0 R55622R175429 0 R176909R55622 0 -R176410R55607 0 -R176411R176410 0 -R176412R176411 0 -R176413R176412 0 R55601R55597 0 R55602R55597 0 C151062COMPONENT_LAYOUT 0 @@ -6010,10 +5990,6 @@ R173771R173770 0 R173772R173771 0 R173773R173772 0 -R176905R173770 0 -R176906R176905 0 -R176907R176906 0 -R176908R176907 0 R151086R151083 0 R151087R151083 0 R151088R151083 0 @@ -6151,6 +6127,7 @@ S185737S185727 0 S185738S185737 0 S160994S160992 0 +S201552S160994 0 S160995S160990 0 S160996S160990 0 A160997C160977 0 --------------------------------------------------------------------- To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org