Fix for #2870 - Include information about which GWT version is used

svn changeset:7641/svn branch:6.0

diff --git a/build/GWT-VERSION.properties b/build/GWT-VERSION.properties
index 5aebe99a94e98b74713981785265142555f2c81a..c0c487e76d933fc89f5d363d73c99e5d3d31719a 100644 (file)
--- 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 ec50f34df76c03ab0d83baa1b6565cb25c216e6d..5649b7b86a4f619c1c5dfeb9ed350a49c27afca5 100644 (file)
--- 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/**" />