diff options
Diffstat (limited to 'push/build.xml')
| -rw-r--r-- | push/build.xml | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/push/build.xml b/push/build.xml index d09e6766fc..2cd86d9ce5 100644 --- a/push/build.xml +++ b/push/build.xml @@ -1,7 +1,6 @@ <?xml version="1.0"?> -<project name="vaadin-push" basedir="." default="publish-local" - xmlns:ivy="antlib:org.apache.ivy.ant"> +<project name="vaadin-push" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> <description> Meta package which defines dependencies needed for push </description> @@ -28,18 +27,11 @@ <target name="vaadinPush.js"> <mkdir dir="${result.dir}/js/VAADIN" /> <property name="vaadinPush.js.output" location="${result.dir}/js/VAADIN/vaadinPush.js" /> - <property name="vaadinPush.js.combined.output" - location="${result.dir}/js/VAADIN/push.combined.js" /> + <property name="vaadinPush.js.combined.output" location="${result.dir}/js/VAADIN/push.combined.js" /> - <loadfile - srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery-${jquery.version}.js" - property="jquery.js.contents" /> - <loadfile - srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery.atmosphere.js" - property="jquery.atmosphere.js.contents" /> - <loadfile - srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl" - property="vaadinPush.js.contents"> + <loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery-${jquery.version}.js" property="jquery.js.contents" /> + <loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" /> + <loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents"> <filterchain> <replacetokens begintoken="@" endtoken="@"> <token key="jquery.js" value="${jquery.js.contents}" /> @@ -50,9 +42,7 @@ <echo file="${vaadinPush.js.combined.output}">${vaadinPush.js.contents}</echo> <!-- Minify --> - <ivy:retrieve organisation="com.yahoo.platform.yui" - module="yuicompressor" revision="2.4.7" inline="true" type="jar" - pattern="${result.dir}/compressor.jar" /> + <ivy:retrieve organisation="com.yahoo.platform.yui" module="yuicompressor" revision="2.4.7" inline="true" type="jar" pattern="${result.dir}/compressor.jar" /> <java jar="${result.dir}/compressor.jar" fork="true"> <arg value="-v" /> <arg value="-o" /> @@ -63,8 +53,7 @@ <target name="jar" depends="vaadinPush.js"> <antcall target="common.jar"> - <param name="require-bundle" - value="org.atmosphere.atmosphere-runtime;bundle-version="${atmosphere.version}";visibility:=reexport" /> + <param name="require-bundle" value="org.atmosphere.atmosphere-runtime;bundle-version="${atmosphere.version}";visibility:=reexport" /> <reference torefid="extra.jar.includes" refid="jar.includes" /> </antcall> </target> |