/soc/2012/michael/android: b2b91c85455b: Cleaned build scripts f...

Sat Jun 16 08:12:49 EDT 2012

Changeset: b2b91c85455b51494fa001374aa56d9034ebc607
Author:	 Michael Zangl <michael at soc.pidgin.im>
Date:	 2012-06-16 13:52 +0200
Branch:	 soc.2012.android
URL: http://hg.pidgin.im/soc/2012/michael/android/rev/b2b91c85455b

Description:

Cleaned build scripts for libraries and build settings in eclipse

diffstat:

 android/workspace/im.pidgin.libpurple.build/.classpath                                                      |   2 +-
 android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/dbus.launch                               |   2 +-
 android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/glib.launch                               |   4 +-
 android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libffi.launch                             |   2 +-
 android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libgettext.launch                         |   2 +-
 android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libiconv.launch                           |   2 +-
 android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libxml2.launch                            |   2 +-
 android/workspace/im.pidgin.libpurple.build/buildscripts/common.ant                                         |   2 -
 android/workspace/im.pidgin.libpurple.build/buildscripts/glib.ant                                           |   1 -
 android/workspace/im.pidgin.libpurple.build/buildscripts/glib.patch                                         |  12 ++++++++-
 android/workspace/im.pidgin.libpurple.build/buildscripts/libgettext.ant                                     |   9 +------
 android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ExtractorException.java |   5 ----
 android/workspace/im.pidgin.libpurple/.project                                                              |  11 +++++++++
 android/workspace/im.pidgin.libpurple/native/build.ant                                                      |   2 +-
 14 files changed, 31 insertions(+), 27 deletions(-)

diffs (240 lines):

diff --git a/android/workspace/im.pidgin.libpurple.build/.classpath b/android/workspace/im.pidgin.libpurple.build/.classpath
--- a/android/workspace/im.pidgin.libpurple.build/.classpath
+++ b/android/workspace/im.pidgin.libpurple.build/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/dbus.launch b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/dbus.launch
--- a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/dbus.launch
+++ b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/dbus.launch
@@ -7,7 +7,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="im.pidgin.libpurple.build"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item path="/im.pidgin.libpurple.build/buildscripts/common.ant" type="1"/>
<item path="/im.pidgin.libpurple.build/buildscripts/dbus.ant" type="1"/>
</resources>}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/im.pidgin.libpurple.build/buildscripts/dbus.ant}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
diff --git a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/glib.launch b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/glib.launch
--- a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/glib.launch
+++ b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/glib.launch
@@ -7,8 +7,8 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="im.pidgin.libpurple.build"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item path="/im.pidgin.libpurple.build/buildscripts/common.ant" type="1"/>
<item path="/im.pidgin.libpurple.build/buildscripts/glib.ant" type="1"/>
</resources>}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item path="/im.pidgin.libpurple.build/buildscripts/common.ant" type="1"/>
<item path="/im.pidgin.libpurple.build/buildscripts/glib.ant" type="1"/>
<item path="/im.pidgin.libpurple.build/buildscripts/glib.patch" type="1"/>
</resources>}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/im.pidgin.libpurple.build/buildscripts/glib.ant}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
diff --git a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libffi.launch b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libffi.launch
--- a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libffi.launch
+++ b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libffi.launch
@@ -7,7 +7,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="im.pidgin.libpurple.build"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item path="/im.pidgin.libpurple.build/buildscripts/common.ant" type="1"/>
<item path="/im.pidgin.libpurple.build/buildscripts/libffi.ant" type="1"/>
</resources>}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/im.pidgin.libpurple.build/buildscripts/libffi.ant}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
diff --git a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libgettext.launch b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libgettext.launch
--- a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libgettext.launch
+++ b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libgettext.launch
@@ -6,7 +6,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="im.pidgin.libpurple.build"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item path="/im.pidgin.libpurple.build/buildscripts/common.ant" type="1"/>
<item path="/im.pidgin.libpurple.build/buildscripts/libgettext.ant" type="1"/>
</resources>}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/im.pidgin.libpurple.build/buildscripts/libgettext.ant}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
diff --git a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libiconv.launch b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libiconv.launch
--- a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libiconv.launch
+++ b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libiconv.launch
@@ -7,7 +7,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="im.pidgin.libpurple.build"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item path="/im.pidgin.libpurple.build/buildscripts/common.ant" type="1"/>
<item path="/im.pidgin.libpurple.build/buildscripts/libiconv.ant" type="1"/>
</resources>}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/im.pidgin.libpurple.build/buildscripts/libiconv.ant}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
diff --git a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libxml2.launch b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libxml2.launch
--- a/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libxml2.launch
+++ b/android/workspace/im.pidgin.libpurple.build/.externalToolBuilders/libxml2.launch
@@ -7,7 +7,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="im.pidgin.libpurple.build"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item path="/im.pidgin.libpurple.build/buildscripts/common.ant" type="1"/>
<item path="/im.pidgin.libpurple.build/buildscripts/libxml2.ant" type="1"/>
</resources>}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/im.pidgin.libpurple.build/buildscripts/libxml2.ant}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
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
@@ -48,7 +48,6 @@
 		<available file="${builddir}" property="download.builddir.exists" />
 	</target>
 
-
 	<!-- - - - - - - - - - - - - - - - - - 
           target: configure                      
          - - - - - - - - - - - - - - - - - -->
@@ -156,5 +155,4 @@
 		<taskdef name="replaceLibNames" classpathref="bin" classname="im.pidgin.libpurple.build.libs.ReplaceLibNames">
 		</taskdef>
 	</target>
