Mercurial Mercurial > beem > otr / 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@beem-project.com>
Sun, 16 Jan 2011 12:44:59 +0100
changeset 854 30d32b73be7c
parent 742 a892ea0075a5
permissions -rw-r--r--
fix Bug #321 I have commented the PrivacyListManagerAdapter initialization because the exception came from the underneath code. Also, since the feature isn't finished (especially tested) and enabled in the gui, it will be safer.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
742
a892ea0075a5 Update the patch for the latest version of asmack
Da Risk <darisk972@gmail.com>
parents: 695
diff changeset 
     1
 
--- asmack-git/build.bash	2010-05-07 22:08:18.000000000 +0200
a892ea0075a5 Update the patch for the latest version of asmack
Da Risk <darisk972@gmail.com>
parents: 695
diff changeset 
     2
 
+++ asmack/build.bash	2010-05-07 22:06:53.000000000 +0200
695
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     3
 
@@ -15,11 +15,11 @@
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     4
 
   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 
     5
 
     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 
     6
 
     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 
     7
 
-    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 
     8
 
+    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 
     9
 
   else
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
 
     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 
    11
 
     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 
    12
 
-    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 
    13
 
+    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 
    14
 
   fi
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    15
 
 )
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    16
 
 }
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    17
 
@@ -37,11 +37,11 @@
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    18
 
 }
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    19
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    20
 
 fetchall() {
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    21
 
-  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 
    22
 
-  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 
    23
 
-  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 
    24
 
-  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 
    25
 
-  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 
    26
 
+  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 
    27
 
+  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 
    28
 
+  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 
    29
 
+  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 
    30
 
+  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 
    31
 
 }
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    32
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    33
 
 copyfolder() {
BEEM-OTR