Mercurial Mercurial > beem > trunk / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc/asmack-beem/README.txt
changeset 1005 4c7edc276676
parent 695 19d55036ad3f 
--- a/doc/asmack-beem/README.txt	Sun Oct 28 14:26:54 2012 +0100
+++ b/doc/asmack-beem/README.txt	Wed Oct 31 23:11:14 2012 +0100
@@ -1,39 +1,37 @@
 INTRODUCTION
 ------------
 asmack http://code.google.com/p/asmack/ is a portage of the Smack library for
-the Android platform. The project is mostly maintained by Rene Treffer and you
-can find the binaries at http://code.google.com/p/asmack/ and the sources at
-http://github.com/rtreffer/asmack
+the Android platform. The project is was maintained by Rene Treffer.
+
+Florian Schmaus maintains a more up to date version of this project. This
+version is used by many XMPP clients for Android.
+
+You can find the sources at
+  http://github.com/rtreffer/asmack     for Rene version
+  http://github.com/Flowdalic/asmack    for Florian version
 
 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. Currently, we use the revision 11644 of the Smack SVN repository.
+library.
+Currently, we use the changeset 0ffd380698bca3502a6f25c4d755fe79f6977b49 of
+the Florian's Smack git repository.
 
 COMPILE
 -------
 
 First check out the last version of asmack
-> git clone git://github.com/rtreffer/asmack.git
-
-Then apply the beem-build-process.patch on the source.
-> cd asmack
-> patch -p1 < beem-build-process.patch
->
+> git clone git://github.com/Flowdalic/asmack.git
 
 Add the beem flavour to the patch repository
+> rm -rf patch/beem
 > cp -R beem_patches patch/beem
 >
 
-The 50-fix_chatmanager.patch is only necessary to fix a little bug in smack. The
-patch has been proposed to the Smack developers. See
-http://www.igniterealtime.org/issues/browse/SMACK-269 for progress.
-
 Edit your local.properties file to contains the path of the android SDK. See
 local.properties.example
 
-Build asmack
-> ./build.batch
+Build asmack with beem patches
+> ./build.bash -c -b 0ffd380698bca3502a6f25c4d755fe79f6977b49
 >
 
 The build directory will contains the files :
BEEM