saving work for debug build changes

yishai-glide · Jul 15, 2013 · f914c96 · f914c96
1 parent 37d6ccd
commit f914c96
Show file tree

Hide file tree

Showing 42 changed files with 220 additions and 183 deletions.
diff --git a/android/Pubnub-Android-3.5.4.jar b/android/Pubnub-Android-3.5.4.jar
diff --git a/android/Pubnub-Android-Debug-3.5.4.jar b/android/Pubnub-Android-Debug-3.5.4.jar
diff --git a/android/build.xml b/android/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="PubnubApi">
+<project basedir="." default="build-all" name="PubnubApi">
     <property environment="env"/>
     <loadfile property="VERSION" srcFile="../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
     <property name="pubnub_lib_jar" value="Pubnub-Android-${VERSION}.jar"/>
+    <property name="pubnub_debug_lib_jar" value="Pubnub-Android-Debug-${VERSION}.jar"/>
     <property name="java_core_path" value="../java"/>
     <property name="src_pubnub_api_path" value="${java_core_path}/srcPubnubApi"/>
     <property name="src_java_path" value="${java_core_path}/src1"/>
@@ -17,6 +18,7 @@
         <pathelement location="libs/android-8.jar"/>
     </path>
     <target name="test" />
+    <target name="build-all" depends="debug-build, clean, build" />
     <target name="setDebugTrue" >
         <replace dir="${src_pubnub_api_path}" token="boolean LOGGING = false" value="boolean LOGGING = true">
             <include name="**/*.java"/>
@@ -27,7 +29,6 @@
             <include name="**/*.java"/>
         </replace>
     </target>
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
     <target name="init">
         <mkdir dir="bin"/>
         <copy includeemptydirs="false" todir="bin">
@@ -39,35 +40,52 @@
     </target>
     <target name="clean">
         <delete dir="bin"/>
-        <delete file="${pubnub_lib_jar}"/>
     </target>
     <target depends="clean" name="cleanall"/>
-    <target depends="copy_jars_to_examples" name="build"/>
+    <target depends="copy_jars_to_examples" name="build-jar"/>
     <target depends="create-jar" name="copy_jars_to_examples">
         <copy file="${pubnub_lib_jar}" todir="./examples/PubnubExample/libs/"/>
         <copy file="${pubnub_lib_jar}" todir="./examples/SubscribeAtBoot/libs/"/>
     </target>
 
+
+    <target name="build">
+        <delete file="${pubnub_lib_jar}"/>
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_lib_jar}" />
+            <param name="debug" value="false" />
+        </antcall>
+    </target>
+    <target name="debug-build">
+        <delete file="${pubnub_debug_lib_jar}"/>
+        <antcall target="setDebugTrue" />
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_debug_lib_jar}" />
+            <param name="debug" value="true" />
+        </antcall>
+        <antcall target="unsetDebugTrue" />
+    </target>
+
     <target depends="build-project" name="create-jar">
-        <jar destfile="${pubnub_lib_jar}"
+        <jar destfile="${jar_name}"
             basedir="bin"
             includes="**/**"
         />
     </target>
 
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <replace dir="${src_pubnub_api_path}" token='protected static String VERSION = ""' value='protected static String VERSION = "${VERSION}"' >
+        <replace dir="${src_pubnub_api_path}" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"' >
             <include name="**/*.java"/>
         </replace>
-        <javac destdir="bin" source="${source}" target="${target}">
+        <javac debug="${debug}" destdir="bin" source="${source}" target="${target}">
             <src path="${src_pubnub_api_path}"/>
             <src path="${src_java_path}"/>
             <src path="${src_logging_path}"/>
             <src path="${src_android_path}"/>
             <classpath refid="classpath"/>
         </javac>
-        <replace dir="${src_pubnub_api_path}" token='protected static String VERSION = "${VERSION}"' value='protected static String VERSION = ""'>
+        <replace dir="${src_pubnub_api_path}" token='static String VERSION = "${VERSION}"' value='static String VERSION = ""'>
             <include name="**/*.java"/>
         </replace>
     </target>

diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.4.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.4.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.5.4.jar b/blackberry/Pubnub-BlackBerry-3.5.4.jar
diff --git a/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar b/blackberry/Pubnub-BlackBerry-Debug-3.5.4.jar
diff --git a/blackberry/build.xml b/blackberry/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="PubnubApi">
+<project basedir="." default="build-all" name="PubnubApi">
     <property environment="env"/>
     <loadfile property="VERSION" srcFile="../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
     <property name="pubnub_lib_jar" value="Pubnub-BlackBerry-${VERSION}.jar"/>
