diff options
Diffstat (limited to 'client-compiler')
| -rw-r--r-- | client-compiler/build.xml | 108 | ||||
| -rw-r--r-- | client-compiler/ivy.xml | 106 |
2 files changed, 109 insertions, 105 deletions
diff --git a/client-compiler/build.xml b/client-compiler/build.xml index cd8433f1cf..0ed4d7b0e3 100644 --- a/client-compiler/build.xml +++ b/client-compiler/build.xml @@ -1,68 +1,70 @@ <?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" /> +<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> + <!-- 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> - <union id="compiler.includes"> - <union refid="client-compiler.gwt.includes" /> - <fileset dir="${result.dir}"> - <include name="com/google/gwt/dev/About.properties" /> - </fileset> - </union> + <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> + <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> + <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> + <antcall target="common.jar"> + <reference refid="compiler.includes" torefid="extra.jar.includes" /> + </antcall> - </target> + </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" /> + <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> + <antcall target="common.publish-local" /> + </target> - <target name="clean"> - <antcall target="common.clean" /> - </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="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> + <target name="test" depends="checkstyle"> + <!--<antcall target="common.test.run" /> --> + <echo>WHAT? No tests for ${module.name}!</echo> + </target> </project>
\ No newline at end of file diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml index 64c0de2830..f66a2e0255 100644 --- a/client-compiler/ivy.xml +++ b/client-compiler/ivy.xml @@ -1,62 +1,64 @@ <?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"> + 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-client-compiler" - revision="${vaadin.version}" /> + <info organisation="com.vaadin" module="vaadin-client-compiler" + revision="${vaadin.version}" /> - <configurations> - <conf name="build" /> - <conf name="build-provided" /> - <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" name="vaadin-shared" rev="${vaadin.version}" - conf="build" /> - <dependency org="com.vaadin" name="vaadin-server" rev="${vaadin.version}" - conf="build" /> - <dependency org="com.vaadin" name="vaadin-client" rev="${vaadin.version}" - conf="build" /> - <dependency org="com.vaadin" name="vaadin-theme-compiler" - rev="${vaadin.version}" conf="build" /> + <configurations> + <conf name="build" /> + <conf name="build-provided" /> + <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" name="vaadin-shared" + rev="${vaadin.version}" conf="build" /> + <dependency org="com.vaadin" name="vaadin-server" + rev="${vaadin.version}" conf="build" /> + <dependency org="com.vaadin" name="vaadin-client" + rev="${vaadin.version}" conf="build" /> + <dependency org="com.vaadin" name="vaadin-theme-compiler" + rev="${vaadin.version}" conf="build" /> - <dependency org="commons-collections" name="commons-collections" - rev="3.1" conf="build,ide -> default" /> - <dependency org="commons-logging" name="commons-logging" - rev="1.1.1" conf="build,ide -> default" /> + <dependency org="commons-collections" name="commons-collections" + rev="3.1" conf="build,ide -> default" /> + <dependency org="commons-logging" name="commons-logging" + rev="1.1.1" conf="build,ide -> default" /> - <dependency org="ant" name="ant" rev="1.6.5" conf="build,ide -> default" /> - <dependency org="net.sourceforge.cssparser" name="cssparser" - rev="0.9.5" conf="build,ide -> default" /> - <dependency org="ant" name="ant" rev="1.6.5" conf="build,ide -> default" /> - <dependency org="ant" name="ant-launcher" rev="1.6.5" - conf="build,ide -> default" /> - <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.11" - conf="build,ide -> default" /> - <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.11" - conf="build,ide -> default" /> - <dependency org="org.jdesktop" name="swing-worker" rev="1.1" - conf="build,ide -> default" /> - <dependency org="commons-codec" name="commons-codec" rev="1.3" - conf="build,ide -> default" /> - <dependency org="commons-io" name="commons-io" rev="2.2" - conf="build,ide -> default" /> - <dependency org="commons-lang" name="commons-lang" rev="2.6" - conf="build,ide -> default" /> - <dependency org="org.apache.james" name="apache-mime4j" - rev="0.6" conf="build,ide -> default" /> + <dependency org="ant" name="ant" rev="1.6.5" + conf="build,ide -> default" /> + <dependency org="net.sourceforge.cssparser" name="cssparser" + rev="0.9.5" conf="build,ide -> default" /> + <dependency org="ant" name="ant" rev="1.6.5" + conf="build,ide -> default" /> + <dependency org="ant" name="ant-launcher" rev="1.6.5" + conf="build,ide -> default" /> + <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.11" + conf="build,ide -> default" /> + <dependency org="org.mortbay.jetty" name="jetty-util" + rev="6.1.11" conf="build,ide -> default" /> + <dependency org="org.jdesktop" name="swing-worker" + rev="1.1" conf="build,ide -> default" /> + <dependency org="commons-codec" name="commons-codec" + rev="1.3" conf="build,ide -> default" /> + <dependency org="commons-io" name="commons-io" rev="2.2" + conf="build,ide -> default" /> + <dependency org="commons-lang" name="commons-lang" + rev="2.6" conf="build,ide -> default" /> + <dependency org="org.apache.james" name="apache-mime4j" + rev="0.6" conf="build,ide -> default" /> - <dependency org="com.vaadin" name="vaadin-client-compiler-deps" - rev="1.0.2" conf="build,ide -> default" /> + <dependency org="com.vaadin" name="vaadin-client-compiler-deps" + rev="1.0.2" conf="build,ide -> default" /> - </dependencies> + </dependencies> </ivy-module> |