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>
Tue, 06 Apr 2010 22:45:52 +0200
changeset 723 c77d49614696
parent 695 19d55036ad3f
child 742 a892ea0075a5
permissions -rw-r--r--
beem 0.1.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
695
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     1
 
--- asmack-org/build.bash	2010-03-05 02:42:58.978546820 +0100
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     2
 
+++ asmack/build.bash	2010-03-05 02:35:43.689307349 +0100
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"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    23
 
-  fetch "http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/" "harmony"
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"
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.apache.org/repos/asf/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/" "harmony" "HEAD"
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() {
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    34
 
@@ -95,7 +95,7 @@
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    35
 
     buildsrc
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    36
 
     patchsrc "patch"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    37
 
     patchsrc "${dir}"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    38
 
-    ant -Djar.suffix=`echo ${dir}|sed 's:patch/:-:'`
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    39
 
+    ant -Dbuild.all=true -Djar.suffix=`echo ${dir}|sed 's:patch/:-:'`
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    40
 
   done
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    41
 
 }
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    42
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    43
 
--- asmack3/build.xml	2010-02-24 16:09:39.000000000 +0100
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    44
 
+++ asmack-org/build.xml	2010-02-24 00:18:40.000000000 +0100
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    45
 
@@ -36,6 +36,13 @@
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    46
 
     </and>
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    47
 
 </condition>
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    48
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    49
 
+<condition property="build-2.1">
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    50
 
+    <and>
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    51
 
+        <istrue value="${build.all}" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    52
 
+        <available file="${sdk-location}/platforms/android-2.1/android.jar" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    53
 
+    </and>
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    54
 
+</condition>
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    55
 
+
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    56
 
 <target name="compile-jse"  description="Compile for java se">
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    57
 
     <delete dir="build/classes" failonerror="false" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    58
 
     <mkdir dir="build/classes" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    59
 
@@ -65,6 +72,34 @@
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    60
 
     />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    61
 
 </target>
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    62
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    63
 
+<target name="compile-a21" description="Compile for android 2.1" if="build-2.1">
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    64
 
+    <delete dir="build/classes" failonerror="false" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    65
 
+    <mkdir dir="build/classes" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    66
 
+    <mkdir dir="build/classes/trunk" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    67
 
+    <javac
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    68
 
+      target="1.5"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    69
 
+      srcdir="build/src/trunk"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    70
 
+      destdir="build/classes/trunk"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    71
 
+      classpath="lib/xmlpull_1_1_3_4c.jar"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    72
 
+      bootclasspath="${sdk-location}/platforms/android-2.1/android.jar"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    73
 
+      debug="true"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    74
 
+      debuglevel="source,lines"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    75
 
+    />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    76
 
+    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    77
 
+    <jar
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    78
 
+      basedir="build/classes/trunk"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    79
 
+      destfile="build/asmack-android-2.1${jar.suffix}.jar"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    80
 
+      filesonly="true"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    81
 
+      level="9"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    82
 
+    />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    83
 
+    <zip
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    84
 
+      basedir="build/src/trunk"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    85
 
+      destfile="build/asmack-android-2.1-source${jar.suffix}.zip"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    86
 
+      filesonly="true"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    87
 
+      level="9"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    88
 
+    />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    89
 
+</target>
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    90
 
+
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    91
 
 <target name="compile-a201" description="Compile for android 2.0.1" if="build-2.0.1">
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    92
 
     <delete dir="build/classes" failonerror="false" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    93
 
     <mkdir dir="build/classes" />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    94
 
@@ -208,7 +243,7 @@
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    95
 
 <target
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    96
 
   name="compile"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    97
 
   description="Compile for all targets"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    98
 
-  depends="compile-jse,compile-a201,compile-a20,compile-a16,compile-a15,compile-a11"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    99
 
+  depends="compile-jse,compile-a21,compile-a201,compile-a20,compile-a16,compile-a15,compile-a11"
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
   100
 
 />
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
   101
19d55036ad3f Replace the asmack library built with the trunk with one built with the fixed
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
   102
 
 </project>
BEEM-OTR