enterprise/installer/enterprise_standalone_installer.wxs.xml - Issue 624713003: Keep only base/extractor.[cc|h].

Unified Diff: enterprise/installer/enterprise_standalone_installer.wxs.xml

Issue 624713003: Keep only base/extractor.[cc|h]. (Closed) Base URL: https://chromium.googlesource.com/external/omaha.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « enterprise/installer/enterprise_installer.wxs.xml ('k') | enterprise/installer/google_update_installer_fragment.wxs.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: enterprise/installer/enterprise_standalone_installer.wxs.xml

diff --git a/enterprise/installer/enterprise_standalone_installer.wxs.xml b/enterprise/installer/enterprise_standalone_installer.wxs.xml

deleted file mode 100644

index 2ca7d94870267312814c6e9c7ecb620e8e643ae3..0000000000000000000000000000000000000000

--- a/enterprise/installer/enterprise_standalone_installer.wxs.xml

+++ /dev/null

@@ -1,257 +0,0 @@

-<?xml version='1.0' encoding='windows-1252'?>

-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>

- <?define CompanyFullName = 'Google, Inc.'?>

- <?define UpdateKeyPath = 'SOFTWARE\Google\Update' ?>

- <?define InstallCommandBase='/silent /install "[ProductTag]" /installsource enterprisemsi'?>

- <Product

- Id='$(var.MsiProductId)'

- Name='$(var.ProductName)'

- Language='1033'

- Codepage='1252'

- UpgradeCode='$(var.MsiUpgradeCode)'

- Version='$(var.ProductVersion)'

- Manufacturer='$(var.CompanyFullName)'>

- <Package

- Id='*'

- Description='$(var.ProductName) Installer'

- Comments='$(var.Copyright)'

- Manufacturer='$(var.CompanyFullName)'

- Languages='1033'

- SummaryCodepage='1252'

- InstallerVersion='150'

- InstallPrivileges='elevated'

- Compressed='yes' />

- <Upgrade Id='$(var.MsiUpgradeCode)'>

- <UpgradeVersion Property='UPGRADING'

- OnlyDetect='no'

- Minimum='0.0.0.0' IncludeMinimum='yes'

- Maximum='$(var.ProductVersion)' IncludeMaximum='no' />

- <UpgradeVersion Property='NEWERVERSIONDETECTED'

- OnlyDetect='yes'

- Minimum='$(var.ProductVersion)' IncludeMinimum='yes' />

- </Upgrade>

-

- <Property Id='ALLUSERS' Value='1' />

- <?ifdef ProductIcon ?>

- <!-- If var.ProductIcon is defined, use that as an icon in the ARP

- dialog, otherwise rely on the ARP dialog's heuristics:

- http://blogs.msdn.com/oldnewthing/archive/2004/07/09/178342.aspx -->

- <Icon Id='icon.ico' SourceFile='$(var.ProductIcon)'/>

- <Property Id='ARPPRODUCTICON' Value='icon.ico' />

- <?endif?>

- <!-- ARPNOMODIFY does two things:

- 1) Removes the 'Modify' button from the ARP dialog.

- 2) Causes the 'Remove' command to invoke msiexec /X instead of /I

- (the intent being that WITH a Modify button, clicking either

- Modify or Remove command will launch your installer UI). -->

- <Property Id='ARPNOMODIFY' Value='1' />

- <!-- Find the uninstall string to be used for the product. Only used for

- uninstallation. -->

- <Property Id='UNINSTALLCMDLINE'>

- <RegistrySearch Id='UninstallCmdSearch'

- Root='HKLM'

- Type='raw'

- Key='Software\Google\Update\ClientState\$(var.ProductGuid)'

- Name='UninstallString'/>

- </Property>

- <Property Id='UNINSTALLCMDARGS'>

- <RegistrySearch Id='UninstallArgSearch'

- Root='HKLM'

- Type='raw'

- Key='Software\Google\Update\ClientState\$(var.ProductGuid)'

- Name='UninstallArguments'/>

- </Property>

- <UI>

- <Error Id='4000'>A newer version of the $(var.ProductName) enterprise installer is already installed.</Error>

- </UI>

- <!-- Eliminates "warning LGHT1076 : ICE71: The Media table has no entries."

- -->

- <Media Id='1' />

- <Directory Id='TARGETDIR' Name='SourceDir'>

- <Directory Id='ProgramFilesFolder'>

- <Directory Id='GoogleProgramDir' Name='Google'>

- <Directory Id='UpdateDir' Name='Update'>

- <Component Id='ProductClientState'

- Guid='6B528A57-0CD8-4b26-85F8-1CA05523B8F1'>

- <!-- Clear the last UI string before running the installer so we know

- that any value present upon rollback is fresh. -->

- <RemoveRegistryValue Key='$(var.UpdateKeyPath)\ClientState\$(var.ProductGuid)'

- Name='LastInstallerResultUIString'

- Root='HKLM' />

- <RemoveRegistryValue Key='$(var.UpdateKeyPath)'

- Name='LastInstallerResultUIString'

- Root='HKLM' />

- <RegistryValue Id='NonEmptyComponent' Action='write'

- Root='HKLM'

- Key='$(var.UpdateKeyPath)\ClientState\$(var.ProductGuid)'

- Name='EnterpriseInstall' Type='string' Value='$(var.ProductVersion)' />

- </Component>

- </Directory>

- <Feature Id='Complete' Level='1'>

- <ComponentRef Id='ProductClientState' />

- </Feature>

- <!--TODO(omaha): Add "Standalone" after fixing the ProductName issue

- in standalone_installer.py.-->

- <Binary Id='$(var.ProductNameLegalIdentifier)Installer'

- SourceFile='$(var.StandaloneInstallerPath)' />

