Reviewers: scottb, Description: The IE installer version is currently hard coded into installer.wxs.xml, which makes it easy to accidentally create an installer with the wrong version. It also requires that we update installer.wxs.xml each time oophm.dll is updated.
Fix: ==== This patch requires that installer.version is passed into the build script, prompting the user with a fail message if it isn't. For convenience, we also check that the built script is run on a Windows system and that Wix is installed. This should help people building the installer for the first time. Please review this at http://gwt-code-reviews.appspot.com/116801 Affected files: plugins/ie/installer/build.xml plugins/ie/installer/installer.wxs.xml Index: plugins/ie/installer/build.xml =================================================================== --- plugins/ie/installer/build.xml (revision 7199) +++ plugins/ie/installer/build.xml (working copy) @@ -13,6 +13,18 @@ <property name="wix.log" location="${project.build}/wix.log" /> <property name="installer.name" value="gwt-dev-plugin.msi" /> + <!-- Verify that this is a windows system. --> + <fail unless="build.host.iswindows" + message="Installer can only be built on a Windows system." /> + + <!-- Verify that wix is installed. --> + <property.ensure name="wix.bin.exists" location="${wix.bin}" + message="You must install Wix (http://wix.sourceforge.net) to build the installer." /> + + <!-- Verify that the version has been specified. --> + <fail unless="installer.version" + message="You must specify installer.version parameter in the form major.minor.build.revision (ex. -Dinstaller.version=0.9.1234.0)" /> + <target name="build" description="Build the installer"> <mkdir dir="${project.build}" /> @@ -51,6 +63,7 @@ append="true"> <arg line="-out ${project.build}/" /> <arg line="-dSourceDir=..\\" /> + <arg line="-dversion=${installer.version}" /> <arg line="${project.build}/oophm.wxs.xml" /> <arg line="installer.wxs.xml" /> </exec> Index: plugins/ie/installer/installer.wxs.xml =================================================================== --- plugins/ie/installer/installer.wxs.xml (revision 7199) +++ plugins/ie/installer/installer.wxs.xml (working copy) @@ -4,7 +4,6 @@ <!-- Variables. --> <?define appName = "Google Web Toolkit Developer Plugin for IE" ?> - <?define version = "0.9.7135.0" ?> <?define upgradeCode = "9a5e649a-ec63-4c7d-99bf-75adb345e7e5" ?> <?define updateRegKey = "SOFTWARE\Google\Update\Clients\{$(var.upgradeCode)}" ?> <?define gwtRegKey = "SOFTWARE\Google\Google Web Toolkit\Installer" ?> -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
