Fixed up doc to build into build directory.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@98 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/distro-source/common.ant.xml b/distro-source/common.ant.xml
index 7e88e1c..02e10bd 100755
--- a/distro-source/common.ant.xml
+++ b/distro-source/common.ant.xml
@@ -40,7 +40,15 @@
<fileset file="${gwt.build.lib}/gwt-servlet.jar" />
<fileset dir="${gwt.build.jni}/${dist.platform}" />
<fileset dir="src" />
- <!-- TODO: doc -->
+ </copy>
+
+ <mkdir dir="${project.staging}/doc" />
+ <copy todir="${project.staging}/doc">
+ <fileset dir="${gwt.build.out}/doc">
+ <include name="html/**" />
+ <include name="css/**" />
+ <include name="javadoc/**" />
+ </fileset>
</copy>
<copy todir="${project.staging}">
diff --git a/doc/build.xml b/doc/build.xml
index 63eda4a..49aa017 100644
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -1,134 +1,129 @@
<project name="doc" default="all" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="doc" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="doc" />
+ <import file="${gwt.root}/common.ant.xml" />
- <!-- set global properties for this build -->
- <property name="out" location="target"/>
+ <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" />
- <property name="USER_PKGS" value="com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.typeinfo;com.google.gwt.i18n.client;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.server.rpc;com.google.gwt.xml.client;com.google.gwt.http.client"/>
- <property name="LANG_PKGS" value="java.lang;java.util"/>
- <property name="DOC_PKGS" value="com.google.gwt.doc"/>
+ <property name="USER_PKGS" value="com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.typeinfo;com.google.gwt.i18n.client;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.server.rpc;com.google.gwt.xml.client;com.google.gwt.http.client" />
+ <property name="LANG_PKGS" value="java.lang;java.util" />
+ <property name="DOC_PKGS" value="com.google.gwt.doc" />
- <path id="USER_SOURCE_PATH">
- <pathelement location="${gwt.root}/user/src"/>
- <pathelement location="${gwt.root}/user/javadoc"/>
- <pathelement location="${gwt.root}/user/super"/>
- <pathelement location="${gwt.root}/dev/core/src"/>
- </path>
+ <path id="USER_SOURCE_PATH">
+ <pathelement location="${gwt.root}/user/src" />
+ <pathelement location="${gwt.root}/user/javadoc" />
+ <pathelement location="${gwt.root}/user/super" />
+ <pathelement location="${gwt.root}/dev/core/src" />
+ </path>
- <path id="USER_CLASS_PATH">
- <pathelement location="${gwt.root}/build/lib/gwt-user.jar"/>
- <pathelement location="${gwt.root}/build/lib/gwt-dev-linux.jar"/>
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar"/>
- </path>
+ <path id="USER_CLASS_PATH">
+ <pathelement location="${gwt.user.jar}" />
+ <pathelement location="${gwt.dev.jar}" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ </path>
- <path id="DOC_SOURCE_PATH">
- <pathelement location="./src"/>
- <path refid="USER_SOURCE_PATH"/>
- </path>
+ <path id="DOC_SOURCE_PATH">
+ <pathelement location="./src" />
+ <path refid="USER_SOURCE_PATH" />
+ </path>
- <path id="DOC_PATH">
- <pathelement location="./src"/>
- <pathelement location="${gwt.tools.lib}/jdk/tools-1.4.2_09.jar"/>
- <pathelement location="${gwt.root}/build/lib/gwt-doctool.jar"/>
- <path refid="USER_SOURCE_PATH"/>
- </path>
+ <path id="DOC_PATH">
+ <pathelement location="./src" />
+ <pathelement location="${gwt.tools.lib}/jdk/tools-1.4.2_09.jar" />
+ <pathelement location="${gwt.build.lib}/gwt-doctool.jar" />
+ <path refid="USER_SOURCE_PATH" />
+ </path>
- <target name="doc">
- <java classpathref="DOC_PATH" classname="com.google.doctool.DocTool" fork="yes" failonerror="true">
- <arg value="doc"/>
- <arg value="gwt-doc"/>
- <arg value="-out"/>
- <arg value="${out}"/>
- <arg value="-classpath"/>
- <arg pathref="USER_CLASS_PATH"/>
- <arg value="-sourcepath"/>
- <arg pathref="DOC_SOURCE_PATH"/>
- <arg value="-packages"/>
- <arg value="${DOC_PKGS}"/>
- </java>
- </target>
+ <target name="doc">
+ <java classpathref="DOC_PATH" classname="com.google.doctool.DocTool" fork="yes" failonerror="true">
+ <arg value="doc" />
+ <arg value="gwt-doc" />
+ <arg value="-out" />
+ <arg value="${project.build}" />
+ <arg value="-classpath" />
+ <arg pathref="USER_CLASS_PATH" />
+ <arg value="-sourcepath" />
+ <arg pathref="DOC_SOURCE_PATH" />
+ <arg value="-packages" />
+ <arg value="${DOC_PKGS}" />
+ </java>
+ </target>
- <target name="user">
- <move file="${gwt.root}/user/super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/GWTTestCase.java"
- tofile="${gwt.root}/user/super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/GWTTestCase.java_" failonerror="false"/>
- <java classpathref="DOC_PATH" classname="com.google.doctool.DocTool" fork="yes" failonerror="true">
- <arg value="java"/>
- <arg value="gwt-user"/>
- <arg value="-out"/>
- <arg value="${out}"/>
- <arg value="-overview"/>
- <arg value="./src/gwt-user.html"/>
- <arg value="-classpath"/>
- <arg pathref="USER_CLASS_PATH"/>
- <arg value="-sourcepath"/>
- <arg pathref="USER_SOURCE_PATH"/>
- <arg value="-packages"/>
- <arg value="${USER_PKGS}"/>
- </java>
- <move file="${gwt.root}/user/super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/GWTTestCase.java_"
- tofile="${gwt.root}/user/super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/GWTTestCase.java" failonerror="false"/>
- </target>
+ <target name="user">
+ <move file="${gwt.root}/user/super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/GWTTestCase.java" tofile="${gwt.root}/user/super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/GWTTestCase.java_" failonerror="false" />
+ <java classpathref="DOC_PATH" classname="com.google.doctool.DocTool" fork="yes" failonerror="true">
+ <arg value="java" />
+ <arg value="gwt-user" />
+ <arg value="-out" />
+ <arg value="${project.build}" />
+ <arg value="-overview" />
+ <arg value="./src/gwt-user.html" />
+ <arg value="-classpath" />
+ <arg pathref="USER_CLASS_PATH" />
+ <arg value="-sourcepath" />
+ <arg pathref="USER_SOURCE_PATH" />
+ <arg value="-packages" />
+ <arg value="${USER_PKGS}" />
+ </java>
+ <move file="${gwt.root}/user/super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/GWTTestCase.java_" tofile="${gwt.root}/user/super/com/google/gwt/junit/translatable/com/google/gwt/junit/client/GWTTestCase.java" failonerror="false" />
+ </target>
- <target name="lang">
- <java classpathref="DOC_PATH" classname="com.google.doctool.DocTool" fork="yes" failonerror="true">
- <arg value="java"/>
- <arg value="gwt-lang"/>
- <arg value="-out"/>
- <arg value="${out}"/>
- <arg value="-overview"/>
- <arg value="./src/gwt-lang.html"/>
- <arg value="-classpath"/>
- <arg pathref="USER_CLASS_PATH"/>
- <arg value="-sourcepath"/>
- <arg path="${gwt.root}/user/super/com/google/gwt/emul"/>
- <arg value="-packages"/>
- <arg value="${LANG_PKGS}"/>
- </java>
- </target>
+ <target name="lang">
+ <java classpathref="DOC_PATH" classname="com.google.doctool.DocTool" fork="yes" failonerror="true">
+ <arg value="java" />
+ <arg value="gwt-lang" />
+ <arg value="-out" />
+ <arg value="${project.build}" />
+ <arg value="-overview" />
+ <arg value="./src/gwt-lang.html" />
+ <arg value="-classpath" />
+ <arg pathref="USER_CLASS_PATH" />
+ <arg value="-sourcepath" />
+ <arg path="${gwt.root}/user/super/com/google/gwt/emul" />
+ <arg value="-packages" />
+ <arg value="${LANG_PKGS}" />
+ </java>
+ </target>
- <target name="html" depends="doc,user,lang">
- <java classpathref="DOC_PATH" classname="com.google.doctool.DocTool" fork="yes" failonerror="true">
- <arg value="-html"/>
- <arg value="Google Web Toolkit (Beta)"/>
- <arg value="gwt-doc"/>
- <arg value="gwt-user"/>
- <arg value="gwt-lang"/>
- <arg value="-out"/>
- <arg value="${out}"/>
- <arg value="-imagepath"/>
- <arg path="./src"/>
- </java>
- <delete file="${out}/html/topics.htmls"/>
- <mkdir dir="${out}/css"/>
- <copy todir="${out}/css">
- <fileset dir="src" includes="*.css"/>
- </copy>
- </target>
+ <target name="html" depends="doc,user,lang">
+ <java classpathref="DOC_PATH" classname="com.google.doctool.DocTool" fork="yes" failonerror="true">
+ <arg value="-html" />
+ <arg value="Google Web Toolkit (Beta)" />
+ <arg value="gwt-doc" />
+ <arg value="gwt-user" />
+ <arg value="gwt-lang" />
+ <arg value="-out" />
+ <arg value="${project.build}" />
+ <arg value="-imagepath" />
+ <arg path="./src" />
+ </java>
+ <delete file="${project.build}/html/topics.htmls" />
+ <mkdir dir="${project.build}/css" />
+ <copy todir="${project.build}/css">
+ <fileset dir="src" includes="*.css" />
+ </copy>
+ </target>
- <target name="javadoc">
- <java classpathref="DOC_PATH" classname="com.google.doctool.custom.GWTJavaDoclet" fork="yes" failonerror="true">
- <arg value="-quiet"/>
- <arg value="-source"/>
- <arg value="1.4"/>
- <arg value="-d"/>
- <arg value="${out}/javadoc"/>
- <arg value="-classpath"/>
- <arg pathref="USER_CLASS_PATH"/>
- <arg value="-sourcepath"/>
- <arg pathref="USER_SOURCE_PATH"/>
- <arg value="-examplepackages"/>
- <arg value="com.google.gwt.examples;com.google.gwt.examples.i18n;com.google.gwt.examples.http.client"/>
- <arg value="-packages"/>
- <arg value="${USER_PKGS}"/>
- </java>
- </target>
+ <target name="javadoc">
+ <java classpathref="DOC_PATH" classname="com.google.doctool.custom.GWTJavaDoclet" fork="yes" failonerror="true">
+ <arg value="-quiet" />
+ <arg value="-source" />
+ <arg value="1.4" />
+ <arg value="-d" />
+ <arg value="${project.build}/javadoc" />
+ <arg value="-classpath" />
+ <arg pathref="USER_CLASS_PATH" />
+ <arg value="-sourcepath" />
+ <arg pathref="USER_SOURCE_PATH" />
+ <arg value="-examplepackages" />
+ <arg value="com.google.gwt.examples;com.google.gwt.examples.i18n;com.google.gwt.examples.http.client" />
+ <arg value="-packages" />
+ <arg value="${USER_PKGS}" />
+ </java>
+ </target>
- <target name="clean">
- <delete dir="${out}"/>
- </target>
-
- <target name="build" depends="clean, html, javadoc"/>
+ <target name="build" depends="html, javadoc" />
</project>
