Mercurial Mercurial > beem > trunk / 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 Da Risk <da_risk@beem-project.com>
Tue, 24 Jul 2012 18:30:07 +0200
changeset 983 e818646525da
parent 900 56e0eadf8e87
permissions -rw-r--r--
Checkstyle
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
900
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
     1
 
diff --git a/build.bash b/build.bash
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
     2
 
index ce793f9..8a7f6bf 100755
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
     3
 
--- a/build.bash
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
     4
 
+++ b/build.bash
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.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
 
 }
900
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.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"
900
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    32
 
+  gitfetch "git://kenai.com/jbosh~origin" "jbosh"
695
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() {
900
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    36
 
@@ -67,7 +67,7 @@ buildsrc() {
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    37
 
   copyfolder "src/dnsjava"  "build/src/trunk" "org"
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    38
 
   copyfolder "src/harmony" "build/src/trunk" "."
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    39
 
   copyfolder "src/custom" "build/src/trunk" "."
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    40
 
-  copyfolder "src/jbosh" "build/src/trunk" "."
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    41
 
+  copyfolder "src/jbosh/src/main/java" "build/src/trunk" "."
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    42
 
 }
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    43
56e0eadf8e87 Update beem-build-process.patch to new jbosh repository.
Da Risk <da_risk@beem-project.com>
parents: 742
diff changeset 
    44
 
 patchsrc() {
BEEM