Skip to content

Commit

Permalink
merging scala work, cn1 work, and IV constructor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Devendra committed Jul 9, 2013
2 parents 42a30b8 + b55a454 commit e13fa9d
Show file tree
Hide file tree
Showing 98 changed files with 6,943 additions and 55 deletions.
Binary file modified android/Pubnub-Android-3.5.2.jar
Binary file not shown.
Binary file modified android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar
Binary file not shown.
Binary file modified android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar
Binary file not shown.
Binary file modified blackberry/Pubnub-BlackBerry-3.5.2.jar
Binary file not shown.
Binary file added codenameone/PubnubClientSDK/Stubber.jar
Binary file not shown.
187 changes: 187 additions & 0 deletions codenameone/PubnubClientSDK/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--build_version=1.3-->


<project name="PubnubClientSDK" default="build" 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 file="codenameone_settings.properties"/>

<target name="create-src">
<mkdir dir="src"/>
<copy includeemptydirs="true" todir="src">
<fileset dir="../../java/srcPubnubApi"/>
</copy>
<copy includeemptydirs="true" todir="src/com/codename1">
<fileset dir="../src/com/codename1"/>
</copy>
<copy includeemptydirs="true" todir="src/com/pubnub/api">
<fileset dir="../src/com/pubnub/api/"/>
</copy>
</target>
<target name="delete-src">
<delete dir="src"/>
</target>
<target name="copy-lib">
<copy file="dist/PubnubClientSDK.cn1lib" tofile="../pubnub-codenameone-${VERSION}.cn1lib"/>
</target>


<target depends="create-src, default, delete-src, copy-lib, clean" name="build">
</target>

<target depends="init,compile,jar" name="compile-test">
</target>

<target depends="compile-test" name="-do-test-run">
</target>

<target depends="-do-test-run" description="Run unit tests." name="test">
<echo>Currently testing a library project isn't supported</echo>
</target>

<target depends="create-src" name="-pre-compile">
<echo>Compile is forcing compliance to the supported API's/features for maximum device compatibility. This allows smaller
code size and wider device support</echo>
<mkdir dir="build/tmp"/>
<javac destdir="build/tmp"
source="1.5"
target="1.5"
bootclasspath="lib/CLDC11.jar"
classpath="${javac.classpath}:${build.classes.dir}">
<src path="${src.dir}"/>
</javac>
</target>


<target name="-pre-init">
<property name="javac.source" value="1.5" />
<property name="javac.target" value="1.5" />
</target>

<target name="run">
<echo>You can't run a library project</echo>
</target>

<target name="debug">
<echo>You can't run a library project</echo>
</target>

<target name="Stubs">
<delete dir="build/stubs"/>
<javadoc sourcepath="src"
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}">
<filename name="**/*.java"/>
</fileset>
</javadoc>
</target>

<target name="jar" depends="compile, Stubs">
<mkdir dir="build/lib" />
<zip basedir="${build.classes.dir}" compress="false" destfile="build/lib/main.zip" />
<zip basedir="build/stubs" compress="false" destfile="build/lib/stubs.zip" />
<copy file="manifest.properties" todir="build/lib" />
<!--<antcall target="buildNativeIOS" />
<antcall target="buildNativeRIM" />
<antcall target="buildNativeAND" />
<antcall target="buildNativeWIN" />
<antcall target="buildNativeME" /> -->
<mkdir dir="dist" />
<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>
4 changes: 4 additions & 0 deletions codenameone/PubnubClientSDK/codenameone_library.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#
#Wed Jan 09 17:59:31 IST 2013
codename1.languageLevel=5
codename1.version=1.0
Binary file not shown.
Binary file added codenameone/PubnubClientSDK/lib/CLDC11.jar
Binary file not shown.
Binary file added codenameone/PubnubClientSDK/lib/CodenameOne.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions codenameone/PubnubClientSDK/lib/bccn1/manifest.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Codename One libray manifest

Binary file added codenameone/PubnubClientSDK/lib/bccn1/stubs.zip
Binary file not shown.
Binary file added codenameone/PubnubClientSDK/lib/json/json.zip
Binary file not shown.
3 changes: 3 additions & 0 deletions codenameone/PubnubClientSDK/manifest.mf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build

2 changes: 2 additions & 0 deletions codenameone/PubnubClientSDK/manifest.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Codename One libray manifest

Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Loading

0 comments on commit e13fa9d

Please sign in to comment.