summaryrefslogtreecommitdiffstats
path: root/client-compiler
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-08-31 16:13:18 +0300
committerArtur Signell <artur@vaadin.com>2012-09-09 11:23:07 +0300
commit557acfb6c4212ad1ddd5270fc7e25f1fc3d63762 (patch)
tree03d5d4887370830d3987df959e3ccc5c287a416a /client-compiler
parent4156f77898416e1b5a7f0ef69823b2dda537bab2 (diff)
downloadvaadin-framework-557acfb6c4212ad1ddd5270fc7e25f1fc3d63762.tar.gz
vaadin-framework-557acfb6c4212ad1ddd5270fc7e25f1fc3d63762.zip
Module for compiled client side (#9299)
Diffstat (limited to 'client-compiler')
-rw-r--r--[-rwxr-xr-x]client-compiler/build.xml16
-rw-r--r--[-rwxr-xr-x]client-compiler/ivy.xml0
2 files changed, 12 insertions, 4 deletions
diff --git a/client-compiler/build.xml b/client-compiler/build.xml
index 3db3cbddba..2b5d9e34dc 100755..100644
--- a/client-compiler/build.xml
+++ b/client-compiler/build.xml
@@ -12,14 +12,22 @@
<property name="module.name" value="vaadin-client-compiler" />
<property name="result.dir" value="result" />
<path id="classpath.compile.custom">
- <fileset file="${gwt.dev.jar}"/>
+ <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>
+
<target name="jar">
+ <echo file="${result.dir}/com/google/gwt/dev/About.properties">gwt.version=${vaadin.version}</echo>
+
<antcall target="common.jar">
- <reference refid="client-compiler.gwt.includes" torefid="extra.jar.includes" />
+ <reference refid="compiler.includes" torefid="extra.jar.includes" />
</antcall>
-
</target>
<target name="publish-local" depends="jar">
@@ -29,7 +37,7 @@
<target name="clean">
<antcall target="common.clean" />
</target>
-
+
<target name="tests">
<!--<antcall target="common.tests.run" />-->
<echo>WHAT? No tests for ${module.name}!</echo>
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index f0cabd85bb..f0cabd85bb 100755..100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml