/soc/2012/michael/android: 7a4a2b2eb882: Updated build scripts: ...

[Michael Zangl]

Changeset: 7a4a2b2eb882bd9fbc5c51ea0eaa7fd0192a6f77
Author:	 Michael Zangl <michael at soc.pidgin.im>
Date:	 2012-07-18 12:24 +0200
Branch:	 soc.2012.android
URL: http://hg.pidgin.im/soc/2012/michael/android/rev/7a4a2b2eb882

Description:

Updated build scripts: fixed patch complaining about already applied patches.

diffstat:

 android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant     |  2 +-
 android/workspace/im.pidgin.libpurple.build/buildscripts/dbus.ant       |  3 ++-
 android/workspace/im.pidgin.libpurple.build/buildscripts/glib.ant       |  1 +
 android/workspace/im.pidgin.libpurple.build/buildscripts/libgettext.ant |  3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diffs (51 lines):

diff --git a/android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant b/android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant
--- a/android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant
+++ b/android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant
@@ -101,7 +101,7 @@
 			<arg value="-c" />
 			<arg value="
 	            export PATH="${ndk.bin}:$PATH";
-                cd "${builddir}" && make ${make.flags} && make install ${make.flags};
+                cd "${builddir}" && make --jobs=8 ${make.flags} && make install ${make.flags};
                 " />
 		</exec>
 	</target>
diff --git a/android/workspace/im.pidgin.libpurple.build/buildscripts/dbus.ant b/android/workspace/im.pidgin.libpurple.build/buildscripts/dbus.ant
--- a/android/workspace/im.pidgin.libpurple.build/buildscripts/dbus.ant
+++ b/android/workspace/im.pidgin.libpurple.build/buildscripts/dbus.ant
@@ -43,8 +43,9 @@
           target: dbus.patch                      
          - - - - - - - - - - - - - - - - - -->
     <target name="dbus.patch">
-    	<exec executable="patch" failifexecutionfails="true">
+    	<exec executable="patch" failifexecutionfails="true" failonerror="true">
 			<arg value="-p0" />
+			<arg value="-N" />
 			<arg value="-i" />
     		<arg value="${libpurple.buildscripts}/dbus.patch" />
 			<arg value="-d" />
diff --git a/android/workspace/im.pidgin.libpurple.build/buildscripts/glib.ant b/android/workspace/im.pidgin.libpurple.build/buildscripts/glib.ant
--- a/android/workspace/im.pidgin.libpurple.build/buildscripts/glib.ant
+++ b/android/workspace/im.pidgin.libpurple.build/buildscripts/glib.ant
@@ -95,6 +95,7 @@
 	<target name="glib.patch">
 		<exec executable="patch" failifexecutionfails="true" failonerror="true">
 			<arg value="-p0" />
+			<arg value="-N" />
 			<arg value="-i" />
 			<arg value="${libpurple.buildscripts}/glib.patch" />
 			<arg value="-d" />
diff --git a/android/workspace/im.pidgin.libpurple.build/buildscripts/libgettext.ant b/android/workspace/im.pidgin.libpurple.build/buildscripts/libgettext.ant
--- a/android/workspace/im.pidgin.libpurple.build/buildscripts/libgettext.ant
+++ b/android/workspace/im.pidgin.libpurple.build/buildscripts/libgettext.ant
@@ -52,8 +52,9 @@
           target: gettext.patch                      
          - - - - - - - - - - - - - - - - - -->
 	<target name="gettext.patch">
-		<exec executable="patch">
+		<exec executable="patch" failifexecutionfails="true" failonerror="true">
 			<arg value="-p0" />
+			<arg value="-N" />
 			<arg value="-i" />
 			<arg value="${libpurple.buildscripts}/gettext.patch" />
 			<arg value="-d" />