diff options
| author | Artur Signell <artur@vaadin.com> | 2013-04-17 19:16:59 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-04-17 20:09:08 +0300 |
| commit | cdcdc115b79f0773c2d140e43f58cfe9cb4b1cdb (patch) | |
| tree | c3bb8f44a3918c4e4a5e3db903d6cda5d070fd0e /build | |
| parent | 4400b1b62587e74073aac7f3c60710ac535795a5 (diff) | |
| download | vaadin-framework-cdcdc115b79f0773c2d140e43f58cfe9cb4b1cdb.tar.gz vaadin-framework-cdcdc115b79f0773c2d140e43f58cfe9cb4b1cdb.zip | |
Build a minified version of vaadinPush.js in vaadin-push.jar (#11630)
* Replaced jquery and jquery.atmosphere.js with original, unmodified versions
* Added vaadinPush.js build target to ide.xml and push/build.xml
* Uses yuicompressor to compress the resulting push javascript
Change-Id: I59ba9c2bbf74e05d10325d38efdb106b638cd8e7
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ide.xml | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/build/ide.xml b/build/ide.xml index e040dc5c8c..b1845020f3 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -49,7 +49,7 @@ <path location="client/src" /> </path> - <target name="theme-and-default-widgetset" depends="default-widgetset, themes"> + <target name="theme-and-default-widgetset" depends="default-widgetset, themes, vaadinPush.js"> </target> <target name="themes"> <antcall target="compile-theme"> @@ -82,20 +82,20 @@ </java> </target> - - + + <target name="default-widgetset"> <antcall target="compile-widgetset"> <param name="widgetset" value="com.vaadin.DefaultWidgetSet" /> </antcall> </target> - + <target name="testing-widgetset"> <antcall target="compile-widgetset"> <param name="widgetset" value="com.vaadin.tests.widgetset.TestingWidgetSet" /> </antcall> </target> - + <target name="compile-widgetset"> <property name="module" value="${widgetset}" /> <property name="module.output.dir" location="WebContent/VAADIN/widgetsets" /> @@ -133,5 +133,20 @@ <jvmarg value="-Djava.awt.headless=true" /> <jvmarg value="-Dgwt.usearchives=false" /> </java> - </target> + </target> + <target name="vaadinPush.js"> + <property name="vaadinPush.js.output" location="WebContent/VAADIN/vaadinPush.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> + </target> </project>
\ No newline at end of file |