Revision: 7067 Author: jlaba...@google.com Date: Fri Nov 20 09:51:31 2009 Log: tr...@7066 was merged into this branch Update IE installer to run without admin privileges svn merge --ignore-ancestry -c7066 https://google-web-toolkit.googlecode.com/svn/trunk .
Patch by: jlabanca http://code.google.com/p/google-web-toolkit/source/detail?r=7067 Modified: /releases/2.0/branch-info.txt /releases/2.0/plugins/ie/installer/build.xml /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 Fri Nov 20 06:39:25 2009 +++ /releases/2.0/branch-info.txt Fri Nov 20 09:51:31 2009 @@ -866,3 +866,7 @@ Fixes issue where unit measurement divs could create document-level scrollbars on a small window. svn merge --ignore-ancestry -c7053 https://google-web-toolkit.googlecode.com/svn/trunk . +tr...@7066 was merged into this branch + Update IE installer to run without admin privileges + svn merge --ignore-ancestry -c7066 https://google-web-toolkit.googlecode.com/svn/trunk . + ======================================= --- /releases/2.0/plugins/ie/installer/build.xml Mon Nov 16 07:56:07 2009 +++ /releases/2.0/plugins/ie/installer/build.xml Fri Nov 20 09:51:31 2009 @@ -23,11 +23,26 @@ output="${wix.log}"> <arg line="file oophm.dll" /> <arg line="-out ${project.build}/oophm.wxs.xml" /> - <arg line="-ag -g1" /> + <arg line="-gg -g1" /> <arg line="-dr INSTALLDIR" /> <arg line="-cg oophmDll" /> <arg line="-var var.SourceDir" /> + <arg line="-indent 2" /> </exec> + <replace file="${project.build}/oophm.wxs.xml" + token='KeyPath="yes"' + value='KeyPath="no"' /> + <replace file="${project.build}/oophm.wxs.xml" + token='Directory="dir8D1DE08B7ED2BEAAD2CDE02C8AF2005E"' + value='Directory="INSTALLDIR"' /> + <replace file="${project.build}/oophm.wxs.xml"> + <replacetoken><![CDATA[<File]]></replacetoken> + <replacevalue><![CDATA[ + <RegistryKey Root="HKCU" Key="SOFTWARE\Google\Google Web Toolkit\Installer" Action="createAndRemoveOnUninstall"> + <RegistryValue Name="oophmDllRemove" Value="" Type="string" KeyPath="yes"/> + </RegistryKey> + <File]]></replacevalue> + </replace> <echo message="Compiling WIX scripts" /> <exec executable="${wix.bin}/candle.exe" ======================================= --- /releases/2.0/plugins/ie/installer/installer.wxs.xml Wed Nov 18 11:57:11 2009 +++ /releases/2.0/plugins/ie/installer/installer.wxs.xml Fri Nov 20 09:51:31 2009 @@ -4,8 +4,10 @@ <!-- Variables. --> <?define appName = "Google Web Toolkit Developer Plugin for IE" ?> - <?define version = "0.9.1.0" ?> + <?define version = "0.9.2.0" ?> <?define upgradeCode = "9a5e649a-ec63-4c7d-99bf-75adb345e7e5" ?> + <?define updateRegKey = "SOFTWARE\Google\Update\Clients\{$(var.upgradeCode)}" ?> + <?define gwtRegKey = "SOFTWARE\Google\Google Web Toolkit\Installer" ?> <!-- The main product to install. We generate a new GUID (*) on each @@ -26,6 +28,7 @@ Keywords='Installer' Description='$(var.appName) Installer' Manufacturer='Google' + InstallPrivileges='limited' InstallerVersion='100' Languages='1033' Compressed='yes' @@ -39,7 +42,7 @@ <Property Id='REBOOT'>ReallySuppress</Property> <!-- Install for current user. --> - <Property Id="ALLUSERS" Value="0" /> + <Property Id="ALLUSERS" Secure="yes" /> <!-- Remove old version completely when upgrading. --> <Upgrade @@ -63,20 +66,49 @@ Id='TARGETDIR' Name='SourceDir'> <Directory - Id='ProgramFilesFolder' - Name='PFiles'> + Id='LocalAppDataFolder' + Name='AppData'> <Directory Id='GoogleDir' Name='Google'> + <Component Id="RemoveGoogleDir" Guid="*" DiskId="1"> + <CreateFolder/> + <RemoveFolder Id="RemoveGoogleDirFolder" On="uninstall" /> + <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall"> + <RegistryValue Name="RemoveGoogleDirFolder" Value="" Type="string" KeyPath="yes"/> + </RegistryKey> + </Component> <Directory Id='GoogleWebToolkitDir' Name='Google Web Toolkit'> + <Component Id="RemoveGoogleWebToolkitDir" Guid="*" DiskId="1"> + <CreateFolder/> + <RemoveFolder Id="RemoveGoogleWebToolkitDirFolder" On="uninstall" /> + <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall"> + <RegistryValue Name="RemoveGoogleWebToolkitDirFolder" Value="" Type="string" KeyPath="yes"/> + </RegistryKey> + </Component> <Directory Id='DeveloperPluginDir' Name='Developer Plugin'> + <Component Id="RemoveDeveloperPluginDir" Guid="*" DiskId="1"> + <CreateFolder/> + <RemoveFolder Id="RemoveDeveloperPluginDirFolder" On="uninstall" /> + <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall"> + <RegistryValue Name="RemoveDeveloperPluginDirFolder" Value="" Type="string" KeyPath="yes"/> + </RegistryKey> + </Component> <Directory Id='INSTALLDIR' - Name='IE' /> + Name='IE'> + <Component Id="RemoveInstallDir" Guid="*" DiskId="1"> + <CreateFolder/> + <RemoveFolder Id="RemoveInstallerDirFolder" On="uninstall" /> + <RegistryKey Root="HKCU" Key="$(var.gwtRegKey)" Action="createAndRemoveOnUninstall"> + <RegistryValue Name="RemoveInstallerDirFolder" Value="" Type="string" KeyPath="yes"/> + </RegistryKey> + </Component> + </Directory> </Directory> </Directory> </Directory> @@ -91,7 +123,7 @@ <RegistryKey Root='HKCU' Action='createAndRemoveOnUninstall' - Key='SOFTWARE\Google\Update\Clients\{$(var.upgradeCode)}'> + Key='$(var.updateRegKey)'> <RegistryValue Name='pv' Value='$(var.version)' @@ -117,6 +149,14 @@ Loaded from oophm.wxs.xml, which is generated by the build script. --> + <ComponentRef + Id='RemoveGoogleDir' /> + <ComponentRef + Id='RemoveGoogleWebToolkitDir' /> + <ComponentRef + Id='RemoveDeveloperPluginDir' /> + <ComponentRef + Id='RemoveInstallDir' /> <ComponentGroupRef Id='oophmDll' /> <ComponentRef ======================================= --- /releases/2.0/plugins/ie/prebuilt/gwt-dev-plugin.msi Wed Nov 18 11:57:11 2009 +++ /releases/2.0/plugins/ie/prebuilt/gwt-dev-plugin.msi Fri Nov 20 09:51:31 2009 Binary file, no diff available. -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
