<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/build-tools/build.xml b/build-tools/build.xml index 07e8927..af2c8c0 100644 --- a/build-tools/build.xml +++ b/build-tools/build.xml
@@ -7,11 +7,11 @@ <property name="target" value="build" /> <target name="customchecks" description="Build the checkstyle extensions"> - <ant dir="customchecks" inheritall="false" target="${target}" /> + <gwt.ant dir="customchecks" /> </target> <target name="doctool" description="Build the doctool"> - <ant dir="doctool" inheritall="false" target="${target}" /> + <gwt.ant dir="doctool" /> </target> <target name="-do" depends="customchecks, doctool" description="Run all subprojects"/>
diff --git a/build.xml b/build.xml index 84d0601..05df95c 100755 --- a/build.xml +++ b/build.xml
@@ -7,7 +7,7 @@ <property name="target" value="build" /> <target name="dist" depends="dev, user, servlet, jni, doc" description="Run the distributions"> - <ant dir="distro-source" inheritall="false" target="${target}" /> + <gwt.ant dir="distro-source" /> </target> <target name="doc" depends="buildtools, user" description="Build doc"> @@ -15,23 +15,23 @@ </target> <target name="dev" depends="buildtools" description="Run dev"> - <ant dir="dev" inheritall="false" target="${target}" /> + <gwt.ant dir="dev" /> </target> <target name="user" depends="buildtools, dev" description="Run user"> - <ant dir="user" inheritall="false" target="${target}" /> + <gwt.ant dir="user" /> </target> <target name="servlet" depends="buildtools, user" description="Run servlet"> - <ant dir="servlet" inheritall="false" target="${target}" /> + <gwt.ant dir="servlet" /> </target> <target name="jni" description="Run jni"> - <ant dir="jni" inheritall="false" target="${target}" /> + <gwt.ant dir="jni" /> </target> <target name="buildtools" description="Build the build tools"> - <ant dir="build-tools" inheritall="false" target="${target}" /> + <gwt.ant dir="build-tools" /> </target> <target name="-do" depends="dist" description="Run all subprojects"/>
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">
diff --git a/distro-source/common.ant.xml b/distro-source/common.ant.xml index ded519e..7e88e1c 100755 --- a/distro-source/common.ant.xml +++ b/distro-source/common.ant.xml
@@ -39,12 +39,17 @@ <fileset file="${gwt.build.lib}/gwt-user.jar" /> <fileset file="${gwt.build.lib}/gwt-servlet.jar" /> <fileset dir="${gwt.build.jni}/${dist.platform}" /> - <!-- TODO: versioning --> - <fileset dir="../core/src" /> <fileset dir="src" /> <!-- TODO: doc --> </copy> + <copy todir="${project.staging}"> + <fileset dir="../core/src" /> + <filterset> + <filter token="GWT_VERSION" value="${gwt.version}" /> + </filterset> + </copy> + <stage.sample lname="dynatable" uname="DynaTable" /> <stage.sample lname="hello" uname="Hello" /> <stage.sample lname="i18n" uname="I18N" />
diff --git a/distro-source/core/src/about.html b/distro-source/core/src/about.html index 37e5fc3..a550d19 100644 --- a/distro-source/core/src/about.html +++ b/distro-source/core/src/about.html
@@ -1,7 +1,7 @@ <html> <head> - <title>Google Web Toolkit ${project.version}</title> + <title>Google Web Toolkit @GWT_VERSION@</title> <style> body { background-color: white; @@ -43,7 +43,7 @@ <td id="title"><a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a></td> </tr> <tr> - <td id="version">Version ${project.version}</td> + <td id="version">Version @GWT_VERSION@</td> </tr> </table> @@ -84,8 +84,7 @@ <li>The <a href="http://www.w3.org/">W3C consortium</a></li> <li>The <a href="http://www.saxproject.org/">SAX project</a></li> </ul> - - Source files and licenses for the modifications mentioned above are part of this distribution and can be found with their class files inside the included jars, as detailed <a href="http://code.google.com/webtoolkit/terms-${project.version}.html#licenses">here</a>. + For source availability and license information see COPYING.html. </div>
diff --git a/distro-source/core/src/about.txt b/distro-source/core/src/about.txt index 5a1b896..512a520 100644 --- a/distro-source/core/src/about.txt +++ b/distro-source/core/src/about.txt
@@ -1,4 +1,4 @@ -Google Web Toolkit ${project.version} +Google Web Toolkit @GWT_VERSION@ (c) Copyright Google, Inc. 2006. All rights reserved. Visit Google Code (http://code.google.com/webtoolkit/). @@ -17,6 +17,4 @@ - The W3C consortium (http://www.w3.org/) - The SAX project (http://www.saxproject.org/) -Source files and licenses for the modifications mentioned above are part of this -distribution and can be found with their class files inside the included jars. -See the chart at http://code.google.com/webtoolkit/terms-${project.version}.html#licenses +For source availability and license information see COPYING.
diff --git a/distro-source/core/src/index.html b/distro-source/core/src/index.html index 09d85ca..d881d58 100644 --- a/distro-source/core/src/index.html +++ b/distro-source/core/src/index.html
@@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"><head> <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Google Web Toolkit ${project.version}</title> + <title>Google Web Toolkit @GWT_VERSION@</title> <style> body { @@ -26,7 +26,7 @@ </style></head> <body> - <h1>Google Web Toolkit ${project.version}</h1> + <h1>Google Web Toolkit @GWT_VERSION@</h1> Thanks for using Google Web Toolkit. We hope you'll have as much fun using it as we have working on it. <p>
diff --git a/distro-source/core/src/release_notes.html b/distro-source/core/src/release_notes.html index 4b6cf04..94bdebf 100644 --- a/distro-source/core/src/release_notes.html +++ b/distro-source/core/src/release_notes.html
@@ -28,7 +28,8 @@ <body> <h1>Google Web Toolkit Release Notes</h1> <ul> - <li><a href="#Release_Notes_Current">1.2 Release (${project.version})</a></li> + <li><a href="#Release_Notes_Current">1.3 Release Candidate (@GWT_VERSION@)</a></li> + <li><a href="#Release_Notes_1_2_22">1.2 Release (1.2.22)</a></li> <li><a href="#Release_Notes_1_2_11">1.2 Release Candidate (1.2.11)</a></li> <li><a href="#Release_Notes_1_1_10">1.1 Release (1.1.10)</a></li> <li><a href="#Release_Notes_1_1_0">1.1 Release Candidate (1.1.0)</a></li> @@ -37,7 +38,14 @@ <hr/> <a name="Release_Notes_Current"></a> - <h2>Release Notes for 1.2 Release (${project.version})</h2> + <h2>Release Notes for 1.3 Release Candidate(@GWT_VERSION@)</h2> + <p> + TODO + </p> + + <hr/> + <a name="Release_Notes_1_2_22"></a> + <h2>Release Notes for 1.2 Release (1.2.22)</h2> <p> This is the official GWT 1.2 release, the follow up to the <a href="#Release_Notes_1_2_11">GWT 1.2 Release Candidate</a>. It includes all of the enhancements and bug fixes from GWT 1.2 RC as well as a few additional bug fixes that were reported against GWT 1.2 RC.
diff --git a/platforms.ant.xml b/platforms.ant.xml index 4e1bb0f..35d9f30 100755 --- a/platforms.ant.xml +++ b/platforms.ant.xml
@@ -6,19 +6,19 @@ <available file="core/build.xml" type="file" property="core.exists" /> <target name="core" description="Run core" if="core.exists"> - <ant dir="core" inheritall="false" target="${target}" /> + <gwt.ant dir="core" /> </target> <target name="linux" depends="core" description="Run linux"> - <ant dir="linux" inheritall="false" target="${target}" /> + <gwt.ant dir="linux" /> </target> <target name="windows" depends="core" description="Run windows"> - <ant dir="windows" inheritall="false" target="${target}" /> + <gwt.ant dir="windows" /> </target> <target name="mac" depends="core" description="Run mac"> - <ant dir="mac" inheritall="false" target="${target}" /> + <gwt.ant dir="mac" /> </target> <target name="-do" depends="linux, windows, mac" description="Run all platforms" />
diff --git a/samples/build.xml b/samples/build.xml index af6d904..c169faa 100644 --- a/samples/build.xml +++ b/samples/build.xml
@@ -7,31 +7,31 @@ <property name="target" value="build" /> <target name="dynatable" description="Build dynatable"> - <ant dir="dynatable" inheritall="false" target="${target}" /> + <gwt.ant dir="dynatable" /> </target> <target name="hello" description="Build hello"> - <ant dir="hello" inheritall="false" target="${target}" /> + <gwt.ant dir="hello" /> </target> <target name="i18n" description="Build i18n"> - <ant dir="i18n" inheritall="false" target="${target}" /> + <gwt.ant dir="i18n" /> </target> <target name="json" description="Build json"> - <ant dir="json" inheritall="false" target="${target}" /> + <gwt.ant dir="json" /> </target> <target name="kitchensink" description="Build kitchensink"> - <ant dir="kitchensink" inheritall="false" target="${target}" /> + <gwt.ant dir="kitchensink" /> </target> <target name="mail" description="Build mail"> - <ant dir="mail" inheritall="false" target="${target}" /> + <gwt.ant dir="mail" /> </target> <target name="simplexml" description="Build simplexml"> - <ant dir="simplexml" inheritall="false" target="${target}" /> + <gwt.ant dir="simplexml" /> </target> <target name="-do" depends="dynatable, hello, i18n, json, kitchensink, mail, simplexml" description="Run all subprojects" />