|
1 --- asmack-org/build.bash 2010-03-05 02:42:58.978546820 +0100 |
|
2 +++ asmack/build.bash 2010-03-05 02:35:43.689307349 +0100 |
|
3 @@ -15,11 +15,11 @@ |
|
4 if ! [ -f "${2}/.svn/entries" ]; then |
|
5 mkdir "${2}" |
|
6 cd "${2}" |
|
7 - svn co --non-interactive --trust-server-cert "${1}" "." |
|
8 + svn co --non-interactive --trust-server-cert "${1}" -r "${3}" "." |
|
9 else |
|
10 cd "${2}" |
|
11 svn cleanup |
|
12 - svn up |
|
13 + svn up -r "${3}" |
|
14 fi |
|
15 ) |
|
16 } |
|
17 @@ -37,11 +37,11 @@ |
|
18 } |
|
19 |
|
20 fetchall() { |
|
21 - gitfetch "git://github.com/rtreffer/smack.git" "smack" |
|
22 - fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" |
|
23 - fetch "http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/" "harmony" |
|
24 - fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" |
|
25 - fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" |
|
26 + fetch "http://svn.igniterealtime.org/svn/repos/smack/trunk" "smack" "11644" |
|
27 + fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" "HEAD" |
|
28 + fetch "http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/" "harmony" "HEAD" |
|
29 + fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" "HEAD" |
|
30 + fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" "HEAD" |
|
31 } |
|
32 |
|
33 copyfolder() { |
|
34 @@ -95,7 +95,7 @@ |
|
35 buildsrc |
|
36 patchsrc "patch" |
|
37 patchsrc "${dir}" |
|
38 - ant -Djar.suffix=`echo ${dir}|sed 's:patch/:-:'` |
|
39 + ant -Dbuild.all=true -Djar.suffix=`echo ${dir}|sed 's:patch/:-:'` |
|
40 done |
|
41 } |
|
42 |
|
43 --- asmack3/build.xml 2010-02-24 16:09:39.000000000 +0100 |
|
44 +++ asmack-org/build.xml 2010-02-24 00:18:40.000000000 +0100 |
|
45 @@ -36,6 +36,13 @@ |
|
46 </and> |
|
47 </condition> |
|
48 |
|
49 +<condition property="build-2.1"> |
|
50 + <and> |
|
51 + <istrue value="${build.all}" /> |
|
52 + <available file="${sdk-location}/platforms/android-2.1/android.jar" /> |
|
53 + </and> |
|
54 +</condition> |
|
55 + |
|
56 <target name="compile-jse" description="Compile for java se"> |
|
57 <delete dir="build/classes" failonerror="false" /> |
|
58 <mkdir dir="build/classes" /> |
|
59 @@ -65,6 +72,34 @@ |
|
60 /> |
|
61 </target> |
|
62 |
|
63 +<target name="compile-a21" description="Compile for android 2.1" if="build-2.1"> |
|
64 + <delete dir="build/classes" failonerror="false" /> |
|
65 + <mkdir dir="build/classes" /> |
|
66 + <mkdir dir="build/classes/trunk" /> |
|
67 + <javac |
|
68 + target="1.5" |
|
69 + srcdir="build/src/trunk" |
|
70 + destdir="build/classes/trunk" |
|
71 + classpath="lib/xmlpull_1_1_3_4c.jar" |
|
72 + bootclasspath="${sdk-location}/platforms/android-2.1/android.jar" |
|
73 + debug="true" |
|
74 + debuglevel="source,lines" |
|
75 + /> |
|
76 + <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy> |
|
77 + <jar |
|
78 + basedir="build/classes/trunk" |
|
79 + destfile="build/asmack-android-2.1${jar.suffix}.jar" |
|
80 + filesonly="true" |
|
81 + level="9" |
|
82 + /> |
|
83 + <zip |
|
84 + basedir="build/src/trunk" |
|
85 + destfile="build/asmack-android-2.1-source${jar.suffix}.zip" |
|
86 + filesonly="true" |
|
87 + level="9" |
|
88 + /> |
|
89 +</target> |
|
90 + |
|
91 <target name="compile-a201" description="Compile for android 2.0.1" if="build-2.0.1"> |
|
92 <delete dir="build/classes" failonerror="false" /> |
|
93 <mkdir dir="build/classes" /> |
|
94 @@ -208,7 +243,7 @@ |
|
95 <target |
|
96 name="compile" |
|
97 description="Compile for all targets" |
|
98 - depends="compile-jse,compile-a201,compile-a20,compile-a16,compile-a15,compile-a11" |
|
99 + depends="compile-jse,compile-a21,compile-a201,compile-a20,compile-a16,compile-a15,compile-a11" |
|
100 /> |
|
101 |
|
102 </project> |