Revision: 7231 Author: [email protected] Date: Wed Dec 2 08:20:40 2009 Log: tr...@7230 was merged into this branch Build file for IE plugin now requires a version parameter. svn merge --ignore-ancestry -c7230 https://google-web-toolkit.googlecode.com/svn/trunk/ .
Patch by: jlabanca http://code.google.com/p/google-web-toolkit/source/detail?r=7231 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/branch-info.txt Tue Dec 1 22:03:38 2009 +++ /releases/2.0/branch-info.txt Wed Dec 2 08:20:40 2009 @@ -1152,3 +1152,7 @@ Fixing TabLayoutPanel tab stacking (float -> cssFloat). svn merge --ignore-ancestry -c7228 https://google-web-toolkit.googlecode.com/svn/trunk/ . +tr...@7230 was merged into this branch + Build file for IE plugin now requires a version parameter. + svn merge --ignore-ancestry -c7230 https://google-web-toolkit.googlecode.com/svn/trunk/ . + ======================================= --- /releases/2.0/plugins/ie/installer/build.xml Fri Nov 20 09:51:31 2009 +++ /releases/2.0/plugins/ie/installer/build.xml Wed Dec 2 08:20:40 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> ======================================= --- /releases/2.0/plugins/ie/installer/installer.wxs.xml Fri Nov 20 09:51:31 2009 +++ /releases/2.0/plugins/ie/installer/installer.wxs.xml Wed Dec 2 08:20:40 2009 @@ -4,7 +4,6 @@ <!-- Variables. --> <?define appName = "Google Web Toolkit Developer Plugin for IE" ?> - <?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" ?> -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
