diff options
| -rw-r--r-- | client-compiler/build.xml | 79 | ||||
| -rw-r--r-- | common.xml | 1 | ||||
| -rw-r--r-- | gwt-files.xml | 189 | ||||
| -rw-r--r-- | gwt/ivy.xml | 30 |
4 files changed, 0 insertions, 299 deletions
diff --git a/client-compiler/build.xml b/client-compiler/build.xml deleted file mode 100644 index 5a5d1a6161..0000000000 --- a/client-compiler/build.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0"?> - -<project name="vaadin-client-compiler" basedir="." default="publish-local" - xmlns:ivy="antlib:org.apache.ivy.ant"> - <description> - Compiles build helpers used when building other - modules. - </description> - <include file="../common.xml" as="common" /> - <include file="../build.xml" as="vaadin" /> - <include file="../gwt-files.xml" as="gwtfiles" /> - - <!-- global properties --> - <property name="module.name" value="vaadin-client-compiler" /> - <property name="module.symbolic" value="com.vaadin.client-compiler" /> - <property name="result.dir" value="result" /> - <path id="classpath.compile.custom"> - <fileset file="${gwt.dev.jar}" /> - </path> - <path id="classpath.test.custom"> - <fileset dir="${result.dir}/classes"> - <include name="**/*" /> - </fileset> - </path> - <property name="extra.classes" value="**/*.properties" /> - <!-- don't try to copy the same files twice (first from classes and then - from sources) in order for the build not to fail when packaging the JAR --> - <property name="jar.exclude" value="**/*.properties" /> - <union id="compiler.includes"> - <union refid="client-compiler.gwt.includes" /> - <fileset dir="${result.dir}"> - <include name="com/google/gwt/dev/About.properties" /> - </fileset> - </union> - - <target name="jar"> - <!-- Get Git revision --> - <exec executable="git" outputproperty="git.revision" - failifexecutionfails="false" errorproperty=""> - <arg value="describe" /> - <arg value="--tags" /> - <arg value="--always" /> - <arg value="HEAD" /> - </exec> - - <echo file="${result.dir}/com/google/gwt/dev/About.properties">gwt.version=${vaadin.version} - gwt.svnrev=${git.revision}</echo> - - <antcall target="common.jar"> - <reference refid="compiler.includes" torefid="extra.jar.includes" /> - </antcall> - - </target> - - <target name="publish-local" depends="jar"> - <antcall target="common.sources.jar"> - <reference torefid="extra.jar.includes" refid="compiler.includes" /> - </antcall> - <antcall target="common.javadoc.jar" /> - - <antcall target="common.publish-local" /> - </target> - - <target name="clean"> - <antcall target="common.clean" /> - </target> - - <target name="checkstyle"> - <antcall target="common.checkstyle"> - <param name="cs.src" location="src" /> - </antcall> - </target> - - <target name="test" depends="checkstyle"> - <antcall target="common.test.run" /> - <!--<echo>WHAT? No tests for ${module.name}!</echo> --> - </target> - -</project> diff --git a/common.xml b/common.xml index d9fcb40975..c624efce0c 100644 --- a/common.xml +++ b/common.xml @@ -6,7 +6,6 @@ </tstamp> <dirname property="vaadin.basedir" file="${ant.file.common}" /> - <property name="gwt.basedir" location="${vaadin.basedir}/../gwt" /> <property file="${vaadin.basedir}/build.properties" /> <property name="modules.producing.jar" value="shared,server,client,client-compiler,client-compiled,themes,push,widgets" /> diff --git a/gwt-files.xml b/gwt-files.xml deleted file mode 100644 index fd31482bdc..0000000000 --- a/gwt-files.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0"?> - -<project name="GWT files for Vaadin" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <include file="common.xml" as="common" /> - - <ivy:resolve log="download-only" file="${vaadin.basedir}/gwt/ivy.xml" transitive="false" /> - <ivy:cachepath pathid="gwt-dev.classpath" conf="gwt-dev" /> - <ivy:cachepath pathid="gwt-user.classpath" conf="gwt-user" /> - <ivy:cachepath pathid="gwt-elemental.classpath" conf="gwt-elemental" /> - - <property name="gwt.eclipse.basedir" location="${gwt.basedir}/eclipse" /> - - <property name="gwt.user.jar" refid="gwt-user.classpath" /> - <property name="gwt.dev.jar" refid="gwt-dev.classpath" /> - <property name="gwt.elemental.jar" refid="gwt-elemental.classpath" /> - - <available file="${gwt.dev.jar}" property="gwt.dev.jar.found" /> - <available file="${gwt.user.jar}" property="gwt.user.jar.found" /> - <available file="${gwt.elemental.jar}" property="gwt.elemental.jar.found" /> - - <property name="gwt.unpack.dir" location="${vaadin.basedir}/build/gwt" /> - - <property name="gwt.user.jar.files" location="${gwt.unpack.dir}/gwt-user.jar" /> - <property name="gwt.dev.jar.files" location="${gwt.unpack.dir}/gwt-dev.jar" /> - <property name="gwt.elemental.jar.files" location="${gwt.unpack.dir}/gwt-elemental.jar" /> - - <target name="unpack.gwt"> - <fail unless="gwt.dev.jar.found" message="Could not find gwt-dev.jar at ${gwt.dev.jar}" /> - <fail unless="gwt.user.jar.found" message="Could not find gwt-user.jar at ${gwt.user.jar}" /> - <fail unless="gwt.elemental.jar.found" message="Could not find gwt-elemental.jar at ${gwt.elemental.jar}" /> - - <delete dir="${gwt.unpack.dir}" /> - - <mkdir dir="${gwt.user.jar.files}" /> - <mkdir dir="${gwt.dev.jar.files}" /> - <mkdir dir="${gwt.elemental.jar.files}" /> - - <unzip dest="${gwt.user.jar.files}" src="${gwt.user.jar}" /> - <unzip dest="${gwt.dev.jar.files}" src="${gwt.dev.jar}" /> - <unzip dest="${gwt.elemental.jar.files}" src="${gwt.elemental.jar}" /> - </target> - - <union id="client-compiler.gwt.includes"> - <!-- GWT development JAR contents including many external dependencies - (for now) --> - <fileset dir="${gwt.dev.jar.files}"> - <exclude name="META-INF/**" /> - <exclude name="license*" /> - <exclude name="LICENSE*" /> - - <!-- Packages in vaadin-shared-deps.jar or declared as dependencies --> - <exclude name="com/google/gwt/thirdparty/guava/**" /> - <exclude name="javax/servlet/**" /> - <exclude name="javax/xml/**" /> - <!-- cssparser --> - <exclude name="com/steadystate/css/**" /> - <!-- Ant & AntLauncher --> - <exclude name="org/apache/tools/**" /> - <!-- Jetty & jetty-util --> - <exclude name="org/mortbay/**" /> - <!-- Swing Worker --> - <exclude name="org/jdesktop/swingworker/**" /> - <!-- Apache commons codec & io & lang & collections & logging --> - <exclude name="org/apache/commons/codec/**" /> - <exclude name="org/apache/commons/io/**" /> - <exclude name="org/apache/commons/lang/**" /> - <exclude name="org/apache/commons/collections/**" /> - <exclude name="org/apache/commons/logging/**" /> - <!-- apache mime4j --> - <exclude name="org/apache/james/mime4j/**" /> - - <!-- client-compiler-deps --> - <exclude name="com/gargoylesoftware/" /> - <exclude name="com/google/common/" /> - <exclude name="com/google/debugging/" /> - <exclude name="com/google/gwt/dev/protobuf/" /> - <exclude name="com/google/gwt/thirdparty/debugging/" /> - <exclude name="com/google/gwt/thirdparty/javascript/" /> - <exclude name="com/google/gwt/thirdparty/mozilla/" /> - <exclude name="com/ibm/" /> - <exclude name="externs.zip" /> - <exclude name="java_cup/" /> - <exclude name="javax/annotation/" /> - <exclude name="net/sourceforge/htmlunit/" /> - <exclude name="org/apache/bcel/" /> - <exclude name="org/apache/html/" /> - <exclude name="org/apache/http/" /> - <exclude name="org/apache/NOTICE" /> - <exclude name="org/apache/regexp/" /> - <exclude name="org/apache/tapestry/" /> - <exclude name="org/apache/wml/" /> - <exclude name="org/apache/xalan/" /> - <exclude name="org/apache/xerces/" /> - <exclude name="org/apache/xml/" /> - <exclude name="org/apache/xmlcommons/" /> - <exclude name="org/apache/xpath/" /> - <exclude name="org/cyberneko/" /> - <exclude name="org/eclipse/" /> - <exclude name="org/kohsuke/" /> - <exclude name="org/w3c/" /> - <exclude name="org/xml/" /> - <exclude name="rhino_ast/" /> - <exclude name="rhinoDiff.txt" /> - <exclude name="trax/" /> - <exclude name="unicode-license.txt" /> - <exclude name="org/json" /> - - <exclude name="license/NOTICE" /> - <exclude name="license/LICENSE.dom-documentation.txt" /> - <exclude name="license/LICENSE.dom-software.txt" /> - <exclude name="license/LICENSE" /> - <exclude name="license/README.dom.txt" /> - <exclude name="license/README.sax.txt" /> - - <!-- Overridden in Vaadin --> - <exclude name="com/google/gwt/dev/About.properties" /> - - </fileset> - - </union> - - <union id="client-compiled-cache.gwt.includes"> - <!-- Precompiled GWT modules (.gwtar file) --> - <fileset dir="${gwt.user.jar.files}"> - <exclude name="META-INF/**" /> - - <!-- precompiled GWT modules (.gwtar) --> - <include name="**/*.gwtar" /> - <!-- external dependencies --> - <exclude name="javax/servlet/**" /> - <exclude name="org/w3c/css/sac/**" /> - - </fileset> - </union> - - <union id="client.gwt.includes"> - <fileset dir="${gwt.user.jar.files}"> - <exclude name="META-INF/**" /> - <!-- precompiled GWT modules (.gwtar) goes into client-compiled --> - <exclude name="**/*.gwtar" /> - <!-- These go into server --> - <exclude name="com/google/gwt/*/server/**" /> - <!-- These go into shared --> - <exclude name="com/google/gwt/*/shared/**" /> - <exclude name="com/google/gwt/*/*/shared/**" /> - <exclude name="com/google/web/bindery/*/shared/**" /> - - <!-- Used by the server, in wrong package in GWT --> - <exclude name="com/google/gwt/user/client/rpc/IsSerializable.*" /> - - <!-- These are in vaadin-shared-deps --> - <exclude name="com/google/gwt/thirdparty/streamhtmlparser/**" /> - <exclude name="org/w3c/flute/**" /> - - <!-- external dependencies --> - <exclude name="javax/servlet/**" /> - <exclude name="org/w3c/css/sac/**" /> - </fileset> - <!-- GWT Elemental --> - <fileset dir="${gwt.elemental.jar.files}"> - <exclude name="META-INF/**" /> - </fileset> - </union> - - <union id="shared.gwt.includes"> - <fileset dir="${gwt.user.jar.files}"> - <!-- Shared files from user --> - <include name="com/google/gwt/*/shared/**" /> - <include name="com/google/gwt/*/*/shared/**" /> - <include name="com/google/web/bindery/*/shared/**" /> - <include name="com/google/gwt/user/client/rpc/IsSerializable.*" /> - - </fileset> - <!-- GWT Elemental --> - <fileset dir="${gwt.elemental.jar.files}"> - <include name="elemental/util/Array*" /> - <include name="elemental/util/Can*" /> - <include name="elemental/util/Map*" /> - <include name="elemental/json/**" /> - </fileset> - </union> - - <union id="server.gwt.includes"> - <fileset dir="${gwt.user.jar.files}"> - <!-- Server files from gwt-user --> - <include name="com/google/gwt/*/server/**" /> - </fileset> - </union> -</project> diff --git a/gwt/ivy.xml b/gwt/ivy.xml deleted file mode 100644 index d34b7ccfcc..0000000000 --- a/gwt/ivy.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" - xmlns:m="http://ant.apache.org/ivy/maven"> - - <info organisation="com.vaadin" module="vaadin-gwt" - revision="${vaadin.version}" /> - - <configurations> - <conf name="build" /> - <conf name="gwt-dev" /> - <conf name="gwt-user" /> - <conf name="gwt-codeserver" /> - <conf name="gwt-elemental" /> - <conf name="ide" visibility="private" /> - </configurations> - <publications> - <artifact type="jar" ext="jar" /> - <artifact type="source" ext="jar" m:classifier="sources" /> - <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> - <artifact type="pom" ext="pom" /> - </publications> - <dependencies> - <dependency org="com.vaadin.external.gwt" name="gwt-dev" rev="${gwt.version}" conf="gwt-dev,ide->default" /> - <dependency org="com.vaadin.external.gwt" name="gwt-user" rev="${gwt.version}" conf="gwt-user,ide->default" /> - <dependency org="com.vaadin.external.gwt" name="gwt-codeserver" rev="${gwt.version}" conf="gwt-codeserver,ide->default" /> - <dependency org="com.vaadin.external.gwt" name="gwt-elemental" rev="${gwt.version}" conf="gwt-elemental,ide->default" /> - </dependencies> -</ivy-module> |