-
 </project>
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
@@ -17,7 +17,6 @@
 	<property name="libffi.cflags" value="-DANDROID -I${libpurple.build}/libffi-${libffi.version}/include" />
 	<property name="libffi.libs" value="-lffi" />
 
-
 	<property name="configure.precommand" value="
 		export LIBFFI_CFLAGS="${libffi.cflags}";
     	export LIBFFI_LIBS="${libffi.libs}";
diff --git a/android/workspace/im.pidgin.libpurple.build/buildscripts/glib.patch b/android/workspace/im.pidgin.libpurple.build/buildscripts/glib.patch
--- a/android/workspace/im.pidgin.libpurple.build/buildscripts/glib.patch
+++ b/android/workspace/im.pidgin.libpurple.build/buildscripts/glib.patch
@@ -10,6 +10,15 @@
  AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
  AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
  #include <sys/stat.h>
+@@ -1066,7 +1066,7 @@
+ AC_CHECK_FUNCS(getprotobyname_r endservent if_nametoindex)
+ AC_CHECK_HEADERS([netdb.h wspiapi.h arpa/nameser_compat.h])
+ 
+-if test $glib_native_win32 = no; then
++if test $glib_native_win32 = no && false; then
+   # We can't just use AC_CHECK_FUNC/AC_CHECK_LIB here. Bug 586150
+   NETWORK_LIBS=""
+   AC_MSG_CHECKING([for res_query])
 @@ -1991,8 +1994,8 @@
    # One of them does for most gcc versions and some other platforms/compilers
    # too and could be considered as the canonical way to go. 
@@ -125,7 +134,6 @@
  
  TEST_PROGS += unix-multithreaded
  unix_multithreaded_SOURCES = $(top_srcdir)/glib/tests/unix.c
-diff: /home/michael/Programme/glib-2.33.1/gio/androidarpa.h: Datei oder Verzeichnis nicht gefunden
 --- gio/gnetworkingprivate.h	2012-05-01 07:22:53.000000000 +0200
 +++ gio/gnetworkingprivate.h	2012-05-09 23:35:49.000000000 +0200
 @@ -50,6 +50,7 @@
@@ -149,4 +157,4 @@
 +#endif
  
        if (gecos)
- 	{
+ 	{
\ No newline at end of file
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
@@ -15,11 +15,9 @@
 	<property name="download-filename" value="http://ftp.gnu.org/pub/gnu/gettext/gettext-${gettext.version}.tar.gz" />
 	<!--<property name="config.dir" value="${builddir}" />-->
 
-	<property name="configure.cflags" value="-D _GL_JUST_INCLUDE_SYSTEM_STDINT_H -DANDROID -I${libffi.builddir}/include" />
+	<property name="configure.cflags" value="-D _GL_JUST_INCLUDE_SYSTEM_STDINT_H -DANDROID -I${libpurple.prefix}/include -I${libffi.builddir}/include" />
 	<property name="configure.pkg.config.libdir" value="${libpurple.prefix}/lib/pkgconfig:${libpurple.prefix}/share/pkgconfig" />
 
-
-
 	<property name="configure.flags" value="
 		--enable-shared 
 		--enable-static 
@@ -40,7 +38,6 @@
 		" />
 	<property name="configure.precommand" value="export PKG_CONFIG_LIBDIR="{configure.pkg.config.libdir}";" />
 
-
 	<description>
             Builds gettext
     </description>
@@ -49,7 +46,6 @@
           target: build              
          ================================= -->
 	<target name="build" depends="download,gettext.patch,configure-default,build-default" description="Builds gettext">
-
 	</target>
 
 	<!-- - - - - - - - - - - - - - - - - - 
@@ -64,7 +60,4 @@
 			<arg value="${builddir}" />
 		</exec>
 	</target>
-
-
-
 </project>
diff --git a/android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ExtractorException.java b/android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ExtractorException.java
--- a/android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ExtractorException.java
+++ b/android/workspace/im.pidgin.libpurple.build/src/im/pidgin/libpurple/build/constants/ExtractorException.java
@@ -29,9 +29,4 @@
 		super(message, cause);
 	}
 
-	public ExtractorException(String message, Throwable cause,
-			boolean enableSuppression, boolean writableStackTrace) {
-		super(message, cause, enableSuppression, writableStackTrace);
-	}
-
 }
diff --git a/android/workspace/im.pidgin.libpurple/.project b/android/workspace/im.pidgin.libpurple/.project
--- a/android/workspace/im.pidgin.libpurple/.project
+++ b/android/workspace/im.pidgin.libpurple/.project
@@ -3,6 +3,7 @@
 	<name>im.pidgin.libpurple</name>
 	<comment></comment>
 	<projects>
+		<project>im.pidgin.libpurple.build</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
@@ -103,6 +104,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value><project>/.externalToolBuilders/deploy.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
diff --git a/android/workspace/im.pidgin.libpurple/native/build.ant b/android/workspace/im.pidgin.libpurple/native/build.ant
--- a/android/workspace/im.pidgin.libpurple/native/build.ant
+++ b/android/workspace/im.pidgin.libpurple/native/build.ant
@@ -25,7 +25,7 @@
 	<!-- ================================= 
           target: default              
          ================================= -->
-	<target name="build" depends="ant-contrib.load,extractconstants,headers.create,distribute" description="Builds the native functions that need to exists to interface libpurple with java.">
+	<target name="build" depends="ant-contrib.load,extractconstants,headers.create" description="Builds the native functions that need to exists to interface libpurple with java.">
 	</target>
 
 	<!-- - - - - - - - - - - - - - - - - - 

