Updating the Gwt Developer Plugin for IE to use the latest terminology, and be headless.
Patch by: jlabanca
Review by: cramsdale
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6895 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/plugins/ie/installer/COPYING.rtf b/plugins/ie/installer/COPYING.rtf
deleted file mode 100644
index fb850bc..0000000
--- a/plugins/ie/installer/COPYING.rtf
+++ /dev/null
Binary files differ
diff --git a/plugins/ie/installer/GwtBanner.bmp b/plugins/ie/installer/GwtBanner.bmp
deleted file mode 100644
index 5e85ba2..0000000
--- a/plugins/ie/installer/GwtBanner.bmp
+++ /dev/null
Binary files differ
diff --git a/plugins/ie/installer/GwtDialog.bmp b/plugins/ie/installer/GwtDialog.bmp
deleted file mode 100644
index e60c1df..0000000
--- a/plugins/ie/installer/GwtDialog.bmp
+++ /dev/null
Binary files differ
diff --git a/plugins/ie/installer/README.txt b/plugins/ie/installer/README.txt
index 075533a..2c8094e 100644
--- a/plugins/ie/installer/README.txt
+++ b/plugins/ie/installer/README.txt
@@ -8,12 +8,4 @@
Files contained in this directory:
installer.wxs.xml - the WIX script used to generate the installer
-GwtDevModeIePluginInstaller.msi - the windows installer, which is replaced when the build script is executed
-
-GwtDialog.bmp - the image displayed on the first page of the installer
-
-GwtBanner.bmp - the image displayed at the top of every page other than the first in the installer
-
-COPYING.rtf - Our license agreement in RTF format
-
build.xml - the ant build script
\ No newline at end of file
diff --git a/plugins/ie/installer/build.xml b/plugins/ie/installer/build.xml
index 6f20317..6a9e572 100644
--- a/plugins/ie/installer/build.xml
+++ b/plugins/ie/installer/build.xml
@@ -8,42 +8,51 @@
<property name="project.tail" value="plugins/ie/installer" />
<import file="../../../common.ant.xml" />
- <property name="wix.bin" location="C:/Program Files/Windows Installer XML v3/bin" />
+ <property name="wix.bin"
+ location="C:/Program Files/Windows Installer XML v3/bin" />
<property name="wix.log" location="${project.build}/wix.log" />
- <property name="gwt.oophmIeInstallerName" value="GwtDevModeIePluginInstaller.msi" />
+ <property name="installer.name" value="gwt-dev-plugin.msi" />
<target name="build" description="Build the installer">
<mkdir dir="${project.build}" />
<echo message="Preparing WIX script for oophm.dll" />
- <exec executable="${wix.bin}/heat.exe" failonerror="yes" output="${wix.log}">
- <arg line="file ..\prebuilt\oophm.dll" />
+ <exec executable="${wix.bin}/heat.exe"
+ dir="../prebuilt"
+ failonerror="yes"
+ output="${wix.log}">
+ <arg line="file oophm.dll" />
<arg line="-out ${project.build}/oophm.wxs.xml" />
<arg line="-ag -g1" />
<arg line="-dr INSTALLDIR" />
<arg line="-cg oophmDll" />
- <arg line="-var var.PluginIeDir" />
+ <arg line="-var var.SourceDir" />
</exec>
<echo message="Compiling WIX scripts" />
- <exec executable="${wix.bin}/candle.exe" failonerror="yes" output="${wix.log}" append="true">
+ <exec executable="${wix.bin}/candle.exe"
+ failonerror="yes"
+ output="${wix.log}"
+ append="true">
<arg line="-out ${project.build}/" />
- <arg line="-dPluginIeDir=..\\" />
+ <arg line="-dSourceDir=..\\" />
<arg line="${project.build}/oophm.wxs.xml" />
<arg line="installer.wxs.xml" />
</exec>
<echo message="Generating Windows Installer" />
- <exec executable="${wix.bin}/light.exe" failonerror="yes" output="${wix.log}" append="true">
- <arg line="-o ${project.build}/${gwt.oophmIeInstallerName}" />
- <arg line="-ext WixUIExtension" />
+ <exec executable="${wix.bin}/light.exe"
+ failonerror="yes"
+ output="${wix.log}"
+ append="true">
+ <arg line="-o ${project.build}/${installer.name}" />
<arg line="${project.build}/oophm.wxs.wixobj" />
<arg line="${project.build}/installer.wxs.wixobj" />
</exec>
- <echo message="Copying Windows Installer to installer directory" />
- <copy file="${project.build}/${gwt.oophmIeInstallerName}"
- tofile="../prebuilt/${gwt.oophmIeInstallerName}" />
+ <echo message="Copying Windows Installer to prebuilt directory" />
+ <copy file="${project.build}/${installer.name}"
+ tofile="../prebuilt/${installer.name}" />
</target>
</project>
diff --git a/plugins/ie/installer/installer.wxs.xml b/plugins/ie/installer/installer.wxs.xml
index 54c9518..bcb9ba7 100644
--- a/plugins/ie/installer/installer.wxs.xml
+++ b/plugins/ie/installer/installer.wxs.xml
@@ -8,7 +8,7 @@
version and reinstalls the new version without complaining.
-->
<Product
- Name='GWT Development Mode Plugin for IE'
+ Name='Google Web Toolkit Developer Plugin'
Id='*'
UpgradeCode='9a5e649a-ec63-4c7d-99bf-75adb345e7e5'
Language='1033'
@@ -19,7 +19,7 @@
<Package
Id='*'
Keywords='Installer'
- Description='GWT Development Mode Plugin for IE Installer '
+ Description='Google Web Toolkit Developer Plugin Installer'
Manufacturer='Google'
InstallerVersion='100'
Languages='1033'
@@ -47,16 +47,6 @@
After='InstallValidate' />
</InstallExecuteSequence>
- <!-- Default to the old install directory if upgrading. -->
- <Property
- Id="INSTALLDIR">
- <RegistrySearch
- Id='OldInstallDirSarch'
- Type='raw'
- Root='HKLM'
- Key='Software\Google\GwtDevModePluginIE\InstallDir' />
- </Property>
-
<!-- Define the install directory. -->
<Directory
Id='TARGETDIR'
@@ -65,59 +55,26 @@
Id='ProgramFilesFolder'
Name='PFiles'>
<Directory
- Id='Google'
+ Id='GoogleDir'
Name='Google'>
- <!-- INSTALLDIR is configurable by the user. -->
<Directory
- Id='INSTALLDIR'
- Name='GWT Dev Mode Plugin for IE' />
+ Id='GoogleWebToolkitDir'
+ Name='Google Web Toolkit'>
+ <Directory
+ Id='DeveloperPluginDir'
+ Name='Developer Plugin'>
+ <Directory
+ Id='INSTALLDIR'
+ Name='IE' />
+ </Directory>
+ </Directory>
</Directory>
</Directory>
</Directory>
- <!-- Add an uninstall shortcut to the install directory. -->
- <DirectoryRef
- Id="INSTALLDIR">
- <Component
- Id='uninstaller'
- Guid='*'>
- <!--
- Save the install directory to the registry so we can reuse it
- on upgrades.
- -->
- <RegistryKey
- Root='HKLM'
- Action='createAndRemoveOnUninstall'
- Key='Software\Google\GwtDevModePluginIE\InstallDir'>
- <RegistryValue
- Value='[INSTALLDIR]'
- Type='string' />
- </RegistryKey>
- <Shortcut
- Id='UninstallShortcut'
- Name='Uninstall GWT Plugin for IE'
- Target='[System64Folder]msiexec.exe'
- Arguments='/x [ProductCode]'
- Description='Uninstalls GWT Development Mode Plugin for IE'
- WorkingDirectory='SystemDir'
- Directory='INSTALLDIR' />
-
- <!-- Remove the shortcut and installation folder on uninstall. -->
- <RemoveFile
- Id='RemoveUninstallShortcut'
- Name='Uninstall GWT Plugin for IE'
- On='uninstall' />
- <RemoveFolder
- Id='RemoveInstallFolder'
- On='uninstall' />
- </Component>
- </DirectoryRef>
-
<!-- Define the features to install. -->
<Feature
Id='CompleteFeature'
- Title='IE Plugin'
- Description='GWT Development Mode Plugin for IE.'
Display='expand'
Level='1'
Absent='disallow'>
@@ -127,37 +84,7 @@
-->
<ComponentGroupRef
Id='oophmDll' />
- <ComponentRef
- Id='uninstaller' />
</Feature>
- <!--
- Setup the installation UI. WixUI_InstallDir is a simple UI that
- let's the user choose the installation directory. WIXUI_INSTALLDIR
- defines the property that contains the install directory.
- -->
- <Property
- Id='WIXUI_INSTALLDIR'
- Value='INSTALLDIR' />
- <UIRef
- Id='WixUI_InstallDir' />
- <UIRef
- Id='WixUI_ErrorProgressText' />
-
- <!-- The license agreement in RTF format. -->
- <WixVariable
- Id='WixUILicenseRtf'
- Value='COPYING.rtf' />
-
- <!-- The image shown at the top of all pages but the first. -->
- <WixVariable
- Id='WixUIBannerBmp'
- Value='GwtBanner.bmp' />
-
- <!-- The image shown on the first page. -->
- <WixVariable
- Id='WixUIDialogBmp'
- Value='GwtDialog.bmp' />
-
</Product>
</Wix>
\ No newline at end of file
diff --git a/plugins/ie/prebuilt/GwtDevModeIePluginInstaller.msi b/plugins/ie/prebuilt/GwtDevModeIePluginInstaller.msi
deleted file mode 100644
index eac8e49..0000000
--- a/plugins/ie/prebuilt/GwtDevModeIePluginInstaller.msi
+++ /dev/null
Binary files differ
diff --git a/plugins/ie/prebuilt/gwt-dev-plugin.msi b/plugins/ie/prebuilt/gwt-dev-plugin.msi
new file mode 100644
index 0000000..072927e
--- /dev/null
+++ b/plugins/ie/prebuilt/gwt-dev-plugin.msi
Binary files differ
