Revision: 6160 Author: [email protected] Date: Thu Sep 17 16:17:20 2009 Log: Ant changes to build a single distro (more cleanup left to do).
http://code.google.com/p/google-web-toolkit/source/detail?r=6160 Added: /changes/jat/noswt/distro-source/src /changes/jat/noswt/distro-source/src/benchmarkViewer /changes/jat/noswt/distro-source/src/benchmarkViewer.cmd /changes/jat/noswt/distro-source/src/i18nCreator /changes/jat/noswt/distro-source/src/i18nCreator.cmd /changes/jat/noswt/distro-source/src/junitCreator /changes/jat/noswt/distro-source/src/junitCreator.cmd /changes/jat/noswt/distro-source/src/webAppCreator /changes/jat/noswt/distro-source/src/webAppCreator.cmd Deleted: /changes/jat/noswt/distro-source/linux/src/benchmarkViewer /changes/jat/noswt/distro-source/linux/src/i18nCreator /changes/jat/noswt/distro-source/linux/src/junitCreator /changes/jat/noswt/distro-source/linux/src/webAppCreator /changes/jat/noswt/distro-source/windows/src/benchmarkViewer.cmd /changes/jat/noswt/distro-source/windows/src/i18nCreator.cmd /changes/jat/noswt/distro-source/windows/src/junitCreator.cmd /changes/jat/noswt/distro-source/windows/src/webAppCreator.cmd Modified: /changes/jat/noswt/build.xml /changes/jat/noswt/common.ant.xml /changes/jat/noswt/dev/build.xml /changes/jat/noswt/dev/core/build.xml /changes/jat/noswt/distro-source/build.xml /changes/jat/noswt/distro-source/common.ant.xml /changes/jat/noswt/doc/build.xml /changes/jat/noswt/platforms.ant.xml /changes/jat/noswt/samples/common.ant.xml /changes/jat/noswt/tools/api-checker/build.xml /changes/jat/noswt/tools/benchmark-viewer/build.xml /changes/jat/noswt/tools/soyc-vis/build.xml /changes/jat/noswt/user/build.xml ======================================= --- /dev/null +++ /changes/jat/noswt/distro-source/src/benchmarkViewer Thu Sep 17 16:17:20 2009 @@ -0,0 +1,3 @@ +#!/bin/sh +APPDIR=`dirname $0`; +java -Dcom.google.gwt.junit.reportPath="$1" -cp "$APPDIR/gwt-dev.jar" com.google.gwt.dev.RunWebApp -port auto $APPDIR/gwt-benchmark-viewer.war; ======================================= --- /dev/null +++ /changes/jat/noswt/distro-source/src/benchmarkViewer.cmd Thu Sep 17 16:17:20 2009 @@ -0,0 +1,1 @@ +...@java -Dcom.google.gwt.junit.reportPath="%1" -cp "%~dp0/gwt-dev.jar" com.google.gwt.dev.RunWebApp -port auto %~dp0/gwt-benchmark-viewer.war ======================================= --- /dev/null +++ /changes/jat/noswt/distro-source/src/i18nCreator Thu Sep 17 16:17:20 2009 @@ -0,0 +1,3 @@ +#!/bin/sh +HOMEDIR=`dirname $0`; +java -cp $HOMEDIR/gwt-user.jar:$HOMEDIR/gwt-dev.jar com.google.gwt.i18n.tools.I18NCreator "$@"; ======================================= --- /dev/null +++ /changes/jat/noswt/distro-source/src/i18nCreator.cmd Thu Sep 17 16:17:20 2009 @@ -0,0 +1,1 @@ +...@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev.jar" com.google.gwt.i18n.tools.I18NCreator %* ======================================= --- /dev/null +++ /changes/jat/noswt/distro-source/src/junitCreator Thu Sep 17 16:17:20 2009 @@ -0,0 +1,3 @@ +#!/bin/sh +HOMEDIR=`dirname $0`; +java -cp $HOMEDIR/gwt-user.jar:$HOMEDIR/gwt-dev.jar com.google.gwt.junit.tools.JUnitCreator "$@"; ======================================= --- /dev/null +++ /changes/jat/noswt/distro-source/src/junitCreator.cmd Thu Sep 17 16:17:20 2009 @@ -0,0 +1,1 @@ +...@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev.jar" com.google.gwt.junit.tools.JUnitCreator %* ======================================= --- /dev/null +++ /changes/jat/noswt/distro-source/src/webAppCreator Thu Sep 17 16:17:20 2009 @@ -0,0 +1,3 @@ +#!/bin/sh +HOMEDIR=`dirname $0`; +java -cp $HOMEDIR/gwt-user.jar:$HOMEDIR/gwt-dev.jar com.google.gwt.user.tools.WebAppCreator "$@"; ======================================= --- /dev/null +++ /changes/jat/noswt/distro-source/src/webAppCreator.cmd Thu Sep 17 16:17:20 2009 @@ -0,0 +1,1 @@ +...@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev.jar" com.google.gwt.user.tools.WebAppCreator %* ======================================= --- /changes/jat/noswt/distro-source/linux/src/benchmarkViewer Wed Mar 11 16:11:41 2009 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -APPDIR=`dirname $0`; -java -Dcom.google.gwt.junit.reportPath="$1" -cp "$APPDIR/gwt-dev-linux.jar" com.google.gwt.dev.RunWebApp -port auto $APPDIR/gwt-benchmark-viewer.war; ======================================= --- /changes/jat/noswt/distro-source/linux/src/i18nCreator Wed Dec 6 15:14:19 2006 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -HOMEDIR=`dirname $0`; -java -cp $HOMEDIR/gwt-user.jar:$HOMEDIR/gwt-dev-linux.jar com.google.gwt.i18n.tools.I18NCreator "$@"; ======================================= --- /changes/jat/noswt/distro-source/linux/src/junitCreator Wed Dec 6 15:14:19 2006 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -HOMEDIR=`dirname $0`; -java -cp $HOMEDIR/gwt-user.jar:$HOMEDIR/gwt-dev-linux.jar com.google.gwt.junit.tools.JUnitCreator "$@"; ======================================= --- /changes/jat/noswt/distro-source/linux/src/webAppCreator Mon Mar 16 16:27:28 2009 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -HOMEDIR=`dirname $0`; -java -cp $HOMEDIR/gwt-user.jar:$HOMEDIR/gwt-dev-linux.jar com.google.gwt.user.tools.WebAppCreator "$@"; ======================================= --- /changes/jat/noswt/distro-source/windows/src/benchmarkViewer.cmd Wed Mar 11 16:11:41 2009 +++ /dev/null @@ -1,1 +0,0 @@ -...@java -Dcom.google.gwt.junit.reportPath="%1" -cp "%~dp0/gwt-dev-windows.jar" com.google.gwt.dev.RunWebApp -port auto %~dp0/gwt-benchmark-viewer.war ======================================= --- /changes/jat/noswt/distro-source/windows/src/i18nCreator.cmd Wed Dec 6 15:14:19 2006 +++ /dev/null @@ -1,1 +0,0 @@ -...@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev-windows.jar" com.google.gwt.i18n.tools.I18NCreator %* ======================================= --- /changes/jat/noswt/distro-source/windows/src/junitCreator.cmd Wed Dec 6 15:14:19 2006 +++ /dev/null @@ -1,1 +0,0 @@ -...@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev-windows.jar" com.google.gwt.junit.tools.JUnitCreator %* ======================================= --- /changes/jat/noswt/distro-source/windows/src/webAppCreator.cmd Mon Mar 16 16:27:28 2009 +++ /dev/null @@ -1,1 +0,0 @@ -...@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev-windows.jar" com.google.gwt.user.tools.WebAppCreator %* ======================================= --- /changes/jat/noswt/build.xml Wed Aug 5 12:55:36 2009 +++ /changes/jat/noswt/build.xml Thu Sep 17 16:17:20 2009 @@ -35,20 +35,15 @@ <target name="buildonly" description="[action] Minimal one-platform devel build, without distro packaging"> - <call-subproject subproject="dev-one" subtarget="build" /> + <call-subproject subproject="dev" subtarget="build" /> <call-subproject subproject="user" subtarget="build" /> <call-subproject subproject="servlet" subtarget="build" /> - <call-subproject subproject="jni-one" subtarget="build" /> </target> <target name="dist" depends="build, doc" description="[action] Make all the distributions"> <gwt.ant dir="distro-source" /> </target> - <target name="dist-one" depends="buildonly, tools, samples, doc" description="[action] Make only this platform's distribution"> - <gwt.ant dir="distro-source" target="${build.host.platform}" /> - </target> - <target name="dist-dev" depends="buildonly" description="[action] Make this platform's distribution, minus doc and samples"> <gwt.ant dir="distro-source" target="${build.host.platform}" /> </target> @@ -58,14 +53,8 @@ <gwt.ant dir="dev" /> </target> - <target name="dev-one" description="[subdir] Builds only the dev library for this platform"> - <call-subproject subproject="buildtools" subtarget="build" /> - <gwt.ant dir="dev" target="${build.host.platform}"/> - <gwt.ant dir="dev" target="oophm"/> - </target> - <target name="user" description="[subdir] Builds (or runs ${target} if set) only the user library"> - <call-subproject subproject="dev-one" subtarget="build"/> + <call-subproject subproject="dev" subtarget="build"/> <gwt.ant dir="user" /> </target> @@ -79,14 +68,6 @@ <gwt.ant dir="servlet" /> </target> - <target name="jni" description="[subdir] Builds (or runs ${target} if set) jni for all platforms"> - <gwt.ant dir="jni" /> - </target> - - <target name="jni-one" description="[subdir] Builds jni for only this platform"> - <gwt.ant dir="jni" target="${build.host.platform}" /> - </target> - <target name="doc" description="[subdir] Builds (or runs ${target} if set) the doc"> <call-subproject subproject="user" subtarget="build" /> <gwt.ant dir="doc" /> @@ -106,7 +87,6 @@ <call-subproject subproject="user" subtarget="build"/> <call-subproject subproject="servlet" subtarget="build"/> <call-subproject subproject="tools" subtarget="build"/> - <call-subproject subproject="jni" subtarget="build"/> <call-subproject subproject="samples" subtarget="build"/> </target> @@ -178,10 +158,9 @@ <java failonerror="true" fork="true" classname="com.google.gwt.tools.apichecker.ApiCompatibilityChecker"> <jvmarg line="-Xmx512m" /> - <sysproperty key="gwt.devjar" value="${gwt.dev.staging.jar}" /> <classpath> <pathelement location="${gwt.build.out}/tools/api-checker/bin"/> - <fileset dir="${gwt.build.lib}" includes="gwt-user.jar,gwt-dev-*.jar" /> + <fileset dir="${gwt.build.lib}" includes="gwt-user.jar,gwt-dev.jar" /> <pathelement path="${java.class.path}"/> <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> </classpath> ======================================= --- /changes/jat/noswt/common.ant.xml Thu Sep 3 12:14:51 2009 +++ /changes/jat/noswt/common.ant.xml Thu Sep 17 16:17:20 2009 @@ -100,7 +100,7 @@ </condition> <!-- JUnit support --> - <property name="gwt.dev.staging.jar" location="${gwt.build.staging}/gwt-${build.host.platform}-${gwt.version}/gwt-dev-${build.host.platform}.jar" /> + <property name="gwt.dev.staging.jar" location="${gwt.build.staging}/gwt-dev-${gwt.version}/gwt-dev.jar" /> <property name="gwt.junit.port" value="8888" /> <property name="gwt.junit.testcase.includes" value="**/*Suite.class"/> @@ -208,7 +208,6 @@ <jvmarg value="-Demma.coverage.out.merge=true" /> <sysproperty key="gwt.args" value="${junit.notheadless.arg} @{test.args}" /> <sysproperty key="java.awt.headless" value="${junit.headless}" /> - <sysproperty key="gwt.devjar" value="${gwt.dev.staging.jar}" /> <classpath> <path refid="project.classpath.src" /> <pathelement location="${gwt.root}/${project.tail}/super" /> ======================================= --- /changes/jat/noswt/dev/build.xml Fri Jul 10 19:19:32 2009 +++ /changes/jat/noswt/dev/build.xml Thu Sep 17 16:17:20 2009 @@ -2,18 +2,293 @@ <property name="gwt.root" location=".." /> <property name="project.tail" value="dev" /> <import file="${gwt.root}/platforms.ant.xml" /> - - - <target name="test" description="Tests this project, but only on this platform"> - <gwt.ant dir="core" target="test"/> - <gwt.ant dir="oophm" target="test"/> - <gwt.ant dir="${build.host.platform}" target="test"/> - </target> + <import file="${gwt.root}/common.ant.xml" /> + + <property name="alldeps.jar" location="${project.build}/alldeps.jar" /> + <property name="gwt.junit.testcase.dev.core.includes" value="**/com/google/**/*Test.class" /> + <property name="gwt.junit.testcase.dev.core.excludes" value="" /> <target name="clean" description="Cleans this project's intermediate and output files"> <delete dir="${project.build}" failonerror="false" /> + <delete file="${project.lib}" failonerror="false" /> <delete failonerror="false"> - <fileset dir="${gwt.build.lib}" includes="gwt-dev-*.jar"/> + <fileset dir="${gwt.build.lib}" includes="gwt-dev.jar"/> </delete> </target> + + <target name="compile.tests" depends="build, compile.emma" description="Compiles the test code for this project"> + <mkdir dir="${javac.junit.out}" /> + <gwt.javac destdir="${javac.junit.out}"> + <src path="core/test" /> + <src path="oophm/src" /> + <src path="oophm/overlay" /> + <src path="oophm/test" /> + <classpath> + <pathelement location="${javac.out}" /> + <pathelement location="${alldeps.jar}" /> + <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" /> + </classpath> + </gwt.javac> + </target> + + <target name="build.alldeps.jar" description="Merges all dependency jars into a single jar"> + <mkdir dir="${project.build}" /> + <outofdate> <!-- saves rescanning all the source jars' contents --> + <sourcefiles> + <fileset dir="${gwt.tools.lib}"> + <include name="apache/tapestry-util-text-4.0.2.jar" /> + <include name="apache/ant-1.6.5.jar" /> + <include name="eclipse/jdt-3.4.2.jar" /> + <include name="jetty/jetty-6.1.11.jar" /> + <include name="tomcat/ant-launcher-1.6.5.jar" /> + <include name="tomcat/catalina-1.0.jar" /> + <include name="tomcat/catalina-optional-1.0.jar" /> + <include name="tomcat/commons-beanutils-1.6.jar" /> + <include name="tomcat/commons-collections-3.1.jar" /> + <include name="tomcat/commons-digester-1.5.jar" /> + <include name="tomcat/commons-el-1.0.jar" /> + <include name="tomcat/commons-logging-1.0.jar" /> + <include name="tomcat/commons-modeler-1.1.jar" /> + <include name="tomcat/jakarta-regexp-1.3.jar" /> + <include name="tomcat/jasper-compiler-1.0.jar" /> + <include name="tomcat/jasper-runtime-1.0.jar" /> + <include name="tomcat/jsp-api-2.0.jar" /> + <include name="tomcat/mx4j-jmx-1.1.jar" /> + <include name="tomcat/naming-common-1.0.jar" /> + <include name="tomcat/naming-factory-1.0.jar" /> + <include name="tomcat/naming-java-1.0.jar" /> + <include name="tomcat/naming-resources-1.0.jar" /> + <include name="tomcat/servlet-api-2.5.jar" /> + <include name="tomcat/servlet-api-2.4.jar" /> + <include name="tomcat/servlets-common-1.0.jar" /> + <include name="tomcat/servlets-default-1.0.jar" /> + <include name="tomcat/servlets-invoker-1.0.jar" /> + <include name="tomcat/tomcat-coyote-1.0.jar" /> + <include name="tomcat/tomcat-http11-1.0.jar" /> + <include name="tomcat/tomcat-jk2-2.1.jar" /> + <include name="tomcat/tomcat-util-5.1.jar" /> + <!-- htmlunit dependencies not already included: BEGIN --> + <include name="apache/commons/commons-codec-1.3.jar" /> + <include name="apache/commons/commons-httpclient-3.1.jar" /> + <include name="apache/commons/commons-io-1.4.jar" /> + <include name="apache/commons/commons-lang-2.4.jar" /> + <include name="cssparser/cssparser-0.9.5.jar" /> + <include name="htmlunit/htmlunit-2.5.jar" /> + <include name="htmlunit/htmlunit-core-js-2.5.jar" /> + <include name="nekohtml/nekohtml-1.9.12.jar" /> + <include name="xalan/xalan-2.7.1.jar" /> + <include name="xerces/xerces-2_9_1/serializer.jar" /> + <include name="xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" /> + <include name="xerces/xerces-2_9_1/xml-apis.jar" /> + <include name="w3c/sac/sac-1.3.jar" /> + <!-- htmlunit dependencies not already included: END --> + <include name="sun/swingworker/swing-worker-1.1.jar" /> + </fileset> + <fileset file="build.xml"/> + </sourcefiles> + <targetfiles> + <fileset file="${alldeps.jar}"/> + </targetfiles> + <sequential> + <gwt.jar destfile="${alldeps.jar}"> + <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" /> + <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> + <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" /> + <zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/catalina-optional-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/commons-beanutils-1.6.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/commons-digester-1.5.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/commons-logging-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/commons-modeler-1.1.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/jakarta-regexp-1.3.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/mx4j-jmx-1.1.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/naming-common-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/naming-factory-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/naming-java-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/naming-resources-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/servlets-common-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/servlets-default-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/servlets-invoker-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-coyote-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-http11-1.0.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-jk2-2.1.jar" /> + <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-util-5.1.jar" /> + <!-- htmlunit dependencies not already included: BEGIN --> + <zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.3.jar" /> + <zipfileset src="${gwt.tools.lib}/apache/commons/commons-httpclient-3.1.jar" /> + <zipfileset src="${gwt.tools.lib}/apache/commons/commons-io-1.4.jar" /> + <zipfileset src="${gwt.tools.lib}/apache/commons/commons-lang-2.4.jar" /> + <zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.5.jar" /> + <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.5.jar" /> + <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-core-js-2.5.jar" /> + <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.12.jar" /> + <zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1.jar" /> + <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/serializer.jar" /> + <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" /> + <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xml-apis.jar" /> + <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> + <!-- htmlunit dependencies not already included: END --> + <zipfileset src="${gwt.tools.lib}/sun/swingworker/swing-worker-1.1.jar" /> + </gwt.jar> + </sequential> + </outofdate> + </target> + + <property name="filter.pattern" value="com/google/gwt/dev/About.properties" /> + + <target name="-filter.props" description="Creates filtered About.properties with version info" + unless="filter.uptodate"> + <gwt.revfilter todir="${javac.out}"> + <fileset dir="core/src" includes="${filter.pattern}" /> + </gwt.revfilter> + <touch file="${filter.sentinel}" /> + </target> + + <target name="compiler.standalone" description="Validates that the standalone gwt-compiler project can build."> + <mkdir dir="${javac.out}" /> + <gwt.javac srcdir="core/super" excludes="com/google/gwt/dev/jjs/intrinsic/"/> + <gwt.javac srcdir="core/src"> + <include name="com/google/gwt/core/ext/**"/> + <include name="com/google/gwt/core/linker/**"/> + <include name="com/google/gwt/dev/About.java"/> + <include name="com/google/gwt/dev/asm/**"/> + <include name="com/google/gwt/dev/cfg/**"/> + <include name="com/google/gwt/dev/javac/**"/> + <include name="com/google/gwt/dev/jdt/**"/> + <include name="com/google/gwt/dev/jjs/**"/> + <include name="com/google/gwt/dev/js/**"/> + <include name="com/google/gwt/dev/resource/**"/> + <include name="com/google/gwt/dev/util/**"/> + <include name="com/google/gwt/util/tools/**"/> + <classpath> + <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> + <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" /> + <pathelement location="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" /> + <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" /> + </classpath> + </gwt.javac> + + </target> + + <target name="compile" depends="compiler.standalone, build.alldeps.jar" description="Compiles this project"> + <gwt.javac srcdir="" excludes="${filter.pattern}"> + <src path="core/src" /> + <src path="oophm/src" /> + <src path="oophm/overlay" /> + <classpath> + <pathelement location="${alldeps.jar}" /> + <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" /> + </classpath> + </gwt.javac> + <copy todir="${javac.out}"> + <fileset dir="core/src" includes="**/*.properties" excludes="${filter.pattern}"/> + </copy> + + <!-- Files with hardcoded version information must be filtered --> + <gwt.getsvninfo /> + <condition property="filter.uptodate"> + <and> + <available file="${filter.sentinel}" /> + <uptodate> + <srcfiles dir="core/src" includes="${filter.pattern}" /> + <globmapper from="*" to="${javac.out}/*" /> + </uptodate> + </and> + </condition> + <antcall target="-filter.props" /> + </target> + + <target name="checkstyle" description="Static analysis of source"> + <gwt.checkstyle> + <fileset dir="core/src"> + <filename name="com/google/gwt/dev/asm/**/*.java" negate="yes" /> + <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes" /> + <filename name="org/eclipse/**/*.java" negate="yes" /> + <filename name="org/apache/**/*.java" negate="yes" /> + </fileset> + </gwt.checkstyle> + + <gwt.checkstyle> + <fileset dir="core/super/com/google/gwt/dev/jjs/intrinsic" /> + </gwt.checkstyle> + + <gwt.checkstyle> + <fileset dir="oophm/src" /> + </gwt.checkstyle> + + <gwt.checkstyle> + <fileset dir="oophm/overlay" /> + </gwt.checkstyle> + + <gwt.checkstyle> + <fileset dir="oophm/test" /> + </gwt.checkstyle> + </target> + + <target name="test" depends="build, compile.tests" description="Run unit tests for this project."> + <fileset id="tests.dev.core" dir="${javac.junit.out}" includes="${gwt.junit.testcase.dev.core.includes}" excludes="${gwt.junit.testcase.dev.core.excludes}" /> + <gwt.junit test.out="${junit.out}" test.cases="tests.dev.core" > + <extraclasspaths> + <pathelement location="${alldeps.jar}" /> + <!-- Pull in gwt-dev and gwt-user sources for .gwt.xml files --> + <pathelement location="${gwt.root}/user/src/" /> + <pathelement location="${gwt.root}/user/super/" /> + </extraclasspaths> + </gwt.junit> + </target> + + <property.ensure name="gwt.tools.soyc" location="${gwt.root}/tools/soyc-vis" /> + <target name="build" depends="compile" description="Build and package this project"> + <mkdir dir="${gwt.build.lib}" /> + <outofdate> + <sourcefiles> + <fileset dir="oophm/src" excludes="**/package.html"/> + <fileset dir="oophm/overlay" excludes="**/package.html"/> + <fileset dir="core/src"> + <exclude name="**/package.html"/> + <exclude name="**/*.properties"/> <!-- copied and/or filtered into bin --> + </fileset> + <fileset dir="core/super" excludes="**/package.html" /> + <fileset dir="${javac.out}" /> + <fileset dir="${project.build}/bin" /> + <fileset file="${project.build}/alldeps.jar" /> + <fileset dir="${gwt.tools.soyc}/images"/> + <fileset file="${gwt.tools.soyc}/classLevel.css"/> + <fileset file="${gwt.tools.soyc}/roundedCorners.css"/> + </sourcefiles> + <targetfiles> + <fileset file="${project.lib}"/> + </targetfiles> + <sequential> + <gwt.jar> + <fileset dir="oophm/src" excludes="**/package.html"/> + <fileset dir="oophm/overlay" excludes="**/package.html"/> + <fileset dir="core/src"> + <exclude name="**/package.html"/> + <exclude name="**/*.properties"/> <!-- copied and/or filtered into bin --> + </fileset> + <fileset dir="core/super" excludes="**/package.html" /> + <fileset dir="${javac.out}" /> + <zipfileset src="${alldeps.jar}" /> + + <zipfileset dir="${gwt.tools.soyc}/images" prefix="com/google/gwt/soyc/resources/images"/> + <zipfileset file="${gwt.tools.soyc}/classLevel.css" prefix="com/google/gwt/soyc/resources/"/> + <zipfileset file="${gwt.tools.soyc}/roundedCorners.css" prefix="com/google/gwt/soyc/resources/"/> + + <manifest> + <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" /> + </manifest> + </gwt.jar> + </sequential> + </outofdate> + </target> </project> ======================================= --- /changes/jat/noswt/dev/core/build.xml Thu Aug 20 15:05:36 2009 +++ /changes/jat/noswt/dev/core/build.xml Thu Sep 17 16:17:20 2009 @@ -10,6 +10,8 @@ <target name="compile.tests" depends="build, compile.emma" description="Compiles the test code for this project"> <mkdir dir="${javac.junit.out}" /> <gwt.javac srcdir="test" destdir="${javac.junit.out}"> + <src path="../oophm/src" /> + <src path="../oophm/overlay" /> <classpath> <pathelement location="${javac.out}" /> <pathelement location="${alldeps.jar}" /> @@ -69,6 +71,7 @@ <include name="xerces/xerces-2_9_1/xml-apis.jar" /> <include name="w3c/sac/sac-1.3.jar" /> <!-- htmlunit dependencies not already included: END --> + <include name="sun/swingworker/swing-worker-1.1.jar" /> </fileset> <fileset file="build.xml"/> </sourcefiles> @@ -123,6 +126,7 @@ <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xml-apis.jar" /> <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> <!-- htmlunit dependencies not already included: END --> + <zipfileset src="${gwt.tools.lib}/sun/swingworker/swing-worker-1.1.jar" /> </gwt.jar> </sequential> </outofdate> @@ -165,23 +169,10 @@ </target> <target name="build" depends="compiler.standalone, build.alldeps.jar" description="Compiles this project"> - <!-- - There are classes missing from dev/core that are necessary - to compile the rest of dev/core (e.g. BootStrapPlatform); these are - provided by each platform implementation, but in order to compile the - core standalone, we need a dummy version of the class to build against. - --> - <property name="javac.out-dummy" location="${project.build}/bin-dummy" /> - <mkdir dir="${javac.out-dummy}" /> - <gwt.javac srcdir="src-dummy" destdir="${javac.out-dummy}" /> - - <gwt.javac srcdir="src" excludes="${filter.pattern}"> + <gwt.javac srcdir="src:../oophm/overlay:../oophm/src" excludes="${filter.pattern}"> <classpath> - <pathelement location="${javac.out-dummy}" /> <pathelement location="${alldeps.jar}" /> <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" /> - <!-- Must build against a version of SWT; just pick one --> - <pathelement location="${gwt.tools.lib}/eclipse/org.eclipse.swt.gtk-linux-3.2.1.jar" /> </classpath> </gwt.javac> <copy todir="${javac.out}"> ======================================= --- /changes/jat/noswt/distro-source/build.xml Fri Aug 22 09:09:01 2008 +++ /changes/jat/noswt/distro-source/build.xml Thu Sep 17 16:17:20 2009 @@ -3,8 +3,57 @@ <property name="project.tail" value="distro-source" /> <import file="${gwt.root}/platforms.ant.xml" /> + <import file="common.ant.xml" /> + + <property name="project.dist" location="${gwt.build.dist}/${project.distname}.zip" /> + <target name="clean" description="Cleans this project's intermediate and output files"> <delete dir="${gwt.build.dist}" failonerror="false" /> <delete dir="${gwt.build.staging}" failonerror="false" /> + <delete file="${project.dist}" failonerror="false" /> + </target> + + <target name="build" depends="filter" description="Packages the distro"> + <!-- TODO: figure out how to share most of this across platforms --> + <mkdir dir="${gwt.build.dist}" /> + <mkdir dir="${gwt.build.out}/samples-scripts"/> + <zip destfile="${project.dist}"> + <!-- jars --> + <zipfileset file="${gwt.build.lib}/gwt-dev.jar" prefix="${project.distname}" /> + <zipfileset file="${gwt.build.lib}/gwt-user.jar" prefix="${project.distname}" /> + <zipfileset file="${gwt.build.lib}/gwt-servlet.jar" prefix="${project.distname}" /> + <zipfileset file="${gwt.build.lib}/gwt-benchmark-viewer.war" prefix="${project.distname}" /> + <zipfileset file="${gwt.build.lib}/gwt-soyc-vis.jar" prefix="${project.distname}" /> + <zipfileset file="${gwt.build.lib}/gwt-api-checker.jar" prefix="${project.distname}" /> + + <!-- raw files --> + <zipfileset dir="${dist.resources}" prefix="${project.distname}" /> + <zipfileset dir="src" prefix="${project.distname}" /> + + <!-- doc --> + <zipfileset dir="${gwt.build.out}" prefix="${project.distname}"> + <include name="doc" /> + <include name="doc/html/**" /> + <include name="doc/css/**" /> + <include name="doc/javadoc/**" /> + </zipfileset> + + <!-- samples --> + <zipfileset dir="${gwt.build.out}" prefix="${project.distname}"> + <include name="samples" /> + <include name="samples/*" /> + <include name="samples/*/src/**" /> + <include name="samples/*/war/**" /> + </zipfileset> + <zipfileset dir="${gwt.build.out}/samples-scripts" prefix="${project.distname}/samples"> + <include name="*/*" /> + </zipfileset> + </zip> + + <!-- + Unzip distro into the staging directory. + --> + <mkdir dir="${gwt.build.staging}" /> + <unzip src="${project.dist}" dest="${gwt.build.staging}" /> </target> </project> ======================================= --- /changes/jat/noswt/distro-source/common.ant.xml Tue Sep 16 18:38:38 2008 +++ /changes/jat/noswt/distro-source/common.ant.xml Thu Sep 17 16:17:20 2009 @@ -3,7 +3,7 @@ <property name="project.tail" value="distro-source/${dist.platform}" /> <import file="${gwt.root}/common.ant.xml" /> - <property name="project.distname" value="gwt-${dist.platform}-${gwt.version}" /> + <property name="project.distname" value="gwt-${gwt.version}" /> <property name="project.staging" location="${gwt.build.staging}/${project.distname}" /> <property name="dist.resources" location="${project.build}/resources" /> @@ -23,7 +23,7 @@ <and> <available file="${filter.sentinel}" /> <uptodate> - <srcfiles dir="../core/src" /> + <srcfiles dir="core/src" /> <globmapper from="*" to="${dist.resources}/*" /> </uptodate> </and> @@ -33,7 +33,7 @@ <target name="-filter.props" unless="filter.uptodate"> <gwt.revfilter todir="${dist.resources}" > - <fileset dir="../core/src" /> + <fileset dir="core/src" /> </gwt.revfilter> <touch file="${filter.sentinel}" /> </target> ======================================= --- /changes/jat/noswt/doc/build.xml Tue Jun 16 08:37:30 2009 +++ /changes/jat/noswt/doc/build.xml Thu Sep 17 16:17:20 2009 @@ -7,7 +7,7 @@ <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-${build.host.platform}.jar" /> + <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" /> <property name="USER_PKGS" value="com.google.gwt.animation.client;com.google.gwt.benchmarks.client;com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.soyc;com.google.gwt.core.ext.linker;com.google.gwt.core.ext.typeinfo;com.google.gwt.debug.client;com.google.gwt.dom.client;com.google.gwt.event.dom.client;com.google.gwt.event.logical.shared;com.google.gwt.event.shared;com.google.gwt.http.client;com.google.gwt.i18n.client;com.google.gwt.i18n.client.constants;com.google.gwt.i18n.rebind.format;com.google.gwt.i18n.rebind.keygen;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.benchmarks.client;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.datepicker.client;com.google.gwt.user.server.rpc;com.google.gwt.xml.client"/> ======================================= --- /changes/jat/noswt/platforms.ant.xml Tue Nov 25 16:21:22 2008 +++ /changes/jat/noswt/platforms.ant.xml Thu Sep 17 16:17:20 2009 @@ -1,10 +1,6 @@ <project name="platforms"> <import file="${gwt.root}/common.ant.xml" /> - <condition property="oophm.exists" value="true"> - <available file="oophm" /> - </condition> - <!-- "build" is the default when subprojects are directly targetted --> <property name="target" value="build" /> @@ -13,24 +9,7 @@ <gwt.ant dir="core" /> </target> - <target name="linux" depends="core" description="Run linux"> - <gwt.ant dir="linux" /> - </target> - - <target name="oophm" depends="core" description="OOPHM overlay" - if="oophm.exists"> - <gwt.ant dir="oophm" /> - </target> - - <target name="windows" depends="core" description="Run windows"> - <gwt.ant dir="windows" /> - </target> - - <target name="mac" depends="core" description="Run mac"> - <gwt.ant dir="mac" /> - </target> - - <target name="-do" depends="linux, windows, mac, oophm" description="Run all platforms" /> + <target name="-do" depends="core" description="Run all platforms" /> <target name="build" description="Build each platforms"> <antcall target="-do"> ======================================= --- /changes/jat/noswt/samples/common.ant.xml Tue Jun 23 09:20:54 2009 +++ /changes/jat/noswt/samples/common.ant.xml Thu Sep 17 16:17:20 2009 @@ -15,8 +15,7 @@ <property name="sample.upper" 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-${build.host.platform}.jar" /> + <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" /> <!-- Mirror directory for scripts; makes building distro easier --> <property name="samples.scripts" value="${gwt.build.out}/samples-scripts" /> ======================================= --- /changes/jat/noswt/tools/api-checker/build.xml Wed Aug 5 12:55:36 2009 +++ /changes/jat/noswt/tools/api-checker/build.xml Thu Sep 17 16:17:20 2009 @@ -8,8 +8,7 @@ <property name="gwt.junit.testcase.apichecker.includes" value="**/*Test.class" /> <property name="gwt.junit.testcase.apichecker.excludes" value="" /> - <!-- Platform shouldn't matter here, just picking one --> - <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" /> + <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" /> <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" /> <target name="compile" description="Compile all class files"> ======================================= --- /changes/jat/noswt/tools/benchmark-viewer/build.xml Fri Jun 12 19:28:21 2009 +++ /changes/jat/noswt/tools/benchmark-viewer/build.xml Thu Sep 17 16:17:20 2009 @@ -15,7 +15,7 @@ <import file="${gwt.root}/common.ant.xml" /> <!-- Platform shouldn't matter here, just picking one --> - <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" /> + <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" /> <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" /> <property.ensure name="gwt.servlet.jar" location="${gwt.build.lib}/gwt-servlet.jar" /> ======================================= --- /changes/jat/noswt/tools/soyc-vis/build.xml Fri Aug 21 10:48:30 2009 +++ /changes/jat/noswt/tools/soyc-vis/build.xml Thu Sep 17 16:17:20 2009 @@ -6,8 +6,7 @@ <property name="project.tail" value="tools/soyc-vis" /> <import file="${gwt.root}/common.ant.xml" /> - <!-- Platform shouldn't matter here, just picking one --> - <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" /> + <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" /> <target name="clean"> <delete dir="build"/> ======================================= --- /changes/jat/noswt/user/build.xml Thu Sep 10 16:26:01 2009 +++ /changes/jat/noswt/user/build.xml Thu Sep 17 16:17:20 2009 @@ -37,7 +37,7 @@ </path> <!-- Platform shouldn't matter here, just picking one --> - <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" /> + <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" /> <target name="compile" description="Compile all class files"> <mkdir dir="${javac.out}" /> @@ -49,7 +49,6 @@ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" /> <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3.jar" /> - <pathelement location="${gwt.build.lib}/gwt-dev-oophm.jar" /> <pathelement location="${gwt.dev.jar}" /> </classpath> </gwt.javac> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
