--- a/doc/asmack-beem/beem-build-process.patch Thu May 06 23:37:20 2010 +0200
+++ b/doc/asmack-beem/beem-build-process.patch Fri May 07 22:19:19 2010 +0200
@@ -1,5 +1,5 @@
---- asmack-org/build.bash 2010-03-05 02:42:58.978546820 +0100
-+++ asmack/build.bash 2010-03-05 02:35:43.689307349 +0100
+--- asmack-git/build.bash 2010-05-07 22:08:18.000000000 +0200
++++ asmack/build.bash 2010-05-07 22:06:53.000000000 +0200
@@ -15,11 +15,11 @@
if ! [ -f "${2}/.svn/entries" ]; then
mkdir "${2}"
@@ -20,83 +20,14 @@
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 "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/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 "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/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>