From 557acfb6c4212ad1ddd5270fc7e25f1fc3d63762 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 31 Aug 2012 16:13:18 +0300
Subject: Module for compiled client side (#9299)

---
 client-compiler/build.xml | 16 ++++++++++++----
 client-compiler/ivy.xml   |  0
 2 files changed, 12 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 client-compiler/build.xml
 mode change 100755 => 100644 client-compiler/ivy.xml

(limited to 'client-compiler')

diff --git a/client-compiler/build.xml b/client-compiler/build.xml
old mode 100755
new mode 100644
index 3db3cbddba..2b5d9e34dc
--- 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
old mode 100755
new mode 100644
-- 
cgit v1.2.3