removed json source, added cn1lib instead

yishai-glide · Jul 4, 2013 · 02d43ba · 02d43ba
1 parent a3f1a98
commit 02d43ba
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 3,987 deletions.
diff --git a/codenameone/PubnubClientSDK/build.xml b/codenameone/PubnubClientSDK/build.xml
@@ -11,7 +11,6 @@
     <target name="create-src">
         <mkdir dir="src"/>
         <copy includeemptydirs="true" todir="src">
-            <fileset dir="../srcJson"/>
             <fileset dir="../../java/srcPubnubApi"/>
         </copy>
         <copy includeemptydirs="true" todir="src/com/codename1">
@@ -72,7 +71,7 @@
     <target name="Stubs">
         <delete dir="build/stubs"/>
         <javadoc sourcepath="src"
-            classpath="lib/CodenameOne.jar:lib/CLDC11.jar:lib/bccn1/main.zip"
+            classpath="lib/CodenameOne.jar:lib/CLDC11.jar:lib/bccn1/bouncycastle.zip:lib/json/json.zip"
             docletpath="Stubber.jar"
             doclet="com.codename1.build.client.StubGenerator"> 
             <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">

diff --git a/...ameone/PubnubClientSDK/lib/bccn1/main.zip → ...ubnubClientSDK/lib/bccn1/bouncycastle.zip b/...ameone/PubnubClientSDK/lib/bccn1/main.zip → ...ubnubClientSDK/lib/bccn1/bouncycastle.zip
diff --git a/codenameone/PubnubClientSDK/lib/json/json.zip b/codenameone/PubnubClientSDK/lib/json/json.zip
diff --git a/codenameone/PubnubClientSDK/nbproject/project.properties b/codenameone/PubnubClientSDK/nbproject/project.properties
@@ -30,7 +30,8 @@ excludes=
 file.reference.CLDC11.jar=lib/CLDC11.jar
 file.reference.CodenameOne.jar=lib/CodenameOne.jar
 file.reference.CodenameOne_SRC.zip=lib/CodenameOne_SRC.zip
-file.reference.main.zip=lib/bccn1/main.zip
+file.reference.bouncycastle.zip=lib/bccn1/bouncycastle.zip
+file.reference.json.zip=lib/json/json.zip
 file.reference.PubnubClientSDK-override=override
 includes=**
 jar.compress=false
@@ -39,7 +40,8 @@ javac.classpath=\
     ${file.reference.CodenameOne.jar}:\
     ${file.reference.CodenameOne_SRC.zip}:\
     ${file.reference.PubnubClientSDK-override}:\
-    ${file.reference.main.zip}
+    ${file.reference.json.zip}:\
+    ${file.reference.bouncycastle.zip}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

diff --git a/codenameone/json.cn1lib b/codenameone/json.cn1lib
diff --git a/codenameone/pubnub-codenameone-3.5.2.cn1lib b/codenameone/pubnub-codenameone-3.5.2.cn1lib