Hello sample is now building.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@42 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/build.ant.xml b/samples/build.ant.xml
deleted file mode 100644
index 72a6c94..0000000
--- a/samples/build.ant.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
- NOTE:
-
- This file is a major hack to work around the problems that I have experienced
- with maven. Basically, I use this file to do some basic work and then
- I have it create a jar that replaces that jar that maven created. I'm
- sure that I will be bitten by this.
--->
-<project name="build" default="all" basedir=".">
- <target name="generate-sources">
- <copy todir="./target/generated-sources/src/">
- <fileset dir="../src">
- <exclude name="**/.sbas/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="generate-resources">
- <copy todir="./target/generated-sources/src">
- <fileset dir="../src">
- <exclude name="**/.sbas/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="compile">
- <java classname="com.google.gwt.user.tools.ApplicationCreator" fork="yes"
- failonerror="true">
- <classpath>
- <path refid="maven.runtime.classpath"/>
- <pathelement location="./target/generated-sources/src"/>
- </classpath>
-
- <jvmarg value="-Dgwt.devjar=${gwt.devjar}"/>
- <arg value="-ignore"/>
- <arg value="-out"/>
- <arg file="./target/generated-sources"/>
- <arg value="${sample.classname}"/>
- </java>
-
- <java classname="com.google.gwt.dev.GWTCompiler" fork="yes"
- failonerror="true">
- <classpath>
- <path refid="maven.runtime.classpath"/>
- <pathelement location="./target/generated-sources/src"/>
- </classpath>
-
- <arg value="-out"/>
- <arg file="./target/generated-sources/www"/>
- <arg value="${sample.module}"/>
- </java>
- </target>
-</project>
diff --git a/samples/common.ant.xml b/samples/common.ant.xml
new file mode 100755
index 0000000..410a606
--- /dev/null
+++ b/samples/common.ant.xml
@@ -0,0 +1,66 @@
+<project name="samples-common">
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="samples/${sample.root}" />
+ <import file="${gwt.root}/common.ant.xml" />
+
+ <property name="sample.package" value="${sample.root}" />
+ <property name="sample.main" value="${sample.module}" />
+
+ <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
+ <!-- Platform shouldn't matter here, just picking one -->
+ <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
+
+ <target name="compile" description="Compile all java files">
+ <mkdir dir="${javac.out}" />
+ <gwt.javac>
+ <classpath>
+ <pathelement location="${gwt.user.jar}" />
+ <pathelement location="${gwt.dev.jar}" />
+ </classpath>
+ </gwt.javac>
+ </target>
+
+ <target name="gwtc" description="Compile to JavaScript">
+ <mkdir dir="${project.build}/www" />
+ <java classname="com.google.gwt.dev.GWTCompiler" classpath="src:${gwt.user.jar}:${gwt.dev.jar}" fork="yes" failonerror="true">
+ <classpath>
+ <pathelement location="${src}" />
+ <pathelement location="${gwt.user.jar}" />
+ <pathelement location="${gwt.dev.jar}" />
+ </classpath>
+ <arg value="-out" />
+ <arg file="${project.build}/www" />
+ <arg value="com.google.gwt.sample.${sample.package}.${sample.module}" />
+ </java>
+ </target>
+
+ <target name="antcall.script" description="Create launch scripts for a particular platform">
+ <mkdir dir="${project.build}/scripts/${platform}" />
+ <java classname="com.google.gwt.user.tools.ApplicationCreator" classpath="${gwt.user.jar}:${gwt.dev.jar}" failonerror="true">
+ <!-- Relative path is important! Paths will be relative in final distro -->
+ <sysproperty key="gwt.devjar" value="../../gwt-dev-${platform}.jar" />
+ <arg value="-ignore" />
+ <arg value="-out" />
+ <arg file="${project.build}/scripts/${platform}" />
+ <arg value="com.google.gwt.sample.${sample.package}.client.${sample.main}" />
+ </java>
+ </target>
+
+ <target name="scripts" description="Create launch scripts">
+ <antcall target="antcall.script">
+ <param name="platform" value="linux" />
+ </antcall>
+ <antcall target="antcall.script">
+ <param name="platform" value="windows" />
+ </antcall>
+ <antcall target="antcall.script">
+ <param name="platform" value="mac" />
+ </antcall>
+ </target>
+
+ <target name="build" depends="compile, gwtc, scripts" description="Build and package this project" />
+
+ <target name="checkstyle" description="Static analysis of source">
+ <gwt.checkstyle />
+ </target>
+</project>
diff --git a/samples/hello/build.xml b/samples/hello/build.xml
new file mode 100755
index 0000000..f855f09
--- /dev/null
+++ b/samples/hello/build.xml
@@ -0,0 +1,5 @@
+<project name="hello" default="build" basedir=".">
+ <property name="sample.root" value="hello" />
+ <property name="sample.module" value="Hello" />
+ <import file="../common.ant.xml" />
+</project>
diff --git a/samples/samples.linux.ant.xml b/samples/samples.linux.ant.xml
deleted file mode 100644
index fc665b5..0000000
--- a/samples/samples.linux.ant.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<project name="build" default="all" basedir=".">
- <property name="root" location="../../../../.." />
- <property name="java" value="${root}/java" />
- <property name="out" location="${root}/out" />
- <property name="samples" location="${out}/samples-linux" />
- <property name="devjar" value="gwt-dev-linux.jar" />
-
- <target name="init">
- <mkdir dir="${samples}" />
- </target>
-
- <target name="KitchenSink" depends="init">
- <mkdir dir="${samples}/KitchenSink/src"/>
- <copy todir="${samples}/KitchenSink/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/kitchensink/**"/>
- </copy>
- <mkdir dir="${samples}/KitchenSink/bin"/>
- <javac srcdir="${samples}/KitchenSink/src" destdir="${samples}/KitchenSink/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/kitchensink/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/KitchenSink"/>
-
- <arg value="com.google.gwt.sample.kitchensink.client.KitchenSink"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/KitchenSink/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/KitchenSink/www"/>
- <arg value="com.google.gwt.sample.kitchensink.KitchenSink"/>
- </java>
- </target>
-
- <target name="DynaTable" depends="init">
- <mkdir dir="${samples}/DynaTable/src"/>
- <copy todir="${samples}/DynaTable/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/dynatable/**"/>
- </copy>
- <mkdir dir="${samples}/DynaTable/bin"/>
- <javac srcdir="${samples}/DynaTable/src" destdir="${samples}/DynaTable/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/dynatable/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/DynaTable"/>
-
- <arg value="com.google.gwt.sample.dynatable.client.DynaTable"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/DynaTable/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/DynaTable/www"/>
- <arg value="com.google.gwt.sample.dynatable.DynaTable"/>
- </java>
- </target>
-
- <target name="Mail" depends="init">
- <mkdir dir="${samples}/Mail/src"/>
- <copy todir="${samples}/Mail/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/mail/**"/>
- </copy>
- <mkdir dir="${samples}/Mail/bin"/>
- <javac srcdir="${samples}/Mail/src" destdir="${samples}/Mail/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/mail/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/Mail"/>
-
- <arg value="com.google.gwt.sample.mail.client.Mail"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/Mail/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/Mail/www"/>
- <arg value="com.google.gwt.sample.mail.Mail"/>
- </java>
- </target>
-
- <target name="JSON" depends="init">
- <mkdir dir="${samples}/JSON/src"/>
- <copy todir="${samples}/JSON/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/json/**"/>
- </copy>
- <mkdir dir="${samples}/JSON/bin"/>
- <javac srcdir="${samples}/JSON/src" destdir="${samples}/JSON/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/json/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/JSON"/>
-
- <arg value="com.google.gwt.sample.json.client.JSON"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/JSON/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/JSON/www"/>
- <arg value="com.google.gwt.sample.json.JSON"/>
- </java>
- </target>
-
- <target name="Hello" depends="init">
- <mkdir dir="${samples}/Hello/src"/>
- <copy todir="${samples}/Hello/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/hello/**"/>
- </copy>
- <mkdir dir="${samples}/Hello/bin"/>
- <javac srcdir="${samples}/Hello/src" destdir="${samples}/Hello/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/hello/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/Hello"/>
-
- <arg value="com.google.gwt.sample.hello.client.Hello"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/Hello/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/Hello/www"/>
- <arg value="com.google.gwt.sample.hello.Hello"/>
- </java>
- </target>
-
- <target name="clean">
- <delete dir="${out}/samples"/>
- </target>
-
- <target name="all" depends="KitchenSink, DynaTable, Mail, JSON, Hello"/>
-</project>
diff --git a/samples/samples.windows.ant.xml b/samples/samples.windows.ant.xml
deleted file mode 100644
index ca0c963..0000000
--- a/samples/samples.windows.ant.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<project name="build" default="all" basedir=".">
- <property name="root" location="../../../../.." />
- <property name="java" value="${root}/java" />
- <property name="out" location="${root}/out" />
- <property name="samples" location="${out}/samples-windows" />
- <property name="devjar" value="gwt-dev-windows.jar" />
-
- <target name="init">
- <mkdir dir="${samples}" />
- </target>
-
- <target name="KitchenSink" depends="init">
- <mkdir dir="${samples}/KitchenSink/src"/>
- <copy todir="${samples}/KitchenSink/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/kitchensink/**"/>
- </copy>
- <mkdir dir="${samples}/KitchenSink/bin"/>
- <javac srcdir="${samples}/KitchenSink/src" destdir="${samples}/KitchenSink/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/kitchensink/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/KitchenSink"/>
-
- <arg value="com.google.gwt.sample.kitchensink.client.KitchenSink"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/KitchenSink/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/KitchenSink/www"/>
- <arg value="com.google.gwt.sample.kitchensink.KitchenSink"/>
- </java>
- </target>
-
- <target name="DynaTable" depends="init">
- <mkdir dir="${samples}/DynaTable/src"/>
- <copy todir="${samples}/DynaTable/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/dynatable/**"/>
- </copy>
- <mkdir dir="${samples}/DynaTable/bin"/>
- <javac srcdir="${samples}/DynaTable/src" destdir="${samples}/DynaTable/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/dynatable/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/DynaTable"/>
-
- <arg value="com.google.gwt.sample.dynatable.client.DynaTable"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/DynaTable/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/DynaTable/www"/>
- <arg value="com.google.gwt.sample.dynatable.DynaTable"/>
- </java>
- </target>
-
- <target name="Mail" depends="init">
- <mkdir dir="${samples}/Mail/src"/>
- <copy todir="${samples}/Mail/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/mail/**"/>
- </copy>
- <mkdir dir="${samples}/Mail/bin"/>
- <javac srcdir="${samples}/Mail/src" destdir="${samples}/Mail/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/mail/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/Mail"/>
-
- <arg value="com.google.gwt.sample.mail.client.Mail"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/Mail/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/Mail/www"/>
- <arg value="com.google.gwt.sample.mail.Mail"/>
- </java>
- </target>
-
- <target name="JSON" depends="init">
- <mkdir dir="${samples}/JSON/src"/>
- <copy todir="${samples}/JSON/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/json/**"/>
- </copy>
- <mkdir dir="${samples}/JSON/bin"/>
- <javac srcdir="${samples}/JSON/src" destdir="${samples}/JSON/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/json/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/JSON"/>
-
- <arg value="com.google.gwt.sample.json.client.JSON"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/JSON/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/JSON/www"/>
- <arg value="com.google.gwt.sample.json.JSON"/>
- </java>
- </target>
-
- <target name="Hello" depends="init">
- <mkdir dir="${samples}/Hello/src"/>
- <copy todir="${samples}/Hello/src">
- <fileset dir="${java}" includes="com/google/gwt/sample/hello/**"/>
- </copy>
- <mkdir dir="${samples}/Hello/bin"/>
- <javac srcdir="${samples}/Hello/src" destdir="${samples}/Hello/bin" classpath="${out}/gwt-user.jar" debug="true" debuglevel="lines,vars,source" source="1.4" nowarn="on">
- <include name="com/google/gwt/sample/hello/**"/>
- </javac>
- <java classname="com.google.gwt.dev.ApplicationCreator" classpath="${out}/dev.jar" fork="yes" failonerror="true">
- <jvmarg value="-Dgwt.devjar=../../${devjar}"/>
- <arg value="-ignore"/>
-
- <arg value="-out"/>
- <arg file="${samples}/Hello"/>
-
- <arg value="com.google.gwt.sample.hello.client.Hello"/>
- </java>
- <java classname="com.google.gwt.dev.GWTCompiler" classpath="${samples}/Hello/src:${out}/gwt-user.jar:${out}/dev.jar" fork="yes" failonerror="true">
- <arg value="-out"/>
- <arg file="${samples}/Hello/www"/>
- <arg value="com.google.gwt.sample.hello.Hello"/>
- </java>
- </target>
-
- <target name="clean">
- <delete dir="${out}/samples"/>
- </target>
-
- <target name="all" depends="KitchenSink, DynaTable, Mail, JSON, Hello"/>
-</project>
