Revision: 7230 Author: [email protected] Date: Wed Dec 2 08:16:54 2009 Log: Updating the build script for the IE dev mode plugin to require a version number. Also adding useful fail messages when Wix is not installed.
Patch by: jlabanca Review by: scottb http://code.google.com/p/google-web-toolkit/source/detail?r=7230 Modified: /trunk/plugins/ie/installer/build.xml /trunk/plugins/ie/installer/installer.wxs.xml ======================================= --- /trunk/plugins/ie/installer/build.xml Fri Nov 20 09:49:22 2009 +++ /trunk/plugins/ie/installer/build.xml Wed Dec 2 08:16:54 2009 @@ -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> ======================================= --- /trunk/plugins/ie/installer/installer.wxs.xml Mon Nov 23 16:38:01 2009 +++ /trunk/plugins/ie/installer/installer.wxs.xml Wed Dec 2 08:16:54 2009 @@ -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