+    <property name="pubnub_debug_lib_jar" value="Pubnub-BlackBerry-Debug-${VERSION}.jar"/>
     <property name="srcPubnubApi.link" value="../java/srcPubnubApi"/>
     <property name="j2me.link" value="../j2me"/>
     <property name="target" value="1.1"/>
@@ -17,6 +18,7 @@
         <pathelement location="${j2me.link}/libs/tinylinegzip.jar"/>
     </path>
     <target name="test" />
+    <target name="build-all" depends="debug-build, build" />
     <target name="setJsonMeJar" >
         <replace dir="${srcPubnubApi.link}" token="org.json" value="org.json.me">
             <include name="**/*.java"/>
@@ -50,35 +52,48 @@
             <include name="**/*.java"/>
         </replace>
     </target>
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
-    <target depends="create-jar, clean" name="build"/>
+    <target name="build">
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_lib_jar}" />
+            <param name="debug" value="false" />
+        </antcall>
+    </target>
+    <target name="debug-build">
+        <antcall target="setDebugTrue" />
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_debug_lib_jar}" />
+            <param name="debug" value="true" />
+        </antcall>
+        <antcall target="unsetDebugTrue" />
+    </target>
+    <target depends="create-jar, clean" name="build-jar"/>
     <target depends="build-project" name="create-jar">
-        <jar destfile="${pubnub_lib_jar}"
+        <jar destfile="${jar_name}"
             basedir="bin"
             includes="**/**"
         />
         <exec failonerror="true" executable="tools/preverify">
             <arg line="-classpath libs/net_rim_api.jar:libs/bouncycastle.jar:../j2me/libs/tinylinegzip.jar"/>
             <arg line="-d output"/>
-            <arg line="${pubnub_lib_jar}"/>
+            <arg line="${jar_name}"/>
         </exec>
-        <move verbose="true" file="output/${pubnub_lib_jar}" tofile="${pubnub_lib_jar}"/>
+        <move verbose="true" file="output/${jar_name}" tofile="${jar_name}"/>
         <delete dir="output"/>
     </target>
 
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = ""' value='protected static String VERSION = "${VERSION}"' >
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"' >
             <include name="**/*.java"/>
         </replace>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+        <javac debug="${debug}" destdir="bin" source="${source}" target="${target}">
             <src path="${srcPubnubApi.link}"/>
             <src path="src"/>
             <src path="${j2me.link}/src1"/>
             <src path="${j2me.link}/srcLogging"/>
             <classpath refid="PubnubApi.classpath"/>
         </javac>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = "${VERSION}"' value='protected static String VERSION = ""'>
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = "${VERSION}"' value='static String VERSION = ""'>
             <include name="**/*.java"/>
         </replace>
     </target>

diff --git a/build.xml b/build.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build">
+<project basedir="." default="build-all">
+    <target name="build-all">
+        <subant target="build-all" >
+            <fileset dir="." includes="*/build.xml" />
+        </subant>
+    </target>
     <target name="build">
         <subant target="build" >
             <fileset dir="." includes="*/build.xml" />

diff --git a/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib b/codenameone/Pubnub-CodeNameOne-3.5.4.cn1lib
diff --git a/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib b/codenameone/Pubnub-CodeNameOne-Debug-3.5.4.cn1lib
diff --git a/codenameone/PubnubClientSDK/build.xml b/codenameone/PubnubClientSDK/build.xml
@@ -2,10 +2,12 @@
     <!--build_version=1.3-->
 
 
-<project name="PubnubClientSDK" default="build" basedir=".">
+<project name="PubnubClientSDK" default="build-all" basedir=".">
     <description>Builds, tests, and runs the project PubnubClientSDK.</description>
     <import file="nbproject/build-impl.xml"/>
     <loadfile property="VERSION" srcFile="../../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
+    <property name="pubnub_cn1lib_file_name" value="../Pubnub-CodeNameOne-${VERSION}.cn1lib"/>
+    <property name="pubnub_debug_cn1lib_file_name" value="../Pubnub-CodeNameOne-Debug-${VERSION}.cn1lib"/>
     <property file="codenameone_settings.properties"/>
 
     <target name="create-src">
