1 diff --git a/build.bash b/build.bash |
|
2 index ce793f9..26e4560 100755 |
|
3 --- a/build.bash |
|
4 +++ b/build.bash |
|
5 @@ -15,11 +15,11 @@ fetch() { |
|
6 if ! [ -f "${2}/.svn/entries" ]; then |
|
7 mkdir "${2}" |
|
8 cd "${2}" |
|
9 - svn co --non-interactive --trust-server-cert "${1}" "." |
|
10 + svn co --non-interactive --trust-server-cert "${1}" -r "${3}" "." |
|
11 else |
|
12 cd "${2}" |
|
13 svn cleanup |
|
14 - svn up |
|
15 + svn up -r "${3}" |
|
16 fi |
|
17 ) |
|
18 } |
|
19 @@ -37,11 +37,11 @@ gitfetch() { |
|
20 } |
|
21 |
|
22 fetchall() { |
|
23 - gitfetch "git://github.com/rtreffer/smack.git" "smack" |
|
24 - fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" |
|
25 - fetch "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/java/common/" "harmony" |
|
26 - fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" |
|
27 - fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" |
|
28 + fetch "http://svn.igniterealtime.org/svn/repos/smack/trunk" "smack" "11644" |
|
29 + fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" "HEAD" |
|
30 + fetch "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/java/common/" "harmony" "HEAD" |
|
31 + fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" "HEAD" |
|
32 + fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" "HEAD" |
|
33 } |
|
34 |
|
35 copyfolder() { |
|
36 @@ -62,6 +62,7 @@ buildsrc() { |
|
37 mkdir build/src |
|
38 mkdir build/src/trunk |
|
39 copyfolder "src/smack/source/" "build/src/trunk" "." |
|
40 + copyfolder "src/smack/jingle/extension/source/" "build/src/trunk" "." |
|
41 copyfolder "src/qpid/java" "build/src/trunk" "org/apache/qpid/management/common/sasl" |
|
42 copyfolder "src/novell-openldap-jldap" "build/src/trunk" "." |
|
43 copyfolder "src/dnsjava" "build/src/trunk" "org" |
|
44 diff --git a/build.xml b/build.xml |
|
45 index 827f4c5..50054f1 100644 |
|
46 --- a/build.xml |
|
47 +++ b/build.xml |
|
48 @@ -57,7 +57,7 @@ |
|
49 target="1.5" |
|
50 srcdir="build/src/trunk" |
|
51 destdir="build/classes/trunk" |
|
52 - classpath="lib/xmlpull_1_1_3_4c.jar" |
|
53 + classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar" |
|
54 bootclasspath="${sdk-location}/platforms/android-7/android.jar" |
|
55 debug="true" |
|
56 debuglevel="source,lines" |
|
57 @@ -85,7 +85,7 @@ |
|
58 target="1.5" |
|
59 srcdir="build/src/trunk" |
|
60 destdir="build/classes/trunk" |
|
61 - classpath="lib/xmlpull_1_1_3_4c.jar" |
|
62 + classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar" |
|
63 bootclasspath="${sdk-location}/platforms/android-6/android.jar" |
|
64 debug="true" |
|
65 debuglevel="source,lines" |
|
66 @@ -113,7 +113,7 @@ |
|
67 target="1.5" |
|
68 srcdir="build/src/trunk" |
|
69 destdir="build/classes/trunk" |
|
70 - classpath="lib/xmlpull_1_1_3_4c.jar" |
|
71 + classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar" |
|
72 bootclasspath="${sdk-location}/platforms/android-5/android.jar" |
|
73 debug="true" |
|
74 debuglevel="source,lines" |
|
75 @@ -141,7 +141,7 @@ |
|
76 target="1.5" |
|
77 srcdir="build/src/trunk" |
|
78 destdir="build/classes/trunk" |
|
79 - classpath="lib/xmlpull_1_1_3_4c.jar" |
|
80 + classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar" |
|
81 bootclasspath="${sdk-location}/platforms/android-4/android.jar" |
|
82 debug="true" |
|
83 debuglevel="source,lines" |
|