diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-13 11:42:35 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-13 11:43:17 +0300 |
| commit | 47638e7f5c3e320958dbbe2ae7e7ef001a784420 (patch) | |
| tree | b19baa255ccc741ab8ef9b4ef9380839304b1e0a | |
| parent | eef6af3029923b6ad9076e264394bfa8b9b4b789 (diff) | |
| download | vaadin-framework-47638e7f5c3e320958dbbe2ae7e7ef001a784420.tar.gz vaadin-framework-47638e7f5c3e320958dbbe2ae7e7ef001a784420.zip | |
Moved Vaadin-Widgetsets to client package where it belongs (#9593)
| -rw-r--r-- | client-compiled/build.xml | 2 | ||||
| -rw-r--r-- | client/build.xml | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/client-compiled/build.xml b/client-compiled/build.xml index 9327e6da5f..be32dea853 100644 --- a/client-compiled/build.xml +++ b/client-compiled/build.xml @@ -106,8 +106,6 @@ <jar file="${compiled.jar}" compress="true"> <manifest> - <attribute name="Vaadin-Package-Version" value="1" /> - <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" /> <attribute name="Implementation-Vendor" value="Vaadin Ltd" /> <attribute name="Implementation-URL" value="http://vaadin.com" /> <attribute name="Implementation-Version" value="${vaadin.version}" /> diff --git a/client/build.xml b/client/build.xml index 47b113e90f..03c9c91401 100644 --- a/client/build.xml +++ b/client/build.xml @@ -22,9 +22,16 @@ <path id="classpath.tests.custom" /> <target name="jar"> + <property name="jar.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> <antcall target="common.jar"> <reference refid="client.gwt.includes" torefid="extra.jar.includes" /> </antcall> + <jar destfile="${jar.file}" update="true"> + <manifest> + <attribute name="Vaadin-Package-Version" value="1" /> + <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" /> + </manifest> + </jar> <!-- Hack to add validation dependency with source classifier --> <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" /> <copy file="${pom.xml}" tofile="${temp.pom}"> |