From e4d99b3631a70a9ca11c085b4de09b4daf400176 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 9 Sep 2013 14:38:21 +0300
Subject: Use non-obfuscated version of vaadinPush.js when not in production
 (#12527)

Change-Id: I8e0baec2391b140e6a72eedf6606fd2792c735bc
---
 push/build.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'push')

diff --git a/push/build.xml b/push/build.xml
index 829411ea12..1cbe23d75b 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -11,6 +11,7 @@
     <property name="module.symbolic" value="com.vaadin.push" />
     <property name="result.dir" location="result" />
     <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
+    <property name="vaadinPush.debug.js" location="${result.dir}/js/VAADIN/vaadinPush.debug.js" />
 
     <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java and jquery.atmosphere.js -->
     <property name="atmosphere.version" value="1.0.14.vaadin4" />
@@ -21,13 +22,12 @@
     <union id="jar.includes">
         <fileset dir="${result.dir}/js">
             <include name="VAADIN/vaadinPush.js" />
+            <include name="VAADIN/vaadinPush.debug.js" />
         </fileset>
     </union>
 
     <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" />
 
         <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" />
@@ -39,15 +39,17 @@
                 </replacetokens>
             </filterchain>
         </loadfile>
-        <echo file="${vaadinPush.js.combined.output}">${vaadinPush.js.contents}</echo>
+
+        <!-- Non-obfuscated version for debugging -->
+        <echo file="${vaadinPush.debug.js}">${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" />
         <java jar="${result.dir}/compressor.jar" fork="true">
             <arg value="-v" />
             <arg value="-o" />
-            <arg file="${vaadinPush.js.output}" />
-            <arg file="${vaadinPush.js.combined.output}" />
+            <arg file="${vaadinPush.js}" />
+            <arg file="${vaadinPush.debug.js}" />
         </java>
     </target>
 
-- 
cgit v1.2.3