@@ -24,7 +26,7 @@
         <delete dir="src"/>
     </target>
     <target name="copy-lib">
-        <copy file="dist/PubnubClientSDK.cn1lib" tofile="../pubnub-codenameone-${VERSION}.cn1lib"/>
+        <copy file="dist/PubnubClientSDK.cn1lib" tofile="${jar_name}"/>
     </target>
 
     <target name="setDebugTrue" >
@@ -38,8 +40,19 @@
         </replace>
     </target>
 
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
-    <target depends="create-src, default, delete-src, copy-lib, clean" name="build">
+    <target name="debug-build">
+        <delete file="${pubnub_debug_cn1lib_file_name}"/>
+        <antcall target="build-lib">
+            <param name="jar_name" value="${pubnub_debug_cn1lib_file_name}" />
+        </antcall>
+    </target>
+    <target name="build">
+        <delete file="${pubnub_cn1lib_file_name}"/>
+        <antcall target="build-lib">
+            <param name="jar_name" value="${pubnub_cn1lib_file_name}" />
+        </antcall>
+    </target>
+    <target depends="create-src, default, delete-src, copy-lib, clean" name="build-lib">
     </target>
 
     <target depends="init,compile,jar" name="compile-test">
@@ -105,94 +118,4 @@
         <zip basedir="build/lib" compress="true" destfile="dist/${application.title}.cn1lib" />
     </target>
 
-    <target name="buildNativeRIM">
-        <path id="rimNativeDir">
-            <fileset dir="native/rim"/>
-        </path> 
-        <property name="test.rimDir.property" refid="rimNativeDir"/> 
-        <condition property="doesntHaveRimFiles">
-            <equals arg1="" arg2="${test.rimDir.property}"/>
-        </condition> 
-
-        <antcall target="createRimZip" />        
-    </target>
-
-    <target name="createRimZip"
-        unless="doesntHaveRimFiles">
-        <echo>Zipping rim native code</echo>
-        <zip basedir="native/rim" compress="false" destfile="build/lib/nativerim.zip" />
-    </target>
-
-    <target name="buildNativeAND">
-        <path id="andNativeDir">
-            <fileset dir="native/android"/>
-        </path> 
-        <property name="test.andDir.property" refid="andNativeDir"/> 
-        <condition property="doesntHaveAndFiles">
-            <equals arg1="" arg2="${test.andDir.property}"/>
-        </condition> 
-
-        <antcall target="createAndZip" />        
-    </target>
-
-    <target name="createAndZip"
-        unless="doesntHaveAndFiles">
-        <echo>Zipping Android native code</echo>
-        <zip basedir="native/android" compress="false" destfile="build/lib/nativeand.zip" />
-    </target>
-
-    <target name="buildNativeWIN">
-        <path id="winNativeDir">
-            <fileset dir="native/win"/>
-        </path> 
-        <property name="test.winDir.property" refid="winNativeDir"/> 
-        <condition property="doesntHaveWinFiles">
-            <equals arg1="" arg2="${test.winDir.property}"/>
-        </condition> 
-
-        <antcall target="createWinZip" />        
-    </target>
-
-    <target name="createWinZip"
-        unless="doesntHaveWinFiles">
-        <echo>Zipping win native code</echo>
-        <zip basedir="native/win" compress="false" destfile="build/lib/nativewin.zip" />
-    </target>
-
-    <target name="buildNativeIOS">
-        <path id="iosNativeDir">
-            <fileset dir="native/ios"/>
-        </path> 
-        <property name="test.iosDir.property" refid="iosNativeDir"/> 
-        <condition property="doesntHaveIosFiles">
-            <equals arg1="" arg2="${test.iosDir.property}"/>
-        </condition> 
-
-        <antcall target="createIosZip" />        
-    </target>
-
-    <target name="createIosZip"
-        unless="doesntHaveIosFiles">
-        <echo>Zipping ios native code</echo>
-        <zip basedir="native/ios" compress="false" destfile="build/lib/nativeios.zip" />
-    </target>
-
-    <target name="buildNativeME">
-        <path id="meNativeDir">
-            <fileset dir="native/j2me"/>
-        </path> 
-        <property name="test.meDir.property" refid="meNativeDir"/> 
-        <condition property="doesntHaveMeFiles">
-            <equals arg1="" arg2="${test.meDir.property}"/>
-        </condition> 
-
-        <antcall target="createMeZip" />        
-    </target>
-
-    <target name="createMeZip"
-        unless="doesntHaveMeFiles">
-        <echo>Zipping me native code</echo>
-        <zip basedir="native/j2me" compress="false" destfile="build/lib/nativeme.zip" />
-    </target>
-
 </project>
