diff options
| author | Artur Signell <artur@vaadin.com> | 2012-10-08 15:56:55 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-10-08 15:56:55 +0300 |
| commit | e1327d73bd20ec75e49c37add22b137999707009 (patch) | |
| tree | 56f509073d868bfc5473e94f04f151357d20a410 /client-compiled | |
| parent | f296b46c8de6705baaa137fd5854cd55aefe5bc6 (diff) | |
| download | vaadin-framework-e1327d73bd20ec75e49c37add22b137999707009.tar.gz vaadin-framework-e1327d73bd20ec75e49c37add22b137999707009.zip | |
Make vaadin.client-compiled a bundle (#9793)
Refactored client-compiled/build.xml to use the common.xml jar target
Change-Id: Ia25f247cd91b2a93b7abd739e015a34ee46268be
Diffstat (limited to 'client-compiled')
| -rw-r--r-- | client-compiled/build.xml | 29 |
1 files changed, 11 insertions, 18 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> |