GWT build version is now replaced with GWT-VAADIN build version.

diff --git a/build/build.xml b/build/build.xml
index 2988218c4de8bfbdbb71e8704d612047c97d8dfe..d905bb9c6f925d63a8122747c07e1e8dcd77d38e 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -129,6 +129,7 @@
                <property name="result-classes-sass" value="${result-path}/classes/sass"/>
                <property name="result-classes-sass-junit" value="${result-path}/classes/sass-junit"/>
                <property name="result-precompiled-widgetsets" value="${result-path}/classes/widgetsets"/>
+               <property name="result-classes-gwt" value="${result-path}/classes/gwt" />
 
                <!-- Default classpath for building widgetsets, overridden for testing widgetset -->
                <path id="compile.classpath.widgetset">
@@ -848,9 +849,12 @@
         <!-- Create Vaadin JAR -->
         <mkdir dir="${output-dir}/META-INF"/>
         <echo file="${output-dir}/META-INF/VERSION">${version.full}</echo> 
+       
+       <!-- Replace GWT versioning with Vaadin versioning -->
+       <echo file="${result-classes-gwt}/com/google/gwt/dev/About.properties">gwt.version=${gwt-version}.vaadin${version.full}</echo>
                
         <jarjar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}"
-             compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve" index="true">
+             compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve" index="true" >
             <metainf dir="${output-dir}/META-INF"/>
             <manifest>
                 <attribute name="Vaadin-Package-Version" value="1" />
@@ -874,6 +878,7 @@
             <fileset dir="${result-src-shared}"/>
             <fileset dir="${result-src-sass}"/>
             <fileset dir="${result-src-client-compiler}"/>
+               <fileset dir="${result-classes-gwt}"/>
             <fileset dir="${output-dir}/WebContent">
                 <patternset>
                     <include name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
@@ -899,7 +904,7 @@
             <!-- GWT -->
                <!-- Precompiled GWT modules (.gwtar file) not included to limit JAR size -->
             <zipfileset src="${gwt.user.jar}" excludes="META-INF/**,javax/servlet/**,**/*.gwtar" />
-
+       
                <!-- TODO depends on locally compiled gwt-user -->
                <!--
                <fileset dir="${gwt.user.dir}/src" excludes="**/package.html" />
@@ -912,7 +917,9 @@
                -->
 
                <!-- GWT development JAR contents including many external dependencies -->
-            <zipfileset src="${gwt.dev.jar}" excludes="javax/servlet/**,javax/xml/**" />
+            <zipfileset src="${gwt.dev.jar}" excludes="javax/servlet/**,javax/xml/**" >    
+               <exclude name="com/google/gwt/dev/About.properties"/>   
+            </zipfileset>
 
             <!-- Alternative approach: GWT compiler and its dependencies only from the dev JAR -->
             <!--
@@ -974,6 +981,7 @@
             <rule pattern="org.hibernate.validator.**" result="com.vaadin.external.@0"/>
             <rule pattern="org.jdesktop.swingworker.**" result="com.vaadin.external.@0"/>
             <rule pattern="org.kohsuke.args4j.**" result="com.vaadin.external.@0"/>
+                               
         </jarjar>
         
         <!-- Generate the Export-Package attribute in the manifest of the JAR -->