Reviewers: cramsdale, Description: This patch adds some registry keys during installation of the GWT Developer Plugin. It also silences the reboot prompt. The new plugin should take effect when the user restarts the browser or reboots the system.
Testing: ======= Verified manually. Please review this at http://gwt-code-reviews.appspot.com/100811 Affected files: plugins/ie/installer/installer.wxs.xml plugins/ie/prebuilt/gwt-dev-plugin.msi Index: plugins/ie/prebuilt/gwt-dev-plugin.msi =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: plugins/ie/installer/installer.wxs.xml =================================================================== --- plugins/ie/installer/installer.wxs.xml (revision 6902) +++ plugins/ie/installer/installer.wxs.xml (working copy) @@ -2,24 +2,29 @@ <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> + <!-- Variables. --> + <?define appName = "Google Web Toolkit Developer Plugin" ?> + <?define version = "1.0.0" ?> + <?define upgradeCode = "9a5e649a-ec63-4c7d-99bf-75adb345e7e5" ?> + <!-- The main product to install. We generate a new GUID (*) on each compile to ensure that windows installer completely removes the old version and reinstalls the new version without complaining. --> <Product - Name='Google Web Toolkit Developer Plugin' + Name='$(var.appName)' Id='*' - UpgradeCode='9a5e649a-ec63-4c7d-99bf-75adb345e7e5' + UpgradeCode='$(var.upgradeCode)' Language='1033' Codepage='1252' - Version='1.0.0' + Version='$(var.version)' Manufacturer='Google'> <Package Id='*' Keywords='Installer' - Description='Google Web Toolkit Developer Plugin Installer' + Description='$(var.appName) Installer' Manufacturer='Google' InstallerVersion='100' Languages='1033' @@ -30,9 +35,12 @@ Cabinet='product.cab' EmbedCab='yes' /> + <!-- Suppress reboot prompts. --> + <Property Id='REBOOT'>ReallySuppress</Property> + <!-- Remove old version completely when upgrading. --> <Upgrade - Id='9a5e649a-ec63-4c7d-99bf-75adb345e7e5'> + Id='$(var.upgradeCode)'> <UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND' @@ -72,6 +80,30 @@ </Directory> </Directory> + <!-- Set some registry values. --> + <Component + Id='registryValues' + Directory='INSTALLDIR' + Guid='*'> + <RegistryKey + Root='HKLM' + Action='createAndRemoveOnUninstall' + Key='SOFTWARE\Google\Update\Clients\{$(var.upgradeCode)}'> + <RegistryValue + Name='pv' + Value='$(var.version)' + Type='string' /> + <RegistryValue + Name='name' + Value='$(var.appName)' + Type='string' /> + <RegistryValue + Name='lang' + Value='en' + Type='string' /> + </RegistryKey> + </Component> + <!-- Define the features to install. --> <Feature Id='CompleteFeature' @@ -84,7 +116,9 @@ --> <ComponentGroupRef Id='oophmDll' /> + <ComponentRef + Id='registryValues' /> </Feature> </Product> -</Wix> \ No newline at end of file +</Wix> -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
