From 5242d6b52922dfbc81c11a3397021a1753884ce9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 7 May 2009 07:11:56 +0000
Subject: Fix for #2870 - Include information about which GWT version is used

svn changeset:7641/svn branch:6.0
---
 build/GWT-VERSION.properties |  2 +-
 build/build.xml              | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'build')

diff --git a/build/GWT-VERSION.properties b/build/GWT-VERSION.properties
index 5aebe99a94..c0c487e76d 100644
--- a/build/GWT-VERSION.properties
+++ b/build/GWT-VERSION.properties
@@ -1 +1 @@
-gwt-version=1.5.3
+gwt-version=1.6.4
\ No newline at end of file
diff --git a/build/build.xml b/build/build.xml
index ec50f34df7..5649b7b86a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -182,6 +182,7 @@
 
 		<property file="build/build.properties" />
 		<property file="build/VERSION.properties" />
+		<property file="build/GWT-VERSION.properties" />
 		<property file="build/html-style.properties" />
 
         <echo>Toolkit package is: ${toolkit-package}</echo>
@@ -192,7 +193,7 @@
 		<!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
 		<property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
 
-		<echo>We are on ${platform} platform (${os.name} ${os.version}), using ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo>
+		<echo>We are on ${platform} platform (${os.name} ${os.version}), using ${gwt-dir}/${platform}/${lib-gwt-dev} (${gwt-version}).</echo>
 
 		<!-- Destination files -->
 		<property name="lib-jar-name" value="${product-file}-${version}.jar" />
@@ -863,6 +864,7 @@
 	<!-- Definitions for building local components, i.e., not for an installation package. -->
 	<target name="init-nonpackage" depends="init-platform">
 		<property file="build/VERSION.properties" />
+		<property file="build/GWT-VERSION.properties" />
 
 		<!-- Definitions for building the client-side. -->
 		<property name="output-dir" value="." />
@@ -910,7 +912,13 @@
 	<target name="libs" depends="compile-java, webcontent, compile-widgetset-default">
 		<echo>Creating libs (server-side) ${lib-jar-name}</echo>
 		<!-- Create Toolkit JAR -->
+		<mkdir dir="${output-dir}/META-INF"/>
+		<echo file="${output-dir}/META-INF/VERSION">${version}</echo> 
+		<echo file="${output-dir}/META-INF/GWT-VERSION">${gwt-version}</echo> 
+		
 		<jar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" compress="true">
+			<metainf dir="${output-dir}/META-INF"/>
+			
 			<fileset dir="${result-path}/classes">
 				<patternset>
 					<exclude name="${toolkit-package}/demo/**" />
-- 
cgit v1.2.3