From 0ece55d0003e82745916f8bb282156edf54de6aa Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 21 Jan 2013 20:13:13 +0200
Subject: Include GWT sources in sources jar (#9102)

Change-Id: I99928a614cf220b79f107e45eb02dc3de8333db1
---
 buildhelpers/build.xml    | 4 +++-
 client-compiler/build.xml | 4 +++-
 client/build.xml          | 4 +++-
 common.xml                | 4 ++++
 server/build.xml          | 4 +++-
 shared/build.xml          | 4 +++-
 theme-compiler/build.xml  | 4 +++-
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/buildhelpers/build.xml b/buildhelpers/build.xml
index e3e7b434d6..c7b9eba9d3 100644
--- 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 9d4e5c403c..64368b4957 100644
--- 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 d2946be6e0..d0dae91dfa 100644
--- 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 63886dc4b5..3de10979a2 100644
--- 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 253d09a45b..91526dd1c5 100644
--- 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 06a27b0ef9..6ea753afa1 100644
--- 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 885cb6e589..cd441dee70 100644
--- 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" />
-- 
cgit v1.2.3