Make vaadin.themes a bundle (#9793)

Refactored themes/build.xml to use the common.xml jar target

Change-Id: I9bcdc149f0995814faa172023059e615d683d034

diff --git a/themes/build.xml b/themes/build.xml
index d3a657cd18e4994a00bbf285a8e52c7e70eabf4f..83675867ad0f8a183a4f2bc6b660e57c57973da2 100644 (file)
--- a/themes/build.xml
+++ b/themes/build.xml
@@ -14,6 +14,12 @@
        <property name="result.dir" value="result" />
        <property name="theme.result.dir" value="${result.dir}/VAADIN/themes" />
 
+       <union id="jar.includes">
+               <fileset dir="${result.dir}">
+                       <include name="VAADIN/themes/**" />
+               </fileset>
+       </union>
+
        <target name="compile-themes">
                <ivy:resolve resolveid="common" conf="build" />
                <ivy:cachepath pathid="classpath.compile.theme" conf="build" />
@@ -34,23 +40,13 @@
                        <param name="theme" value="liferay" />
                </antcall>
        </target>
-
+       
        <target name="jar" depends="compile-themes">
-               <fail unless="module.name" message="No module.name parameter given" />
-
-               <property name="result.dir" location="result" />
-               <property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-               <property name="classes" location="{$result.dir}/classes" />
-               <antcall target="common.pom.xml" />
-               
-               <jar jarfile="${result.jar}">
-                       <fileset dir="${result.dir}">
-                               <include name="VAADIN/themes/**" />
-                       </fileset>
-                       <fileset refid="common.files.for.all.jars" />
-               </jar>
-
+               <antcall target="common.jar">
+                       <reference torefid="extra.jar.includes" refid="jar.includes" />
+               </antcall>
        </target>
+
        <target name="copy-theme">
                <fail unless="theme" message="You must give the theme name to copy n the 'theme' parameter" />
                <property name="theme.source.dir" location="../WebContent/VAADIN/themes" />

diff --git a/themes/ivy.xml b/themes/ivy.xml
index 2f39771a9553d5bc5e79bfe4f1ce2aab63baa496..e0e22429abc13bcd432fed966475bad8085c42c7 100644 (file)
--- a/themes/ivy.xml
+++ b/themes/ivy.xml
@@ -9,6 +9,7 @@
 
     <configurations>
         <conf name="build" />
+        <conf name="build-provided" />
         <conf name="compile-theme" visibility="private" />
     </configurations>
     <publications>