# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1267758114 -3600
# Node ID 19d55036ad3f01d0642476db2d81fe275c21c2be
# Parent  cffbce08906dab7653afbd2f70d8cafa439b8183
Replace the asmack library built with the trunk with one built with the fixed
revision 11644 of smack

diff -r cffbce08906d -r 19d55036ad3f doc/asmack-beem/README.txt
--- a/doc/asmack-beem/README.txt	Fri Mar 05 03:26:13 2010 +0100
+++ b/doc/asmack-beem/README.txt	Fri Mar 05 04:01:54 2010 +0100
@@ -8,7 +8,7 @@
 The asmack project is based on the development version of the Smack library.
 This version is constantly moving but we want a fixed version for BEEM.
 We patched the asmack build process to use a fixed version of the Smack
-library.
+library. Currently, we use the revision 11644 of the Smack SVN repository.
 
 COMPILE
 -------
@@ -16,9 +16,9 @@
 First check out the last version of asmack
 > git clone git://github.com/rtreffer/asmack.git
 
-Then apply the asmack_beem.patch on the source.
+Then apply the beem-build-process.patch on the source.
 > cd asmack
-> patch -p1 < asmack_beem.patch
+> patch -p1 < beem-build-process.patch
 >
 
 Add the beem flavour to the patch repository
diff -r cffbce08906d -r 19d55036ad3f doc/asmack-beem/beem-build-process.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/asmack-beem/beem-build-process.patch	Fri Mar 05 04:01:54 2010 +0100
@@ -0,0 +1,102 @@
+--- asmack-org/build.bash	2010-03-05 02:42:58.978546820 +0100
++++ asmack/build.bash	2010-03-05 02:35:43.689307349 +0100
+@@ -15,11 +15,11 @@
+   if ! [ -f "${2}/.svn/entries" ]; then
+     mkdir "${2}"
+     cd "${2}"
+-    svn co --non-interactive --trust-server-cert "${1}" "."
++    svn co --non-interactive --trust-server-cert "${1}" -r "${3}" "."
+   else
+     cd "${2}"
+     svn cleanup
+-    svn up
++    svn up -r "${3}"
+   fi
+ )
+ }
+@@ -37,11 +37,11 @@
+ }
+ 
+ fetchall() {
+-  gitfetch "git://github.com/rtreffer/smack.git" "smack"
+-  fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid"
+-  fetch "http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/" "harmony"
+-  fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava"
+-  fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh"
++  fetch "http://svn.igniterealtime.org/svn/repos/smack/trunk" "smack" "11644"
++  fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" "HEAD"
++  fetch "http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/" "harmony" "HEAD"
++  fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" "HEAD"
++  fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" "HEAD"
+ }
+ 
+ copyfolder() {
+@@ -95,7 +95,7 @@
+     buildsrc
+     patchsrc "patch"
+     patchsrc "${dir}"
+-    ant -Djar.suffix=`echo ${dir}|sed 's:patch/:-:'`
++    ant -Dbuild.all=true -Djar.suffix=`echo ${dir}|sed 's:patch/:-:'`
+   done
+ }
+ 
+--- asmack3/build.xml	2010-02-24 16:09:39.000000000 +0100
++++ asmack-org/build.xml	2010-02-24 00:18:40.000000000 +0100
+@@ -36,6 +36,13 @@
+     </and>
+ </condition>
+ 
++<condition property="build-2.1">
++    <and>
++        <istrue value="${build.all}" />
++        <available file="${sdk-location}/platforms/android-2.1/android.jar" />
++    </and>
++</condition>
++
+ <target name="compile-jse"  description="Compile for java se">
+     <delete dir="build/classes" failonerror="false" />
+     <mkdir dir="build/classes" />
+@@ -65,6 +72,34 @@
+     />
+ </target>
+ 
++<target name="compile-a21" description="Compile for android 2.1" if="build-2.1">
++    <delete dir="build/classes" failonerror="false" />
++    <mkdir dir="build/classes" />
++    <mkdir dir="build/classes/trunk" />
++    <javac
++      target="1.5"
++      srcdir="build/src/trunk"
++      destdir="build/classes/trunk"
++      classpath="lib/xmlpull_1_1_3_4c.jar"
++      bootclasspath="${sdk-location}/platforms/android-2.1/android.jar"
++      debug="true"
++      debuglevel="source,lines"
++    />
++    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
++    <jar
++      basedir="build/classes/trunk"
++      destfile="build/asmack-android-2.1${jar.suffix}.jar"
++      filesonly="true"
++      level="9"
++    />
++    <zip
++      basedir="build/src/trunk"
++      destfile="build/asmack-android-2.1-source${jar.suffix}.zip"
++      filesonly="true"
++      level="9"
++    />
++</target>
++
+ <target name="compile-a201" description="Compile for android 2.0.1" if="build-2.0.1">
+     <delete dir="build/classes" failonerror="false" />
+     <mkdir dir="build/classes" />
+@@ -208,7 +243,7 @@
+ <target
+   name="compile"
+   description="Compile for all targets"
+-  depends="compile-jse,compile-a201,compile-a20,compile-a16,compile-a15,compile-a11"
++  depends="compile-jse,compile-a21,compile-a201,compile-a20,compile-a16,compile-a15,compile-a11"
+ />
+ 
+ </project>
diff -r cffbce08906d -r 19d55036ad3f libs/README.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libs/README.txt	Fri Mar 05 04:01:54 2010 +0100
@@ -0,0 +1,10 @@
+This directory contains the libraries used by BEEM.
+
+The principal one is asmack, a portage of the Smack library for the Android
+platform.
+
+The source of the asmack library can be downloaded at
+http://dev.beem-project.com/attachments/download/51/asmack-android-2.1-source-beem.zip
+
+See the file doc/asmack-beem/README.txt for more informations.
+
diff -r cffbce08906d -r 19d55036ad3f libs/asmack-android-2.1-beem.jar
Binary file libs/asmack-android-2.1-beem.jar has changed
diff -r cffbce08906d -r 19d55036ad3f libs/asmack-jse.jar
Binary file libs/asmack-jse.jar has changed