diff options
| author | Artur Signell <artur@vaadin.com> | 2013-10-11 16:28:32 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-10-14 17:18:51 +0000 |
| commit | c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018 (patch) | |
| tree | ef394fe86e61b3c903d0f78baa771a262ba4c77f /build | |
| parent | 25fc2f2f1af0b6bf52053f0ca6d11d31c5e7453a (diff) | |
| download | vaadin-framework-c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018.tar.gz vaadin-framework-c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018.zip | |
Update to atmosphere javascript 2.0.3-vaadin1 (#12241, #12127)
Build vaadinPush.js from the released version instead of having a separate
javascript version in the project
Change-Id: I37aac284216c8ec6efd03c242e639e88854f11fd
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ide.xml | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/build/ide.xml b/build/ide.xml index 2605bf2cdd..9b227e0a7d 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -133,21 +133,12 @@ </java> </target> <target name="vaadinPush.js"> - <property name="vaadinPush.js.output" location="WebContent/VAADIN/vaadinPush.js" /> - <property name="vaadinPush.debug.js.output" location="WebContent/VAADIN/vaadinPush.debug.js" /> - - <loadfile srcfile="WebContent/VAADIN/jquery-1.7.2.js" property="jquery.js.contents" /> - <loadfile srcfile="WebContent/VAADIN/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" /> - <loadfile srcfile="WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents"> - <filterchain> - <replacetokens begintoken="@" endtoken="@"> - <token key="jquery.js" value="${jquery.js.contents}" /> - <token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" /> - </replacetokens> - </filterchain> - </loadfile> - <echo file="${vaadinPush.js.output}">${vaadinPush.js.contents}</echo> - <!-- This vaadinPush.js is not obfuscated so the debug version is the same--> - <copy file="${vaadinPush.js.output}" tofile="${vaadinPush.debug.js.output}"/> + <ant antfile="${basedir}/push/build.xml" target="vaadinPush.js" dir="${basedir}/push" /> + <property name="js.output.dir" location="WebContent" /> + <property name="push.js.dir" location="${basedir}/push/result/js" /> + <copy todir="${js.output.dir}"> + <fileset dir="${push.js.dir}" includes="VAADIN/vaadinPush*"> + </fileset> + </copy> </target> </project> |