<ant> becomes <gwt.ant> to support passing through specific props.
Versioning implemented.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@85 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/common.ant.xml b/common.ant.xml
index 795a29b..89ff007 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -7,7 +7,9 @@
<!-- Global Properties -->
<property environment="env" />
- <property name="gwt.version" value="${env.GWT_VERSION}" />
+ <condition property="gwt.version" value="${env.GWT_VERSION}" else="0.0.0">
+ <isset property="env.GWT_VERSION" />
+ </condition>
<property name="gwt.tools" location="${env.GWT_TOOLS}" />
<property name="gwt.tools.lib" location="${gwt.tools}/lib" />
<property name="gwt.tools.antlib" location="${gwt.tools}/antlib" />
@@ -33,6 +35,14 @@
<fail unless="gwt.tools.exists" message="Cannot find '${gwt.tools}' tools directory; perhaps you should define the GWT_TOOLS environment variable" />
<!-- Global Custom Tasks -->
+ <presetdef name="gwt.ant">
+ <ant inheritall="false" target="${target}">
+ <propertyset>
+ <propertyref name="gwt.version" />
+ </propertyset>
+ </ant>
+ </presetdef>
+
<presetdef name="gwt.javac">
<javac srcdir="src" destdir="${javac.out}" classpath="${unjar.out}" debug="${javac.debug}" debuglevel="${javac.debuglevel}" source="${javac.source}" nowarn="${javac.nowarn}" />
</presetdef>
@@ -89,7 +99,7 @@
</macrodef>
<macrodef name="gwt.checkstyle">
- <element name="sourcepath" implicit="yes" optional="true"/>
+ <element name="sourcepath" implicit="yes" optional="true" />
<sequential>
<taskdef resource="checkstyletask.properties" classpath="${gwt.tools.antlib}/checkstyle-all-4.2.jar;${gwt.build.lib}/gwt-customchecks.jar" />
<checkstyle config="${gwt.root}/eclipse/settings/code-style/gwtCheckStyle.xml" maxWarnings="0">
