From: Rob M. <ro...@us...> - 2004-09-08 05:04:15
|
Update of /cvsroot/wix/wix/src/serverca/setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1152/src/serverca/setup Modified Files: sca.wxs Added Files: caerr.wxi Removed Files: scaerr.wxi Log Message: all - version WiX intermediate, library, and output files ca - fix out of memory crashes ca - show better error messages when SQL failure ca - build .wixlib for CustomActions candle, dark, light, lit - correctly handle -wx switch binder - parse Win32 .manifests to populate MSI compiler - allow LaunchConditions, AppSearch, and other search actions to use "Before" and "After" semantics compiler - add more error checking compiler - support DIFxApp v1.1 coming soon compiler - support Validation information on CustomTables compiler - clean up all condition processing compiler - add references to ca .wixlibs when using WiX CustomAction Library --- scaerr.wxi DELETED --- --- NEW FILE: caerr.wxi --- <Include> <?define msierrFirstRunNotAdmin = 25002?> <?define msierrMsiidSourceConsistency = 25003?> <?define msierrFailedInitializeInjector = 25090?> <?define msierrFailedChangeSource = 25091?> <?define msierrOws1 = 25101?> <?define msierrStstpkplNeeds_STS2 = 25111?> <?define msierrNoLaunchFromChainer = 25112?> <?define msierrIE5SetupNotAvailable = 25201?> <?define msierrIE5SetupCannotInstall = 25202?> <?define msierrAdminNotSupported = 25301?> <?define msierrQuietNotSupported = 25302?> <?define msierrCIWNotSupported = 25303?> <?define msierrPidkeyRequired = 25304?> <?define msierrOfficeLiteOverFull = 25305?> <?define msierrCMWNotSupported = 25306?> <?define msierrOrkPolEditSql = 25401?> <?define msierrOrkPolEditSql2 = 25402?> <?define msierrOrkPolEditData = 25403?> <?define msierrOrkPolEditReg = 25404?> <?define msierrMUINotSupported = 25452?> <?define msierrUrlTransformReq = 25501?> <?define msierrFeatureDepSql = 25502?> <?define msierrFeatureDepReadData = 25503?> <?define msierrFeatureDepFailed = 25504?> <?define msierrTSPidkeyRequired = 25505?> <?define msierrOSPCheckInsufficientVersion = 25506?> <?define msierrOSPCheckNoAccess = 25507?> <?define msierrOSPCheckAbsent = 25508?> <?define msierrOSPCheckAbsentOrNoAccess = 25509?> <?define msierrOSPCheckMissing = 25510?> <?define msierrSecureObjectsFailedCreateSD = 25520?> <?define msierrSecureObjectsFailedSet = 25521?> <?define msierrSecureObjectsUnknownType = 25522?> <?define msierrIISCannotConnect = 26001?> <?define msierrIISFailedReadWebs = 26002?> <?define msierrIISFailedReadWebDirs = 26003?> <?define msierrIISFailedReadVDirs = 26004?> <?define msierrIISFailedReadFilters = 26005?> <?define msierrIISFailedReadAppPool = 26006?> <?define msierrIISFailedReadMimeMap = 26007?> <?define msierrIISFailedReadProp = 26008?> <?define msierrIISFailedReadWebSvcExt = 26009?> <?define msierrIISFailedSchedTransaction = 26031?> <?define msierrIISFailedSchedInstallWebs = 26032?> <?define msierrIISFailedSchedInstallWebDirs = 26033?> <?define msierrIISFailedSchedInstallVDirs = 26034?> <?define msierrIISFailedSchedInstallFilters = 26035?> <?define msierrIISFailedSchedInstallAppPool = 26036?> <?define msierrIISFailedSchedInstallProp = 26037?> <?define msierrIISFailedSchedInstallWebSvcExt = 26038?> <?define msierrIISFailedSchedUninstallWebs = 26051?> <?define msierrIISFailedSchedUninstallWebDirs = 26052?> <?define msierrIISFailedSchedUninstallVDirs = 26053?> <?define msierrIISFailedSchedUninstallFilters = 26054?> <?define msierrIISFailedSchedUninstallAppPool = 26055?> <?define msierrIISFailedSchedUninstallProp = 26056?> <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?> <?define msierrIISFailedStartTransaction = 26101?> <?define msierrIISFailedOpenKey = 26102?> <?define msierrIISFailedCreateKey = 26103?> <?define msierrIISFailedWriteData = 26104?> <?define msierrIISFailedCreateApp = 26105?> <?define msierrIISFailedDeleteKey = 26106?> <?define msierrSQLFailedCreateDatabase = 26201?> <?define msierrSQLFailedDropDatabase = 26202?> <?define msierrSQLFailedConnectDatabase = 26203?> <?define msierrSQLFailedExecString = 26204?> <?define msierrSQLDatabaseAlreadyExists = 26205?> <?define msierrPERFMONFailedRegisterDLL = 26251?> <?define msierrPERFMONFailedUnregisterDLL = 26252?> <?define msierrSMBFailedCreate = 26301?> <?define msierrSMBFailedDrop = 26302?> <?define msierrCERTFailedOpen = 26351?> <?define msierrCERTFailedAdd = 26352?> <?define msierrUSRFailedUserCreate = 26401?> <?define msierrUSRFailedUserCreatePswd = 26402?> <?define msierrUSRFailedUserGroupAdd = 26403?> <?define msierrUSRFailedUserCreateExists = 26404?> <?define msierrDotNetRuntimeRequired = 27000?> </Include> Index: sca.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/serverca/setup/sca.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sca.wxs 7 Aug 2004 21:14:58 -0000 1.3 --- sca.wxs 8 Sep 2004 05:03:35 -0000 1.4 *************** *** 1,9 **** <?xml version='1.0'?> <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> ! <?include scaerr.wxi?> <!-- Server Custom Action Error Text Definitions --> ! <Fragment Id="IIsCustomActionErrors"> <UI> <Error Id='$(var.msierrIISCannotConnect)'>Cannot connect to Internet Information Server. ([2] [3] [4] [5])</Error> --- 1,9 ---- <?xml version='1.0'?> <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> ! <?include caerr.wxi?> <!-- Server Custom Action Error Text Definitions --> ! <Fragment Id='IIsCustomActionErrors'> <UI> <Error Id='$(var.msierrIISCannotConnect)'>Cannot connect to Internet Information Server. ([2] [3] [4] [5])</Error> *************** *** 41,69 **** <Error Id='$(var.msierrIISFailedDeleteKey)'>Failed to delete metabase key. ([2] [3] [4] [5])</Error> ! <ProgressText Action="ConfigureIIs">Configuring IIS.</ProgressText> ! <ProgressText Action="StartMetabaseTransaction">Starting IIS Metabase Transaction.</ProgressText> ! <ProgressText Action="RollbackMetabaseTransaction">Rolling back IIS Metabase Transaction.</ProgressText> ! <ProgressText Action="CommitMetabaseTransaction">Committing IIS Metabase Transaction.</ProgressText> ! <ProgressText Action="WriteMetabaseChanges">Installing Metabase Keys and Values.</ProgressText> </UI> </Fragment> ! <Fragment Id="SqlCustomActionErrors"> <UI> ! <Error Id='$(var.msierrSQLFailedCreateDatabase)'>Failed to create SQL database. ([2] [3] [4] [5])</Error> ! <Error Id='$(var.msierrSQLFailedDropDatabase)'>Failed to drop SQL database. ([2] [3] [4] [5])</Error> <Error Id='$(var.msierrSQLFailedConnectDatabase)'>Failed to connect to SQL database. ([2] [3] [4] [5])</Error> <Error Id='$(var.msierrSQLFailedExecString)'>Error [2]: failed to execute SQL string, error detail: [3], SQL key: [4] SQL string: [5]</Error> <Error Id='$(var.msierrSQLDatabaseAlreadyExists)'>'The database [3] already exists do you wish to continue?'</Error> ! <ProgressText Action="ConfigureSql">Configuring SQL Server.</ProgressText> ! <ProgressText Action="CreateDatabase">Creating Databases.</ProgressText> ! <ProgressText Action="DropDatabase">Dropping Databases.</ProgressText> ! <ProgressText Action="ExecuteSqlStrings">Executing SQL Strings.</ProgressText> ! <ProgressText Action="RollbackExecuteSqlStrings">Rolling back SQL Strings.</ProgressText> </UI> </Fragment> ! <Fragment Id="PerfMonCustomActionErrors"> <UI> <Error Id='$(var.msierrPERFMONFailedRegisterDLL)'>Failed to register DLL with PerfMon. ([2] [3] [4] [5])</Error> --- 41,69 ---- <Error Id='$(var.msierrIISFailedDeleteKey)'>Failed to delete metabase key. ([2] [3] [4] [5])</Error> ! <ProgressText Action='ConfigureIIs'>Configuring IIS.</ProgressText> ! <ProgressText Action='StartMetabaseTransaction'>Starting IIS Metabase Transaction.</ProgressText> ! <ProgressText Action='RollbackMetabaseTransaction'>Rolling back IIS Metabase Transaction.</ProgressText> ! <ProgressText Action='CommitMetabaseTransaction'>Committing IIS Metabase Transaction.</ProgressText> ! <ProgressText Action='WriteMetabaseChanges'>Installing Metabase Keys and Values.</ProgressText> </UI> </Fragment> ! <Fragment Id='SqlCustomActionErrors'> <UI> ! <Error Id='$(var.msierrSQLFailedCreateDatabase)'>Error [2]: failed to create SQL database: [3], error detail: [4].</Error> ! <Error Id='$(var.msierrSQLFailedDropDatabase)'>Error [2]: failed to drop SQL database: [3], error detail: [4].</Error> <Error Id='$(var.msierrSQLFailedConnectDatabase)'>Failed to connect to SQL database. ([2] [3] [4] [5])</Error> <Error Id='$(var.msierrSQLFailedExecString)'>Error [2]: failed to execute SQL string, error detail: [3], SQL key: [4] SQL string: [5]</Error> <Error Id='$(var.msierrSQLDatabaseAlreadyExists)'>'The database [3] already exists do you wish to continue?'</Error> ! <ProgressText Action='ConfigureSql'>Configuring SQL Server.</ProgressText> ! <ProgressText Action='CreateDatabase'>Creating Databases.</ProgressText> ! <ProgressText Action='DropDatabase'>Dropping Databases.</ProgressText> ! <ProgressText Action='ExecuteSqlStrings'>Executing SQL Strings.</ProgressText> ! <ProgressText Action='RollbackExecuteSqlStrings'>Rolling back SQL Strings.</ProgressText> </UI> </Fragment> ! <Fragment Id='PerfMonCustomActionErrors'> <UI> <Error Id='$(var.msierrPERFMONFailedRegisterDLL)'>Failed to register DLL with PerfMon. ([2] [3] [4] [5])</Error> *************** *** 72,76 **** </Fragment> ! <Fragment Id="FileShareCustomActionErrors"> <UI> <Error Id='$(var.msierrSMBFailedCreate)'>Failed to create network share. ([2] [3] [4] [5])</Error> --- 72,76 ---- </Fragment> ! <Fragment Id='FileShareCustomActionErrors'> <UI> <Error Id='$(var.msierrSMBFailedCreate)'>Failed to create network share. ([2] [3] [4] [5])</Error> *************** *** 79,83 **** </Fragment> ! <Fragment Id="CertificateCustomActionErrors"> <UI> <Error Id='$(var.msierrCERTFailedOpen)'>Failed to open certificate store. ([2] [3] [4] [5])</Error> --- 79,83 ---- </Fragment> ! <Fragment Id='CertificateCustomActionErrors'> <UI> <Error Id='$(var.msierrCERTFailedOpen)'>Failed to open certificate store. ([2] [3] [4] [5])</Error> *************** *** 86,90 **** </Fragment> ! <Fragment Id="UserCustomActionErrors"> <UI> <Error Id='$(var.msierrUSRFailedUserCreate)'>Failed to create user. ([2] [3] [4] [5])</Error> --- 86,90 ---- </Fragment> ! <Fragment Id='UserCustomActionErrors'> <UI> <Error Id='$(var.msierrUSRFailedUserCreate)'>Failed to create user. ([2] [3] [4] [5])</Error> *************** *** 97,102 **** <!-- Server Custom Action Definitions --> ! <Fragment Id="IIsCustomActions"> ! <FragmentRef Id="IIsCustomActionErrors"/> <CustomAction Id='ConfigureIIs' BinaryKey='ScaSchedule' DllEntry='ConfigureIIs' Execute='immediate' Return='check'/> --- 97,110 ---- <!-- Server Custom Action Definitions --> ! <Fragment Id='IIsCustomActions'> ! <IgnoreModularization Name='ConfigureIIs' Type='Action'/> ! <IgnoreModularization Name='StartMetabaseTransaction' Type='Action'/> ! <IgnoreModularization Name='RollbackMetabaseTransaction' Type='Action'/> ! <IgnoreModularization Name='CommitMetabaseTransaction' Type='Action'/> ! <IgnoreModularization Name='WriteMetabaseChanges' Type='Action'/> ! <IgnoreModularization Name='AddCertificate' Type='Action'/> ! <IgnoreModularization Name='DeleteCertificate' Type='Action'/> ! ! <FragmentRef Id='IIsCustomActionErrors'/> <CustomAction Id='ConfigureIIs' BinaryKey='ScaSchedule' DllEntry='ConfigureIIs' Execute='immediate' Return='check'/> *************** *** 104,113 **** <CustomAction Id='RollbackMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='RollbackMetabaseTransaction' Execute='rollback' Return='check'/> <CustomAction Id='CommitMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='CommitMetabaseTransaction' Execute='commit' Return='check'/> - <CustomAction Id='WriteMetabaseChanges' BinaryKey='ScaExecute' DllEntry='WriteMetabaseChanges' Execute='deferred' Return='check'/> </Fragment> ! <Fragment Id="SqlCustomActions"> ! <FragmentRef Id="SqlCustomActionErrors"/> <CustomAction Id='ConfigureSql' BinaryKey='ScaSchedule' DllEntry='ConfigureSql' Execute='immediate' Return='check'/> --- 112,132 ---- <CustomAction Id='RollbackMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='RollbackMetabaseTransaction' Execute='rollback' Return='check'/> <CustomAction Id='CommitMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='CommitMetabaseTransaction' Execute='commit' Return='check'/> <CustomAction Id='WriteMetabaseChanges' BinaryKey='ScaExecute' DllEntry='WriteMetabaseChanges' Execute='deferred' Return='check'/> + <CustomAction Id='AddCertificate' BinaryKey='ScaExecute' DllEntry='AddCertificate' Execute='deferred' Return='check' /> + <CustomAction Id='DeleteCertificate' BinaryKey='ScaExecute' DllEntry='DeleteCertificate' Execute='deferred' Return='check' /> + + <InstallExecuteSequence> + <Custom Action='ConfigureIIs' After='InstallFiles'/> + </InstallExecuteSequence> </Fragment> ! <Fragment Id='SqlCustomActions'> ! <IgnoreModularization Name='ConfigureSql' Type='Action'/> ! <IgnoreModularization Name='CreateDatabase' Type='Action'/> ! <IgnoreModularization Name='DropDatabase' Type='Action'/> ! <IgnoreModularization Name='ExecuteSqlStrings' Type='Action'/> ! <IgnoreModularization Name='RollbackExecuteSqlStrings' Type='Action'/> ! ! <FragmentRef Id='SqlCustomActionErrors'/> <CustomAction Id='ConfigureSql' BinaryKey='ScaSchedule' DllEntry='ConfigureSql' Execute='immediate' Return='check'/> *************** *** 116,123 **** <CustomAction Id='ExecuteSqlStrings' BinaryKey='ScaExecute' DllEntry='ExecuteSqlStrings' Execute='deferred' Return='check'/> <CustomAction Id='RollbackExecuteSqlStrings' BinaryKey='ScaExecute' DllEntry='ExecuteSqlStrings' Execute='rollback' Return='check'/> </Fragment> ! <Fragment Id="UserCustomActions"> ! <FragmentRef Id="UserCustomActionErrors"/> <!-- This is necessary to hide the CreateUser custom action data property that could potentially contain passwords --> --- 135,151 ---- <CustomAction Id='ExecuteSqlStrings' BinaryKey='ScaExecute' DllEntry='ExecuteSqlStrings' Execute='deferred' Return='check'/> <CustomAction Id='RollbackExecuteSqlStrings' BinaryKey='ScaExecute' DllEntry='ExecuteSqlStrings' Execute='rollback' Return='check'/> + + <InstallExecuteSequence> + <Custom Action='ConfigureSql' After='InstallFiles'/> + </InstallExecuteSequence> </Fragment> ! <Fragment Id='UserCustomActions'> ! <IgnoreModularization Name='ConfigureUsers' Type='Action'/> ! <IgnoreModularization Name='CreateUser' Type='Action'/> ! <IgnoreModularization Name='CreateUserRollback' Type='Action'/> ! <IgnoreModularization Name='RemoveUser' Type='Action'/> ! ! <FragmentRef Id='UserCustomActionErrors'/> <!-- This is necessary to hide the CreateUser custom action data property that could potentially contain passwords --> *************** *** 128,136 **** <CustomAction Id='CreateUserRollback' BinaryKey='ScaExecute' DllEntry='RemoveUser' Execute='rollback' Return='check'/> <!-- RemoveUser is a type commit action because it is not possible to rollback the removal of a user --> ! <CustomAction Id='RemoveUser' BinaryKey='ScaExecute' DllEntry='RemoveUser' Execute="commit" Return='check'/> </Fragment> ! <Fragment Id="FileShareCustomActions"> ! <FragmentRef Id="FileShareCustomActionErrors"/> <CustomAction Id='ConfigureSmb' BinaryKey='ScaSchedule' DllEntry='ConfigureSmb' Execute='immediate' Return='check'/> --- 156,173 ---- <CustomAction Id='CreateUserRollback' BinaryKey='ScaExecute' DllEntry='RemoveUser' Execute='rollback' Return='check'/> <!-- RemoveUser is a type commit action because it is not possible to rollback the removal of a user --> ! <CustomAction Id='RemoveUser' BinaryKey='ScaExecute' DllEntry='RemoveUser' Execute='commit' Return='check'/> ! ! <InstallExecuteSequence> ! <Custom Action='ConfigureUsers' After='InstallFiles'/> ! </InstallExecuteSequence> </Fragment> ! <Fragment Id='FileShareCustomActions'> ! <IgnoreModularization Name='ConfigureSmb' Type='Action'/> ! <IgnoreModularization Name='CreateSmb' Type='Action'/> ! <IgnoreModularization Name='CreateSmbRollback' Type='Action'/> ! <IgnoreModularization Name='DropSmb' Type='Action'/> ! ! <FragmentRef Id='FileShareCustomActionErrors'/> <CustomAction Id='ConfigureSmb' BinaryKey='ScaSchedule' DllEntry='ConfigureSmb' Execute='immediate' Return='check'/> *************** *** 139,160 **** <!-- DropSmb is a type commit action because it is not possible to rollback the removal of a fileshare --> <CustomAction Id='DropSmb' BinaryKey='ScaExecute' DllEntry='DropSmb' Execute='commit' Return='check'/> </Fragment> ! <Fragment Id="PerfMonCustomActions"> ! <FragmentRef Id="PerfMonCustomActionErrors"/> ! <CustomAction Id="ConfigurePerfmonInstall" BinaryKey="ScaSchedule" DllEntry="ConfigurePerfmonInstall" Execute="immediate" Return="check"/> ! <CustomAction Id="ConfigurePerfmonUninstall" BinaryKey="ScaSchedule" DllEntry="ConfigurePerfmonUninstall" Execute="immediate" Return="check"/> ! <CustomAction Id="RegisterPerfmon" BinaryKey="ScaExecute" DllEntry="RegisterPerfmon" Execute="deferred" Return="check"/> ! <CustomAction Id="UnregisterPerfmon" BinaryKey="ScaExecute" DllEntry="UnregisterPerfmon" Execute="deferred" Return="check"/> ! <CustomAction Id="RollbackRegisterPerfmon" BinaryKey="ScaExecute" DllEntry="UnregisterPerfmon" Execute="rollback" Return="check"/> ! <CustomAction Id="RollbackUnregisterPerfmon" BinaryKey="ScaExecute" DllEntry="RegisterPerfmon" Execute="rollback" Return="check"/> </Fragment> <!-- Server Custom Action DLL Definitions --> ! <Fragment Id="ServerCustomActionBinaries"> <Binary Id='ScaSchedule' src='scasched.dll'/> <Binary Id='ScaExecute' src='scaexec.dll'/> </Fragment> ! </Wix> \ No newline at end of file --- 176,213 ---- <!-- DropSmb is a type commit action because it is not possible to rollback the removal of a fileshare --> <CustomAction Id='DropSmb' BinaryKey='ScaExecute' DllEntry='DropSmb' Execute='commit' Return='check'/> + + <InstallExecuteSequence> + <Custom Action='ConfigureSmb' After='InstallFiles'/> + </InstallExecuteSequence> </Fragment> ! <Fragment Id='PerfMonCustomActions'> ! <IgnoreModularization Name='ConfigurePerfmonInstall' Type='Action'/> ! <IgnoreModularization Name='ConfigurePerfmonUninstall' Type='Action'/> ! <IgnoreModularization Name='RegisterPerfmon' Type='Action'/> ! <IgnoreModularization Name='UnregisterPerfmon' Type='Action'/> ! <IgnoreModularization Name='RollbackRegisterPerfmon' Type='Action'/> ! <IgnoreModularization Name='RollbackUnregisterPerfmon' Type='Action'/> ! <FragmentRef Id='PerfMonCustomActionErrors'/> ! ! <CustomAction Id='ConfigurePerfmonInstall' BinaryKey='ScaSchedule' DllEntry='ConfigurePerfmonInstall' Execute='immediate' Return='check'/> ! <CustomAction Id='ConfigurePerfmonUninstall' BinaryKey='ScaSchedule' DllEntry='ConfigurePerfmonUninstall' Execute='immediate' Return='check'/> ! <CustomAction Id='RegisterPerfmon' BinaryKey='ScaExecute' DllEntry='RegisterPerfmon' Execute='deferred' Return='check'/> ! <CustomAction Id='UnregisterPerfmon' BinaryKey='ScaExecute' DllEntry='UnregisterPerfmon' Execute='deferred' Return='check'/> ! <CustomAction Id='RollbackRegisterPerfmon' BinaryKey='ScaExecute' DllEntry='UnregisterPerfmon' Execute='rollback' Return='check'/> ! <CustomAction Id='RollbackUnregisterPerfmon' BinaryKey='ScaExecute' DllEntry='RegisterPerfmon' Execute='rollback' Return='check'/> ! ! <InstallExecuteSequence> ! <Custom Action="ConfigurePerfmonInstall" After="WriteRegistryValues"/> ! <Custom Action="ConfigurePerfmonUninstall" After="RemoveRegistryValues"/> ! </InstallExecuteSequence> </Fragment> <!-- Server Custom Action DLL Definitions --> ! <Fragment Id='ServerCustomActionBinaries'> <Binary Id='ScaSchedule' src='scasched.dll'/> <Binary Id='ScaExecute' src='scaexec.dll'/> </Fragment> ! </Wix> |