Revision: 6997 Author: [email protected] Date: Wed Nov 18 11:57:11 2009 Log: tr...@6938,6995 was merged into this branch Updates IE plugin installer to install for current user only. svn merge --ignore-ancestry -c6938,6995 https://google-web-toolkit.googlecode.com/svn/trunk .
Patch by: jlabanca http://code.google.com/p/google-web-toolkit/source/detail?r=6997 Modified: /releases/2.0/branch-info.txt /releases/2.0/plugins/ie/installer/installer.wxs.xml /releases/2.0/plugins/ie/prebuilt/gwt-dev-plugin.msi ======================================= --- /releases/2.0/branch-info.txt Wed Nov 18 11:37:52 2009 +++ /releases/2.0/branch-info.txt Wed Nov 18 11:57:11 2009 @@ -778,3 +778,7 @@ Remove the now unnecessary -XstartOnFirstThread argument. svn merge --ignore-ancestry -c6993 https://google-web-toolkit.googlecode.com/svn/trunk . +tr...@6938,6995 was merged into this branch + Updates IE plugin installer to install for current user only. + svn merge --ignore-ancestry -c6938,6995 https://google-web-toolkit.googlecode.com/svn/trunk . + ======================================= --- /releases/2.0/plugins/ie/installer/installer.wxs.xml Mon Nov 16 08:25:35 2009 +++ /releases/2.0/plugins/ie/installer/installer.wxs.xml Wed Nov 18 11:57:11 2009 @@ -4,7 +4,7 @@ <!-- Variables. --> <?define appName = "Google Web Toolkit Developer Plugin for IE" ?> - <?define version = "0.9.0" ?> + <?define version = "0.9.1.0" ?> <?define upgradeCode = "9a5e649a-ec63-4c7d-99bf-75adb345e7e5" ?> <!-- @@ -38,13 +38,16 @@ <!-- Suppress reboot prompts. --> <Property Id='REBOOT'>ReallySuppress</Property> + <!-- Install for current user. --> + <Property Id="ALLUSERS" Value="0" /> + <!-- Remove old version completely when upgrading. --> <Upgrade Id='$(var.upgradeCode)'> <UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND' - Minimum='0.0.0' + Minimum='0.0.0.0' IncludeMinimum='yes' RemoveFeatures='all' /> </Upgrade> @@ -86,7 +89,7 @@ Directory='INSTALLDIR' Guid='*'> <RegistryKey - Root='HKLM' + Root='HKCU' Action='createAndRemoveOnUninstall' Key='SOFTWARE\Google\Update\Clients\{$(var.upgradeCode)}'> <RegistryValue ======================================= --- /releases/2.0/plugins/ie/prebuilt/gwt-dev-plugin.msi Mon Nov 16 08:25:35 2009 +++ /releases/2.0/plugins/ie/prebuilt/gwt-dev-plugin.msi Wed Nov 18 11:57:11 2009 Binary file, no diff available. -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
