Mercurial Mercurial > beem > jingle / annotate
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/beem-build-process.patch
author Nikita Kozlov <nikita@mbdsys.com>
Tue, 18 Jan 2011 00:26:02 +0100
changeset 868 6c2c4bfa43d0
parent 840 322071d17c00
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
     1
 
diff --git a/build.bash b/build.bash
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
     2
 
index ce793f9..26e4560 100755
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
     3
 
--- a/build.bash
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
     4
 
+++ b/build.bash
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
     5
 
@@ -15,11 +15,11 @@ fetch() {
695
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     6
 
   if ! [ -f "${2}/.svn/entries" ]; then
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     7
 
     mkdir "${2}"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     8
 
     cd "${2}"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     9
 
-    svn co --non-interactive --trust-server-cert "${1}" "."
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
 
+    svn co --non-interactive --trust-server-cert "${1}" -r "${3}" "."
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    11
 
   else
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    12
 
     cd "${2}"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    13
 
     svn cleanup
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    14
 
-    svn up
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    15
 
+    svn up -r "${3}"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    16
 
   fi
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    17
 
 )
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    18
 
 }
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    19
 
@@ -37,11 +37,11 @@ gitfetch() {
695
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    20
 
 }
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    21
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    22
 
 fetchall() {
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    23
 
-  gitfetch "git://github.com/rtreffer/smack.git" "smack"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    24
 
-  fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid"
742
a892ea0075a5 Update the patch for the latest version of asmack
Da Risk <darisk972@gmail.com>
parents: 695
diff changeset 
    25
 
-  fetch "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/java/common/" "harmony"
695
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    26
 
-  fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    27
 
-  fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    28
 
+  fetch "http://svn.igniterealtime.org/svn/repos/smack/trunk" "smack" "11644"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    29
 
+  fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" "HEAD"
742
a892ea0075a5 Update the patch for the latest version of asmack
Da Risk <darisk972@gmail.com>
parents: 695
diff changeset 
    30
 
+  fetch "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/java/common/" "harmony" "HEAD"
695
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    31
 
+  fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" "HEAD"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    32
 
+  fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" "HEAD"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    33
 
 }
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    34
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    35
 
 copyfolder() {
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    36
 
@@ -62,6 +62,7 @@ buildsrc() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    37
 
   mkdir build/src
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    38
 
   mkdir build/src/trunk
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    39
 
   copyfolder "src/smack/source/" "build/src/trunk" "."
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    40
 
+  copyfolder "src/smack/jingle/extension/source/" "build/src/trunk" "."
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    41
 
   copyfolder "src/qpid/java" "build/src/trunk" "org/apache/qpid/management/common/sasl"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    42
 
   copyfolder "src/novell-openldap-jldap" "build/src/trunk" "."
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    43
 
   copyfolder "src/dnsjava"  "build/src/trunk" "org"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    44
 
diff --git a/build.xml b/build.xml
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    45
 
index 827f4c5..50054f1 100644
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    46
 
--- a/build.xml
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    47
 
+++ b/build.xml
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    48
 
@@ -57,7 +57,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    49
 
       target="1.5"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    50
 
       srcdir="build/src/trunk"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    51
 
       destdir="build/classes/trunk"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    52
 
-      classpath="lib/xmlpull_1_1_3_4c.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    53
 
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    54
 
       bootclasspath="${sdk-location}/platforms/android-7/android.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    55
 
       debug="true"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    56
 
       debuglevel="source,lines"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    57
 
@@ -85,7 +85,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    58
 
       target="1.5"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    59
 
       srcdir="build/src/trunk"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    60
 
       destdir="build/classes/trunk"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    61
 
-      classpath="lib/xmlpull_1_1_3_4c.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    62
 
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    63
 
       bootclasspath="${sdk-location}/platforms/android-6/android.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    64
 
       debug="true"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    65
 
       debuglevel="source,lines"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    66
 
@@ -113,7 +113,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    67
 
       target="1.5"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    68
 
       srcdir="build/src/trunk"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    69
 
       destdir="build/classes/trunk"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    70
 
-      classpath="lib/xmlpull_1_1_3_4c.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    71
 
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    72
 
       bootclasspath="${sdk-location}/platforms/android-5/android.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    73
 
       debug="true"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    74
 
       debuglevel="source,lines"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    75
 
@@ -141,7 +141,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    76
 
       target="1.5"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    77
 
       srcdir="build/src/trunk"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    78
 
       destdir="build/classes/trunk"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    79
 
-      classpath="lib/xmlpull_1_1_3_4c.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    80
 
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    81
 
       bootclasspath="${sdk-location}/platforms/android-4/android.jar"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    82
 
       debug="true"
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents: 742
diff changeset 
    83
 
       debuglevel="source,lines"
BEEM-Jingle