From 1d6f0611a8dc7478caf2126ccd191d4284259cba Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 3 Sep 2012 15:36:28 +0300
Subject: Added themes-compiled module (#9299)

---
 client-compiled/build.xml | 33 ++++++++++++++++++++-------------
 client-compiled/ivy.xml   | 11 ++++++-----
 2 files changed, 26 insertions(+), 18 deletions(-)

(limited to 'client-compiled')

diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 588d232ab2..8cead01a79 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -28,8 +28,8 @@
 		<property name="extraParams" value="" />
 		<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
 
-		<ivy:resolve resolveid="common" conf="build" />
-		<ivy:cachepath pathid="classpath.compile.widgetset" conf="build" />
+		<ivy:resolve resolveid="common" conf="compile-module" />
+		<ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" />
 
 		<echo>Compiling ${module} to ${module.output.dir}</echo>
 		<mkdir dir="${module.output.dir}" />
@@ -72,29 +72,36 @@
 		<echo>Compiled ${module}</echo>
 	</target>
 
-
 	<target name="jar" depends="default-widgetset">
+		<antcall target="common.pom.xml">
+		</antcall>
 		<property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-		<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
 
 		<jar file="${result.jar}" compress="true">
-			<fileset dir="${module.output.dir}">
+			<fileset dir="${result.dir}">
+				<include name="VAADIN/widgetsets/**" />
+				<include name="pom.xml" />
+				<exclude name="VAADIN/widgetsets/WEB-INF"/>
 			</fileset>
 			<fileset refid="common.files.for.all.jars" />
 		</jar>
 	</target>
 
 	<target name="publish-local" depends="jar">
-		<antcall target="common.publish-local" />
+		<antcall target="common.publish-local">
+			<param name="conf" value="build" />
+		</antcall>
+	</ivy:publish>
+-->
 	</target>
 
-	<target name="clean">
-		<antcall target="common.clean" />
-	</target>
+<target name="clean">
+	<antcall target="common.clean" />
+</target>
 
-	<target name="tests">
-		<!--<antcall target="common.tests.run" />-->
-		<echo>WHAT? No tests for ${module.name}!</echo>
-	</target>
+<target name="tests">
+	<!--<antcall target="common.tests.run" />-->
+	<echo>WHAT? No tests for ${module.name}!</echo>
+</target>
 
 </project>
\ No newline at end of file
diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index 5e739a0d0d..7c0fcf0162 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -8,19 +8,20 @@
 
     <configurations>
         <conf name="build" />
+        <conf name="compile-module" visibility="private" />
     </configurations>
     <publications>
         <artifact type="jar"></artifact>
     </publications>
-    <dependencies defaultconfmapping="*->build">
+    <dependencies>
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" />
+            rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" />
+            rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}" />
+            rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build-> default,sources" />
+            rev="1.0.0.GA" conf="compile-module-> default,sources" />
     </dependencies>
 
 </ivy-module>
-- 
cgit v1.2.3