diff options
| author | Artur Signell <artur@vaadin.com> | 2012-10-08 15:59:30 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-10-08 15:59:30 +0300 |
| commit | ab6e73909a2ac5067facddbd2a8ac003bd3dba53 (patch) | |
| tree | 066fb2efe862b83c8daf2550798a81ff4cc98ba6 /themes | |
| parent | e1327d73bd20ec75e49c37add22b137999707009 (diff) | |
| download | vaadin-framework-ab6e73909a2ac5067facddbd2a8ac003bd3dba53.tar.gz vaadin-framework-ab6e73909a2ac5067facddbd2a8ac003bd3dba53.zip | |
Make vaadin.themes a bundle (#9793)
Refactored themes/build.xml to use the common.xml jar target
Change-Id: I9bcdc149f0995814faa172023059e615d683d034
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/build.xml | 26 | ||||
| -rw-r--r-- | themes/ivy.xml | 1 |
2 files changed, 12 insertions, 15 deletions
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> |