Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 33469 invoked from network); 7 Jul 2006 02:04:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Jul 2006 02:04:19 -0000 Received: (qmail 30338 invoked by uid 500); 7 Jul 2006 02:04:18 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 30282 invoked by uid 500); 7 Jul 2006 02:04:18 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 30257 invoked by uid 99); 7 Jul 2006 02:04:18 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 19:04:18 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 19:04:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 583A51A981A; Thu, 6 Jul 2006 19:03:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r419766 - /httpd/mod_aspdotnet/trunk/installer.ism Date: Fri, 07 Jul 2006 02:03:52 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060707020353.583A51A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: wrowe Date: Thu Jul 6 19:03:52 2006 New Revision: 419766 URL: http://svn.apache.org/viewvc?rev=419766&view=rev Log: Prepare to roll seperate 2.0 and 2.2 installers Modified: httpd/mod_aspdotnet/trunk/installer.ism Modified: httpd/mod_aspdotnet/trunk/installer.ism URL: http://svn.apache.org/viewvc/httpd/mod_aspdotnet/trunk/installer.ism?rev=419766&r1=419765&r2=419766&view=diff ============================================================================== --- httpd/mod_aspdotnet/trunk/installer.ism (original) +++ httpd/mod_aspdotnet/trunk/installer.ism Thu Jul 6 19:03:52 2006 @@ -52,7 +52,7 @@ 1252 Installation Database - Apache mod_aspdotnet + ##ID_STRING3## ##COMPANY_NAME## Installer,MSI,Database ##ID_STRING1## @@ -253,7 +253,7 @@ ISSELFREG.DLL<ISProductFolder>\redist\language independent\i386\isregsvr.dll NewBinary1<ISProjectFolder>\resource\ApacheBanner.jpeg NewBinary10<ISProductFolder>\Redist\Language Independent\OS Independent\CompleteSetupIco.ibd - NewBinary11<ISProjectFolder>\msi_dll\resolve_apache.dll + NewBinary11<ReleaseBinaryFolder>\resolve_apache.dll NewBinary12<ISProductFolder>\Redist\Language Independent\OS Independent\DestIcon.ibd NewBinary13<ISProductFolder>\Redist\Language Independent\OS Independent\NetworkInstall.ico NewBinary14<ISProductFolder>\Redist\Language Independent\OS Independent\DontInstall.ico @@ -336,8 +336,8 @@ ISDotNetInstallerArgsCommit ISDotNetInstallerArgsUninstall ISDotNetInstallerArgsRollback - Apache.Web{0C479A89-29CD-4979-B4EF-5899EE72DD5A}GlobalAssemblyCache8Apache.Web.dll49 - html_docs{C66EA964-E1E5-4B5C-AAA4-C41F9330E44D}HTML817 + Apache.Web{0C479A89-29CD-4979-B4EF-5899EE72DD5A}GlobalAssemblyCache8Apache.Web.dll52 + manual_mod{F9BFC5A4-B70E-4F98-9FA5-A496C125590F}MANUAL_MOD8mod_aspdotnet.html.en1/LogFile=/LogFile=/LogFile=/LogFile= mod_aspdotnet.so{BA7DB173-11D7-4873-8F28-8A4FA6B86E33}APACHE_MODULES8mod_aspdotnet.so1 @@ -982,7 +982,6 @@ Directory_Component_ -
HTMLhtml_docs
@@ -997,6 +996,7 @@ + @@ -1063,13 +1063,15 @@ Feature_Component_ +
ISSelfRegisterFinalize1ISSELFREG.DLLISSelfRegisterFinalize ISUnSelfRegisterFiles1025ISSELFREG.DLLISUnSelfRegisterFiles ResolveApacheInstances257NewBinary11_ResolveApacheInstances@4Initialize the INSTALLDIR combo to valid Apache pathsSetARPReadme51ARPREADMEhttp://httpd.apache.org/mod_aspdotnet/introduction.html SetAllUsersProfileNT51ALLUSERSPROFILE[%SystemRoot]\Profiles\All Users SetApachePath35INSTALLDIR[_BrowseProperty] VerifyApachePath1NewBinary11_VerifyApachePath@4Test that INSTALLDIR is a valid Apache pathAPACHE_GROUPProgramFilesFolderAPACHE~1|Apache Group0 APACHE_MODULESAPACHE_ROOTmodules0 APACHE_ROOTINSTALLDIR.0 + APACHE_SOFTWARE_FOUNDATIONProgramFilesFolderAPACHE~1|Apache Software Foundation0 DOCSINSTALLDIRdocs0 DesktopFolderTARGETDIR.:Desktop0 FontsFolderTARGETDIR.:Fonts0 GlobalAssemblyCacheTARGETDIR.:Global~1|GlobalAssemblyCache0 HTMLDOCSHTML0 - INSTALLDIRAPACHE_GROUPapache20 + INSTALLDIRAPACHE_SOFTWARE_FOUNDATIONapache20 LocalAppDataFolderTARGETDIR.:LocalA~1|LocalAppData0 + MANUAL_MODINSTALLDIRMANUAL~1|manual/mod0 MyPicturesFolderTARGETDIR.:MyPict~1|MyPictures0 PDFDOCSPDF0 PersonalFolderTARGETDIR.:Personal0 @@ -1351,6 +1353,7 @@
mod_aspdotnetApache.Webmod_aspdotnetmanual_mod mod_aspdotnetmod_aspdotnet.so
@@ -1366,9 +1369,10 @@ ISBuildSourcePath ISAttributes ISComponentSubFolder_ - Apache.Web.Helpers.netmoduApache.WebAPACHE~1.NET|Apache.Web.Helpers.netmodule01<ISProjectFolder>\release\Apache.Web.Helpers.netmodule1 - Apache.Web.dllApache.WebAPACHE~1.DLL|Apache.Web.dll05121<ISProjectFolder>\release\Apache.Web.dll1 - mod_aspdotnet.somod_aspdotnet.soMOD_AS~1.SO|mod_aspdotnet.so001<ISProjectFolder>\release\mod_aspdotnet.so1 + Apache.Web.Helpers.netmoduApache.WebAPACHE~1.NET|Apache.Web.Helpers.netmodule01<ReleaseBinaryFolder>\Apache.Web.Helpers.netmodule1 + Apache.Web.dllApache.WebAPACHE~1.DLL|Apache.Web.dll05121<ReleaseBinaryFolder>\Apache.Web.dll1 + mod_aspdotnet.html.enmanual_modMOD_AS~1.EN|mod_aspdotnet.html.en01<ISProjectFolder>\docs\mod_aspdotnet.html.en1 + mod_aspdotnet.somod_aspdotnet.soMOD_AS~1.SO|mod_aspdotnet.so001<ReleaseBinaryFolder>\mod_aspdotnet.so1 @@ -1384,6 +1388,10 @@
TagData +
BiildCDROMEnabled + BiildInternetEnabled + BiildSingleExeEnabled + BiildSingleMSIEnabled
@@ -1535,7 +1543,7 @@ HTTPLocationMiscellaneous
Apache.Web_A19D17B5_68F0_4170_8BFD_6334E5F3CDEE_FILTER - html_docs_2D798142_97A8_40D0_B28D_1C72F2B3A710_FILTER + manual_mod_20314158_3C3F_44C1_9CCA_DC1728E242CB_FILTER mod_aspdotnet.so_00646B0C_1EA0_4FEE_A560_8FDA43CAD89A_FILTER
@@ -1614,6 +1622,7 @@ IncludeFiles ExcludeFiles ISAttributes + manual_mod<ISProjectFolder>\docs4mod_aspdotnet.html.en0 @@ -1753,8 +1762,8 @@ CabinetVolumeLabelSource -
1mod_aspdotnetRelease0 - 1mod_aspdotnetRelease 2.20 + 1mod_aspdotnet2.0Release0 + 1mod_aspdotnet2.2Release0
@@ -1867,6 +1876,7 @@ + @@ -1877,7 +1887,8 @@ ProductConfigurationFlagsGeneratePackageCode - + +
ISProjectFolder1 ObjectsRelease2 ProgramFilesFolder1ReleaseBinaryFolder<ISProjectFolder>\<Objects>2 SystemFolder1 WindowsFolder1 mod_aspdotnetmod\mod_aspdotnet.vcproj2
Default Configuration0mod_aspdotnet0mod_aspdotnet2.00mod_aspdotnet2.20
@@ -1891,6 +1902,23 @@ ISProductConfiguration_PropertyValue + + + + + + + + + + + + + + + +
mod_aspdotnet2.0MSIPackageFileNamemod_aspdotnet-2.0.0.2004mod_aspdotnet2.0PackageCode{AFB3093A-B243-4865-9130-13A1C9DA6A6E}mod_aspdotnet2.0PreProcessorDefinesAPACHE_VERSION=2.0mod_aspdotnet2.0ProductCode{18C26F50-5E08-4274-BC7B-430AF1FDD147}mod_aspdotnet2.0ProductNamemod_aspdotnet for Apache HTTP Server 2.0mod_aspdotnet2.0ProductVersion2.0.0.2004mod_aspdotnet2.0Subject##ID_STRING5##mod_aspdotnet2.0UpgradeCode{D7DEB71F-1CF3-4956-9AC9-2187FEE06F02}mod_aspdotnet2.2MSIPackageFileNamemod_aspdotnet-2.2.0.2004mod_aspdotnet2.2PackageCode{BAE8F78E-FE91-4E0A-9D9F-74AD2793777B}mod_aspdotnet2.2PreProcessorDefinesAPACHE_VERSION=2.2mod_aspdotnet2.2ProductCode{45261452-CE23-4440-BFBE-8085F2B9A183}mod_aspdotnet2.2ProductNamemod_aspdotnet for Apache HTTP Server 2.2mod_aspdotnet2.2ProductVersion2.2.0.2004mod_aspdotnet2.2SetupFileName + mod_aspdotnet2.2Subject##ID_STRING4##mod_aspdotnet2.2UpgradeCode{9E4E662E-946B-42E1-AFC0-74C648A1A11C}
@@ -1925,9 +1953,9 @@ MsiCommandLineISSetupPrerequisiteLocation
DebugDefault Configuration<ISProjectFolder>\DebugPackageName1103322Intel103330000MediaLocationhttp://75789 - Release 2.2mod_aspdotnet<ISProjectFolder>\ReleasePackageName1103321Intel103300100MediaLocationhttp://139276 - ReleaseDefault Configuration<ISProjectFolder>\ReleasePackageName1103322Intel103330000MediaLocationhttp://75789 - Releasemod_aspdotnet<ISProjectFolder>\ReleasePackageName1103321Intel103300100MediaLocationhttp://139276 + ReleaseDefault Configuration<ReleaseBinaryFolder>PackageName1103322Intel103330000MediaLocationhttp://75789 + Releasemod_aspdotnet2.0<ReleaseBinaryFolder>PackageName1103321Intel103300100MediaLocationhttp://67248140 + Releasemod_aspdotnet2.2<ReleaseBinaryFolder>PackageName1103321Intel103300100MediaLocationhttp://67248140
@@ -1968,11 +1996,11 @@ MsiEngineVersionWinMsi30UrlCertPassword -
.msi Installermod_aspdotnet0http://0installinstall[WindowsFolder]Downloaded Installations0http://www.installengine.com/Msiengine20http://www.installengine.com/Msiengine200http://www.installengine.com/cert05/isengine3http://www.installengine.com/cert05/dotnetfx3 + .msi Installermod_aspdotnet2.00http://0installinstall[WindowsFolder]Downloaded Installations0http://www.installengine.com/Msiengine20http://www.installengine.com/Msiengine200http://www.installengine.com/cert05/isengine3http://www.installengine.com/cert05/dotnetfx3 DebugDefault Configuration0http://0installinstall[WindowsFolder]Downloaded Installations0http://www.installengine.com/Msiengine20http://www.installengine.com/Msiengine200http://www.installengine.com/cert05/isengine3http://www.installengine.com/cert05/dotnetfx34 - Release 2.2mod_aspdotnet0http://0installinstall[WindowsFolder]Downloaded Installations0http://www.installengine.com/Msiengine20http://www.installengine.com/Msiengine200http://www.installengine.com/cert05/isengine3http://www.installengine.com/cert05/dotnetfx34 ReleaseDefault Configuration0http://0installinstall[WindowsFolder]Downloaded Installations0http://www.installengine.com/Msiengine20http://www.installengine.com/Msiengine200http://www.installengine.com/cert05/isengine3http://www.installengine.com/cert05/dotnetfx34 - Releasemod_aspdotnet0http://0installinstall[WindowsFolder]Downloaded Installations0http://www.installengine.com/Msiengine20http://www.installengine.com/Msiengine200http://www.installengine.com/cert05/isengine3http://www.installengine.com/cert05/dotnetfx34 + Releasemod_aspdotnet2.00http://0installinstall[WindowsFolder]Downloaded Installations0http://www.installengine.com/Msiengine20http://www.installengine.com/Msiengine200http://www.installengine.com/cert05/isengine3http://www.installengine.com/cert05/dotnetfx1103334 + Releasemod_aspdotnet2.20http://0installinstall[WindowsFolder]Downloaded Installations0http://www.installengine.com/Msiengine20http://www.installengine.com/Msiengine200http://www.installengine.com/cert05/isengine3http://www.installengine.com/cert05/dotnetfx110331634
@@ -2138,17 +2166,17 @@ EncodedCommentTimeStamp - + - - + + - - + + @@ -3041,6 +3069,10 @@ + + + + @@ -3182,10 +3214,10 @@ PropertyValue + @@ -3270,7 +3304,7 @@ - + @@ -3304,6 +3338,7 @@ PropertyValueISComments -
COMPANY_NAME1033The Apache Software Foundation0-1021924763COMPANY_NAME1033Apache Software Foundation0865777940 COMPANY_URI1033http://httpd.apache.org/0605450580 DN_AlwaysInstall1033Always Install0-1021924763 FEATURE_DESC1033Microsoft ASP.NET support module for Apache httpd Web Server0739664554 FEATURE_NAME1033Apache mod_aspdotnet0605430132 IDPROP_ARPCOMMENTS1033Your Comments0-1021924763IDPROP_ARPCONTACT1033Customer Support Department0-1021924763IDPROP_ARPHELPLINK1033http://www.yourcompany.com/help0-1021924763IDPROP_ARPCONTACT1033Peer to peer mailing list0865790260IDPROP_ARPHELPLINK1033http://httpd.apache.org/lists.html#http-users0865784116 IDPROP_ARPHELPTELEPHONE10331-555-555-45050-1021924763IDPROP_ARPURLINFOABOUT1033http://www.yourcompany.com0-1021924763IDPROP_ARPURLUPDATEINFO1033http://www.yourcompany.com/updateinfo0-1021924763IDPROP_ARPURLINFOABOUT1033http://httpd.apache.org0865747252IDPROP_ARPURLUPDATEINFO1033http://httpd.apache.org/mod_aspdotnet/0865747284 IDPROP_EXPRESS_LAUNCH_CONDITION_COLOR1033The color settings of your system are not adequate for running [ProductName].0-1021924763 IDPROP_EXPRESS_LAUNCH_CONDITION_OS1033The operating system is not adequate for running [ProductName].0-1021924763 IDPROP_EXPRESS_LAUNCH_CONDITION_PROCESSOR1033The processor is not adequate for running [ProductName].0-1021924763IDS__TargetReq_DESC_RESOLUTION1033The screen resolution is not adequate for running [ProductName].0-1021924763 ID_STRING11033No comment00 ID_STRING21033The install path must be an installed Apache httpd Web Server path. [1] was not a valid path to Apache.01687578668ID_STRING31033mod_aspdotnet for Apache 2.00865761524ID_STRING41033mod_aspdotnet for Apache 2.20865736980ID_STRING51033mod_aspdotnet for Apache 2.00865745172ID_STRING61033http://httpd.apache.org/mod_aspdotnet/introduction.html0865757492 NEW_STRING11033[ProductName] Installer Information01687606380 NEW_STRING61033[INSTALLDIR] is not a valid path to an installed instance of Apache.01687569580 NEW_STRING91033&Retry01687571628FileCost900FileCost FindRelatedProductsNOT ISSETUPDRIVEN420FindRelatedProducts ISInitAllUsersVersionNT And NOT Installed1010ISInitAllUsers - ISSelfRegisterCosting1510 - ISSelfRegisterFiles6420 - ISSelfRegisterFinalize6610 - ISUnSelfRegisterFiles1520 + ISSelfRegisterCosting2201 + ISSelfRegisterFiles5911 + ISSelfRegisterFinalize6601 + ISUnSelfRegisterFiles2202 InstallFiles4000InstallFiles InstallFinalize6600InstallFinalize InstallInitialize1500InstallInitialize @@ -3225,6 +3257,7 @@ ScheduleRebootISSCHEDULEREBOOT6410ScheduleReboot SelfRegModules5910SelfRegModules SelfUnregModules2200SelfUnregModules + SetARPReadme1001 SetAllUsersProfileNTVersionNT = 400720 SetODBCFolders1100SetODBCFolders StartServicesVersionNT5900StartServices @@ -3250,9 +3283,10 @@
ActiveLanguage1033ApplicationTypeApache HTTP Server Module Comments - CurrentMedia -RABlAGIAdQBnAAEARABlAGYAYQB1AGwAdAAgAEMAbwBuAGYAaQBnAHUAcgBhAHQAaQBvAG4A + CurrentMedia +UgBlAGwAZQBhAHMAZQABAG0AbwBkAF8AYQBzAHAAZABvAHQAbgBlAHQAMgAuADAA DefaultProductConfigurationmod_aspdotnet ISCompilerOption_Debug1MsiExecCmdLineOptions MsiLogFile OnUpgrade1OwnerThe Apache Software FoundationOwnerApache Software Foundation PatchFamilyMyPatchFamily PatchSequence1.0.0 PatchVersion1.0.0RMCCPSearchNot CCP_SUCCESS And CCP_TEST600RMCCPSearch ResolveApacheInstances430ResolveApacheInstances ResolveSourceNot Installed And Not PATCH960ResolveSource + SetARPReadme1001 SetupCompleteError-3SetupCompleteError SetupCompleteSuccess-1SetupCompleteSuccess SetupInitialization420SetupInitialization @@ -3510,12 +3545,10 @@
ARPCOMMENTS##IDPROP_ARPCOMMENTS## ARPCONTACT##IDPROP_ARPCONTACT## ARPHELPLINK##IDPROP_ARPHELPLINK## - ARPHELPTELEPHONE##IDPROP_ARPHELPTELEPHONE## ARPPRODUCTICONARPPRODUCTICON.exe - ARPREADME + ARPREADME##ID_STRING6## ARPURLINFOABOUT##IDPROP_ARPURLINFOABOUT## ARPURLUPDATEINFO##IDPROP_ARPURLUPDATEINFO## AgreeToLicenseNo @@ -3575,8 +3608,8 @@ ProductCode{18C26F50-5E08-4274-BC7B-430AF1FDD147} ProductIDnone ProductLanguage1033 - ProductNameApache mod_aspdotnet for Apache httpd Web Server - ProductVersion2.0.0.2003 + ProductNamemod_aspdotnet for Apache HTTP Server 2.0 + ProductVersion2.0.0.2004 ProgressType0install ProgressType1Installing ProgressType2installed