soc.2012.android: fc4081da: Added config.sub patch (hwich was ignore...

[michael at soc.pidgin.im]

----------------------------------------------------------------------
Revision: fc4081da0e84578be6b452a0bbc5d614d0106b65
Parent:   a3ecf663e82cc404e23b54a7e2cb9f2d128748b9
Author:   michael at soc.pidgin.im
Date:     05/22/12 05:13:45
Branch:   im.pidgin.soc.2012.android
URL: http://d.pidgin.im/viewmtn/revision/info/fc4081da0e84578be6b452a0bbc5d614d0106b65

Changelog: 

Added config.sub patch (hwich was ignored by monotone), updated common build file to find build directory automatically and include ant-contrib


Changes against parent a3ecf663e82cc404e23b54a7e2cb9f2d128748b9

  added    android/workspace/im.pidgin.libpurple.build/buildscripts/config.sub.patch
  patched  android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant

-------------- next part --------------
============================================================
--- android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant	037ea93070d7c1b3b735d50143f83f79d8bce6b2
+++ android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant	3ae9a25edbffbbd20cad7cd6e17b10109cffa89e
@@ -7,14 +7,16 @@
      
      michaelz                                                                
      ====================================================================== -->
-<project name="libpurple build scripts" default="download">
+<project name="libpurple.buildscripts" default="download">
 	<description>
             Download script that downloads files from external libraries
     </description>
 
+	<dirname file="${ant.file.libpurple.buildscripts}" property="libpurple.buildscripts"/>
+	<dirname file="${libpurple.buildscripts}" property="build.base"/>
+	
 	<property name="libpurple.downloads" location="${build.base}/downloads" />
 	<property name="libpurple.build" location="${build.base}/build" />
-	<property name="libpurple.buildscripts" location="${build.base}/buildscripts" />
 	<property name="libpurple.prefix" location="${build.base}/build/prefix" />
 	<property name="pidgin.base" value="${build.base}/../../../"/>
 
@@ -141,14 +143,9 @@
           target: ant-contrib.load              
          ================================= -->
     <target name="ant-contrib.load" depends="" description="Initializes and loads ant contrib">
+    	
         <taskdef resource="net/sf/antcontrib/antlib.xml">
         </taskdef>
-    	<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-    	<path id="bin">
-    		<pathelement path="${build.base}/bin"/>
-    	</path>
-    	
-    	<taskdef name="extractconstants" classpathref="bin" classname="im.pidgin.libpurple.build.constants.ExtractConstants"></taskdef>
     </target>
 	
 </project>
============================================================
--- /dev/null	
+++ android/workspace/im.pidgin.libpurple.build/buildscripts/config.sub.patch	6deebf4a3dbe12e2a5d0e4b92ab6fdd3eb196b34
@@ -0,0 +1,20 @@
+--- index.html?p=config.git;a=blob_plain;f=config.sub;hb=HEAD	2012-05-07 22:40:07.000000000 +0200
++++ /home/michael/pidgin-gsoc-2012/code/android/workspace/im.pidgin.libpurple.build/build/libiconv-1.14/build-aux/config.sub	2012-05-07 23:03:29.000000000 +0200
+@@ -122,7 +122,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  nto-qnx* | linux-gnu* | linux-android* | android* | linux-dietlibc | linux-newlib* | \
+   linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+   knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+@@ -1359,7 +1359,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-android* \
++	      | -mingw32* | -linux-gnu* | -linux-android* | -android* \
+ 	      | -linux-newlib* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \