| Index: enterprise/installer/google_update_installer_fragment.wxs.xml
|
| diff --git a/enterprise/installer/google_update_installer_fragment.wxs.xml b/enterprise/installer/google_update_installer_fragment.wxs.xml
|
| deleted file mode 100644
|
| index 72f019fe8fe9eb07ba7eeb5684edaae8db5e8952..0000000000000000000000000000000000000000
|
| --- a/enterprise/installer/google_update_installer_fragment.wxs.xml
|
| +++ /dev/null
|
| @@ -1,125 +0,0 @@
|
| -<?xml version='1.0' encoding='windows-1252'?>
|
| -<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
|
| - <?define UpdateKeyPath = 'SOFTWARE\Google\Update' ?>
|
| -
|
| - <!-- This fragment assumes machine install (ALLUSER=1). -->
|
| -
|
| - <Fragment Id='FragmentGoogleUpdate' >
|
| - <!-- Detect whether product is already registered with Google Update. -->
|
| - <Property Id='PRODUCT_REGISTERED_VERSION'>
|
| - <RegistrySearch Id='$(var.ProductNameLegalIdentifier)RegistrationSearch'
|
| - Root='HKLM'
|
| - Key='$(var.UpdateKeyPath)\Clients\$(var.ProductGuid)'
|
| - Name='pv' Type='raw' />
|
| - </Property>
|
| -
|
| - <Binary Id='GoogleUpdateSetup'
|
| - SourceFile='$(var.GoogleUpdateMetainstallerPath)' />
|
| -
|
| - <!-- This fragment needs a component that can be referenced.
|
| - Components must be in Directory[Ref] elements and cannot be empty.
|
| - Thus, we have a registry value write that has no effect.
|
| - To avoid multiple Directory elements with the 'ProgramFilesFolder' Id,
|
| - assume that the product MSI has defined a it and reference it here. -->
|
| - <DirectoryRef Id='ProgramFilesFolder'>
|
| - <Directory Id='GoogleProgramDir' Name='Google'>
|
| - <Directory Id='UpdateDir' Name='Update'>
|
| -
|
| - <Component Id='ComponentGoogleUpdate'
|
| - 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' />
|
| - <?ifdef UsingGoogleUpdate_1_2_171_OrLater?>
|
| - <RegistryValue Id='NonEmptyComponent' Action='write'
|
| - Root='HKLM'
|
| - Key='$(var.UpdateKeyPath)\ClientState\$(var.ProductGuid)'
|
| - Name='EnterpriseInstall' Type='string' Value='$(var.ProductVersion)' />
|
| - <?else?>
|
| - <RegistryValue Id='NonEmptyComponent' Action='write'
|
| - Root='HKLM'
|
| - Key='$(var.UpdateKeyPath)\ClientState\$(var.ProductGuid)'
|
| - Name='EnterpriseInstall' Type='integer' Value='1' />
|
| - <?endif?>
|
| - </Component>
|
| -
|
| - </Directory>
|
| - </Directory>
|
| - </DirectoryRef>
|
| -
|
| - <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' />
|
| - <CustomAction Id='RollbackGoogleUpdateRegistration'
|
| - BinaryKey='GoogleUpdateSetup'
|
| - Impersonate='no'
|
| - Execute='rollback'
|
| - ExeCommand='/unregisterproduct "[ProductTag]"'
|
| - Return='check' />
|
| - <!-- TODO(omaha): If /registerproduct is deprecated in favor of an
|
| - "install Omaha only" switch, we might need to update this fragment to
|
| - write the pv value to the product's ClientState. Otherwise, Omaha
|
| - might uninstall itself before the product's normal install flow writes
|
| - these values. -->
|
| - <CustomAction Id='InstallGoogleUpdateAndRegister'
|
| - BinaryKey='GoogleUpdateSetup'
|
| - Impersonate='no'
|
| - Execute='deferred'
|
| - ExeCommand='/registerproduct "[ProductTag]" /installsource enterprisemsi'
|
| - Return='check' />
|
| -
|
| - <InstallExecuteSequence>
|
| - <!-- Build tag property. -->
|
| - <Custom Action='SetProductTagProperty'
|
| - Before='AppendCustomParamsToProductTagProperty'>
|
| - (($ComponentGoogleUpdate>2) OR REINSTALL) AND (NOT DISABLE_UPDATES)
|
| - </Custom>
|
| - <Custom Action='AppendCustomParamsToProductTagProperty'
|
| - Before='AppendBrandToProductTagProperty'>
|
| - (($ComponentGoogleUpdate>2) OR REINSTALL) AND (NOT DISABLE_UPDATES)
|
| - </Custom>
|
| - <Custom Action='AppendBrandToProductTagProperty'
|
| - Before='RollbackGoogleUpdateRegistration'>
|
| - (($ComponentGoogleUpdate>2) OR REINSTALL) AND (NOT DISABLE_UPDATES) AND (BRAND <> "")
|
| - </Custom>
|
| -
|
| - <!-- Install Google Update before 'InstallFiles' so that brand, etc. will
|
| - be present when the product is installed. -->
|
| - <Custom Action='RollbackGoogleUpdateRegistration'
|
| - Before='InstallGoogleUpdateAndRegister'
|
| - >
|
| - (($ComponentGoogleUpdate>2) OR REINSTALL) AND (NOT DISABLE_UPDATES) AND (PRODUCT_REGISTERED_VERSION = "")
|
| - </Custom>
|
| - <Custom Action='InstallGoogleUpdateAndRegister'
|
| - Before='InstallFiles'>
|
| - (($ComponentGoogleUpdate>2) OR REINSTALL) AND (NOT DISABLE_UPDATES)
|
| - </Custom>
|
| -
|
| - <!-- Google Update will uninstall itself if the product is the only
|
| - registered product, so no need to have an uninstall operation.
|
| - Uninstall actions would not run when expected anyway if Omaha updates
|
| - the product using a normal MSI installer (without this fragment).
|
| - Information about this installer would be lost. Also, the uninstall
|
| - action might run during the first update.-->
|
| -
|
| - </InstallExecuteSequence>
|
| -
|
| - </Fragment>
|
| -</Wix>
|
|
|