Include GWT sources in sources jar (#9102)

Change-Id: I99928a614cf220b79f107e45eb02dc3de8333db1

diff --git a/buildhelpers/build.xml b/buildhelpers/build.xml
index e3e7b434d6180df5a288a8da5f8ac2a1d3340c17..c7b9eba9d3b063621f0672c2fc0c14fa979a65bd 100644 (file)
--- a/buildhelpers/build.xml
+++ b/buildhelpers/build.xml
@@ -19,7 +19,9 @@
        </target>
 
        <target name="publish-local" depends="jar">
-               <antcall target="common.sources.jar" />
+               <antcall target="common.sources.jar">
+                       <reference torefid="extra.jar.includes" refid="empty.reference" />
+               </antcall>
                <antcall target="common.javadoc.jar" />
                <antcall target="common.publish-local" />
        </target>

diff --git a/client-compiler/build.xml b/client-compiler/build.xml
index 9d4e5c403c769b15785ea1616e4accd3fd2b33d3..64368b4957b108e8bc7822f47e844f6cbb28d165 100644 (file)
--- a/client-compiler/build.xml
+++ b/client-compiler/build.xml
@@ -42,7 +42,9 @@ gwt.svnrev=${git.revision}</echo>
        </target>
 
        <target name="publish-local" depends="jar">
-               <antcall target="common.sources.jar" />
+               <antcall target="common.sources.jar">
+                       <reference torefid="extra.jar.includes" refid="compiler.includes" />
+               </antcall>
                <antcall target="common.javadoc.jar" />
 
                <antcall target="common.publish-local" />

diff --git a/client/build.xml b/client/build.xml
index d2946be6e0813e5b6bae93214ccb1015582616bc..d0dae91dfaf17ae6d842c912370b7f7e6adeceeb 100644 (file)
--- a/client/build.xml
+++ b/client/build.xml
@@ -51,7 +51,9 @@
        </target>
 
        <target name="publish-local" depends="jar">
-               <antcall target="common.sources.jar" />
+               <antcall target="common.sources.jar">
+                       <reference torefid="extra.jar.includes" refid="client.gwt.includes" />
+               </antcall>
                <antcall target="common.javadoc.jar" />
 
                <antcall target="common.publish-local" />

diff --git a/common.xml b/common.xml
index 63886dc4b5e854ee0c3e3fb5ff73a198e2eef07c..3de10979a2795f4953e7454121cbc6aa30b31538 100644 (file)
--- a/common.xml
+++ b/common.xml
@@ -122,6 +122,10 @@
                                </patternset>
                        </fileset>
                        <fileset refid="common.files.for.all.jars" />
+                       <restrict>
+                               <union refid="extra.jar.includes" />
+                               <name name="*.java" />
+                       </restrict>
                </jar>
 
        </target>

diff --git a/server/build.xml b/server/build.xml
index 253d09a45b3b8c5e4e2bf75789422a9e85f35520..91526dd1c50a327dbe404fa9aa4e0333655d056a 100644 (file)
--- a/server/build.xml
+++ b/server/build.xml
@@ -33,7 +33,9 @@
        </target>
 
        <target name="publish-local" depends="jar">
-               <antcall target="common.sources.jar" />
+               <antcall target="common.sources.jar">
+                       <reference torefid="extra.jar.includes" refid="server.gwt.includes" />
+               </antcall>
                <antcall target="common.javadoc.jar" />
 
                <antcall target="common.publish-local" />

diff --git a/shared/build.xml b/shared/build.xml
index 06a27b0ef96a06c0422296344a8aca6df29ac101..6ea753afa173fc16c0b9ee276584a480d560db82 100644 (file)
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -38,7 +38,9 @@
        </target>
 
        <target name="publish-local" depends="jar">
-               <antcall target="common.sources.jar" />
+               <antcall target="common.sources.jar">
+                       <reference torefid="extra.jar.includes" refid="shared.gwt.includes" />
+               </antcall>
                <antcall target="common.javadoc.jar" />
 
                <antcall target="common.publish-local" />

diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index 885cb6e589b8bb6e3b2c0d3bb6266d36fe4a309f..cd441dee70acf00e26dd0c5ce5726b10e4b052cb 100644 (file)
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -33,7 +33,9 @@
                </antcall>
        </target>
        <target name="publish-local" depends="jar">
-               <antcall target="common.sources.jar" />
+               <antcall target="common.sources.jar">
+                       <reference torefid="extra.jar.includes" refid="empty.reference" />
+               </antcall>
                <antcall target="common.javadoc.jar" />
 
                <antcall target="common.publish-local" />