diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-10-09 06:46:52 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-09 06:46:52 +0000 |
| commit | 5060adb19b22435addbc34fcad6e7ca9e67c273c (patch) | |
| tree | 7b4ba62edaac56562f0e8556b05ea988a8a2b36e | |
| parent | cba8d46d07aeabafe4d6d06e9ed84cf34d5305b7 (diff) | |
| parent | ab6e73909a2ac5067facddbd2a8ac003bd3dba53 (diff) | |
| download | vaadin-framework-5060adb19b22435addbc34fcad6e7ca9e67c273c.tar.gz vaadin-framework-5060adb19b22435addbc34fcad6e7ca9e67c273c.zip | |
Merge changes I9bcdc149,Ia25f247c
* changes:
Make vaadin.themes a bundle (#9793)
Make vaadin.client-compiled a bundle (#9793)
| -rw-r--r-- | client-compiled/build.xml | 29 | ||||
| -rw-r--r-- | themes/build.xml | 26 | ||||
| -rw-r--r-- | themes/ivy.xml | 1 |
3 files changed, 23 insertions, 33 deletions
diff --git a/client-compiled/build.xml b/client-compiled/build.xml index be32dea853..f75a27ffcd 100644 --- a/client-compiled/build.xml +++ b/client-compiled/build.xml @@ -18,6 +18,12 @@ <property name="compiled.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> <property name="compiled-cache.jar" location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" /> + <union id="jar.includes"> + <fileset dir="${result.dir}"> + <include name="VAADIN/widgetsets/com.vaadin*/**" /> + </fileset> + </union> + <target name="default-widgetset-cache"> <antcall target="compile-module-cache"> <param name="module" value="com.vaadin.DefaultWidgetSet" /> @@ -100,26 +106,13 @@ </jar> </target> - <target name="client-compiled.jar" depends="default-widgetset"> - <antcall target="common.pom.xml"> + <target name="jar" depends="default-widgetset"> + <antcall target="common.jar"> + <reference torefid="extra.jar.includes" refid="jar.includes" /> </antcall> - - <jar file="${compiled.jar}" compress="true"> - <manifest> - <attribute name="Implementation-Vendor" value="Vaadin Ltd" /> - <attribute name="Implementation-URL" value="http://vaadin.com" /> - <attribute name="Implementation-Version" value="${vaadin.version}" /> - </manifest> - <fileset dir="${result.dir}"> - <include name="VAADIN/widgetsets/com.vaadin*/**" /> - </fileset> - <fileset refid="common.files.for.all.jars" /> - </jar> - - </target> - - <target name="publish-local" depends="client-compiled.jar"> + + <target name="publish-local" depends="jar"> <antcall target="common.publish-local"> <param name="conf" value="build" /> </antcall> diff --git a/themes/build.xml b/themes/build.xml index d3a657cd18..83675867ad 100644 --- 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 2f39771a95..e0e22429ab 100644 --- 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> |