diff --git a/codenameone/build.xml b/codenameone/build.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build">
+<project basedir="." default="build-all">
+    <target name="build-all">
+        <antcall target="build"/>
+        <antcall target="clean"/>
+        <antcall target="debug-build"/>
+    </target>
     <target name="build">
         <subant target="build" >
             <fileset dir="." includes="*/build.xml" />

diff --git a/codenameone/pubnub-codenameone-3.5.4.cn1lib b/codenameone/pubnub-codenameone-3.5.4.cn1lib
diff --git a/j2me/Pubnub-MicroEdition-3.5.4.jar b/j2me/Pubnub-MicroEdition-3.5.4.jar
diff --git a/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar b/j2me/Pubnub-MicroEdition-Debug-3.5.4.jar
diff --git a/j2me/build.xml b/j2me/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="PubnubApi">
+<project basedir="." default="build-all" name="PubnubApi">
     <property environment="env"/>
     <loadfile property="VERSION" srcFile="../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
     <property name="pubnub_lib_jar" value="Pubnub-MicroEdition-${VERSION}.jar"/>
+    <property name="pubnub_debug_lib_jar" value="Pubnub-MicroEdition-Debug-${VERSION}.jar"/>
     <property name="srcPubnubApi.link" value="../java/srcPubnubApi"/>
     <property name="target" value="1.1"/>
     <property name="source" value="1.3"/>
@@ -16,6 +17,7 @@
         <pathelement location="libs/tinylinegzip.jar"/>
     </path>
     <target name="test" />
+    <target name="build-all" depends="debug-build, build" />
     <target name="setJsonMeJar" >
         <replace dir="${srcPubnubApi.link}" token="org.json" value="org.json.me">
             <include name="**/*.java"/>
@@ -49,28 +51,43 @@
             <include name="**/*.java"/>
         </replace>
     </target>
-    <target depends="setDebugTrue,build,unsetDebugTrue" name="debug-build"/>
-    <target depends="create-jar, clean" name="build"/>
+    <target name="build">
+        <delete file="${pubnub_lib_jar}"/>
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_lib_jar}" />
+            <param name="debug" value="false" />
+        </antcall>
+    </target>
+    <target name="debug-build">
+        <delete file="${pubnub_debug_lib_jar}"/>
+        <antcall target="setDebugTrue" />
+        <antcall target="build-jar">
+            <param name="jar_name" value="${pubnub_debug_lib_jar}" />
+            <param name="debug" value="true" />
+        </antcall>
+        <antcall target="unsetDebugTrue" />
+    </target>
+    <target depends="create-jar, clean" name="build-jar"/>
     <target depends="build-project" name="create-jar">
-        <jar destfile="${pubnub_lib_jar}"
+        <jar destfile="${jar_name}"
             basedir="bin"
             includes="**/**"
         />
     </target>
 
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = ""' value='protected static String VERSION = "${VERSION}"' >
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = ""' value='static String VERSION = "${VERSION}"' >
             <include name="**/*.java"/>
         </replace>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+        <javac debug="${debug}" destdir="bin" source="${source}" target="${target}">
             <src path="${srcPubnubApi.link}"/>
             <src path="src"/>
             <src path="src1"/>
             <src path="srcLogging"/>
             <classpath refid="PubnubApi.classpath"/>
         </javac>
-        <replace dir="${srcPubnubApi.link}" token='protected static String VERSION = "${VERSION}"' value='protected static String VERSION = ""'>
+        <replace dir="${srcPubnubApi.link}" token='static String VERSION = "${VERSION}"' value='static String VERSION = ""'>
             <include name="**/*.java"/>
         </replace>
     </target>

diff --git a/java/Pubnub-StandardEdition-3.5.4.jar b/java/Pubnub-StandardEdition-3.5.4.jar
diff --git a/java/Pubnub-StandardEdition-Debug-3.5.4.jar b/java/Pubnub-StandardEdition-Debug-3.5.4.jar