- <Binary Id='ShowInstallerResultUIStringDll'

- SourceFile='$(var.ShowErrorCADll)' />

- <CustomAction Id='NewerVersionError' Error='4000'/>

- <CustomAction Id='SetProductTagProperty'

- Property='ProductTag'

- Value='appguid=$(var.ProductGuid)&appname=$(var.ProductName)&needsAdmin=True'

- Execute='immediate'

- Return='check' />

- <CustomAction Id='AppendCustomParamsToProductTagProperty'

- Property='ProductTag'

- Value='[ProductTag]$(var.ProductCustomParams)'

- Execute='immediate'

- Return='check' />

- <CustomAction Id='AppendBrandToProductTagProperty'

- Property='ProductTag'

- Value='[ProductTag]&brand=[BRAND]'

- Execute='immediate'

- Return='check' />

- <?ifdef ProductInstallerData ?>

- <CustomAction Id='BuildInstallCommand'

- Property='InstallCommand'

- Value='$(var.InstallCommandBase) /appargs "appguid=$(var.ProductGuid)&installerdata=$(var.ProductInstallerData)"'

- Execute='immediate'

- Return='check' />

- <?else?>

- <CustomAction Id='BuildInstallCommand'

- Property='InstallCommand'

- Value='$(var.InstallCommandBase)'

- Execute='immediate'

- Return='check' />

- <?endif?>

- <!-- Send the ProductGuid to the ShowInstallerResultUIString custom action.

- The value is accessed through the "CustomActionData" property from

- within the action itself. -->

- <CustomAction Id='SetAppGuidProperty'

- Property='ShowInstallerResultUIString'

- Value='$(var.ProductGuid)' />

- <!-- A custom action to be executed on rollback to log and display the

- LastInstallerResultUIString. -->

- <CustomAction Id='ShowInstallerResultUIString'

- BinaryKey='ShowInstallerResultUIStringDll'

- DllEntry='ShowInstallerResultUIString'

- Execute='rollback'

- Impersonate='no' />

- <CustomAction Id='DoInstall'

- BinaryKey='$(var.ProductNameLegalIdentifier)Installer'

- Impersonate='no'

- Execute='deferred'

- ExeCommand='[InstallCommand]'

- Return='check' />

- <CustomAction Id='CallUninstaller.SetProperty'

- Property='UninstallCmd'

- Value='[UNINSTALLCMDLINE]'

- Execute='immediate'

- Return='check' />

- <CustomAction Id='CallUninstallerArgs.SetProperty'

- Property='UninstallCmdArgs'

- Value='[UNINSTALLCMDARGS]'

- Execute='immediate'

- Return='check' />

- <CustomAction Id='CallUninstaller'

- Property='UninstallCmd'

- ExeCommand='[UninstallCmdArgs] $(var.ProductUninstallerAdditionalArgs)'

- Impersonate='no'

- Execute='deferred'

- Return='check' />

- <InstallExecuteSequence>

- <RemoveExistingProducts After='InstallValidate' />

- <Custom Action='NewerVersionError' After='FindRelatedProducts'>

- NEWERVERSIONDETECTED

- </Custom>

-

- <Custom Action='SetProductTagProperty'

- Before='AppendCustomParamsToProductTagProperty'>

- (($ProductClientState>2) OR REINSTALL)

- </Custom>

- <Custom Action='AppendCustomParamsToProductTagProperty'

- Before='AppendBrandToProductTagProperty'>

- (($ProductClientState>2) OR REINSTALL)

- </Custom>

- <Custom Action='AppendBrandToProductTagProperty'

- Before='BuildInstallCommand'>

- (($ProductClientState>2) OR REINSTALL) AND (BRAND <> "")

- </Custom>

- <Custom Action='BuildInstallCommand'

- Before='SetAppGuidProperty'>

- (($ProductClientState>2) OR REINSTALL)

- </Custom>

- <Custom Action='SetAppGuidProperty'

- Before='ShowInstallerResultUIString'>

- (($ProductClientState>2) OR REINSTALL)

- </Custom>

- <Custom Action='ShowInstallerResultUIString'

- Before='DoInstall'>

- (($ProductClientState>2) OR REINSTALL)

- </Custom>

- <!-- TODO(omaha): Support Rollback? I do not think so because there are

- very few cases where the app could be installed but Omaha would

- report a failure. If we support rollback, need to determine whether

- Product was installed before and only add the rollback then.

- <Custom Action='Rollback$(var.ProductNameLegalIdentifier)'

- After='InstallFiles'>

- (($ProductClientState>2) OR REINSTALL) AND (NOT $(var.ProductNameLegalIdentifier)_INSTALLED)

- </Custom>

- Change After='InstallFiles' below to

- After='Rollback$(var.ProductNameLegalIdentifier)'. -->

- <Custom Action='DoInstall'

- After='InstallFiles'>

- (($ProductClientState>2) OR REINSTALL)

- </Custom>

- <Custom Action='CallUninstallerArgs.SetProperty'

- Before='CallUninstaller.SetProperty'>

- $ProductClientState=2

- </Custom>

- <Custom Action='CallUninstaller.SetProperty'

- Before='CallUninstaller'>

- $ProductClientState=2

- </Custom>

- <Custom Action='CallUninstaller'

- Before='RemoveFiles'>

- $ProductClientState=2

- </Custom>

- <!-- Google Update will uninstall itself if the product is the only app it

- so no need to have an uninstall operation. -->

- </InstallExecuteSequence>

- </Product>

-</Wix>

« no previous file with comments | « enterprise/installer/enterprise_installer.wxs.xml ('k') | enterprise/installer/google_update_installer_fragment.wxs.xml » ('j') | no next file with comments »