soc.2012.android: 1100e87c: Build script updates, to fix some build ...

[michael at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 1100e87ce49857c1c2601822db719e5dde0d0d0a
Parent:   f104cf83b14b159ff205dfea79a0cddc75124cab
Author:   michael at soc.pidgin.im
Date:     06/09/12 05:54:37
Branch:   im.pidgin.soc.2012.android
URL: http://d.pidgin.im/viewmtn/revision/info/1100e87ce49857c1c2601822db719e5dde0d0d0a

Changelog: 

Build script updates, to fix some build issues.

Changes against parent f104cf83b14b159ff205dfea79a0cddc75124cab

  patched  android/workspace/im.pidgin.libpurple/.project
  patched  android/workspace/im.pidgin.libpurple/loadlibs.ant
  patched  android/workspace/im.pidgin.libpurple/native/CoreManager.c
  patched  android/workspace/im.pidgin.libpurple/native/helpers.c
  patched  android/workspace/im.pidgin.libpurple.testclient/.externalToolBuilders/Andorid build.launch
  patched  android/workspace/im.pidgin.libpurple.testclient/.project
  patched  android/workspace/im.pidgin.libpurple.testclient/src/im/pidgin/libpurple/testclient/PurpleTestClient.java

-------------- next part --------------
============================================================
--- android/workspace/im.pidgin.libpurple/.project	1a7549fd76216b82a23b06b256e3fd4c56e0df7e
+++ android/workspace/im.pidgin.libpurple/.project	c98e549547abeca157c10a02528edee50803c8a6
@@ -33,7 +33,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value></value>
+					<value>-j</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildCommand</key>
@@ -41,7 +41,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildLocation</key>
-					<value>${workspace_loc:/im.pidgin.libpurple/Android Debug}</value>
+					<value>${workspace_loc:/im.pidgin.libpurple/Android}</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
============================================================
--- android/workspace/im.pidgin.libpurple/loadlibs.ant	1ae8bf2d4b0f9ea157e65ea22b1f8048a105325a
+++ android/workspace/im.pidgin.libpurple/loadlibs.ant	dc0c53eb5473cb00de5c88661f4c4d1b9b3ea54a
@@ -26,6 +26,7 @@
 			<property name="libpurple.outlibdir" location="${libpurple.outproject}/libs/armeabi" />
 			<mkdir dir="${libpurple.outlibdir}" />
 
+			<echo>${libpurple.deploy}</echo>
 			<!-- do the copy -->
 			<copy todir="${libpurple.outlibdir}">
 				<fileset dir="${libpurple.deploy}">
============================================================
--- android/workspace/im.pidgin.libpurple.testclient/.externalToolBuilders/Andorid build.launch	02f0c27c9ce6ba71db8572603df2c90d7f49630f
+++ android/workspace/im.pidgin.libpurple.testclient/.externalToolBuilders/Andorid build.launch	c871065ef9079e29e1717e943c830a395c13bf67
@@ -2,10 +2,12 @@
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item path="/im.pidgin.libpurple.testclient/libs" type="2"/>
</resources>}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <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.testclient"/>
+<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/deploy" type="2"/>
</resources>}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/im.pidgin.libpurple.testclient/build.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"/>
============================================================
--- android/workspace/im.pidgin.libpurple.testclient/.project	cd2755b05e0ee996071ca3d7820c2900267dfa38
+++ android/workspace/im.pidgin.libpurple.testclient/.project	1441f5cf4c4f257ac08717ef79a32af7f8e5bb3c
@@ -7,28 +7,28 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value><project>/.externalToolBuilders/Andorid build.launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value><project>/.externalToolBuilders/Andorid build.launch</value>
-				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
============================================================
--- android/workspace/im.pidgin.libpurple.testclient/src/im/pidgin/libpurple/testclient/PurpleTestClient.java	1f1cc746bf002a3c2f388fcbb405a2616cddab40
+++ android/workspace/im.pidgin.libpurple.testclient/src/im/pidgin/libpurple/testclient/PurpleTestClient.java	fffbc588904203de5b8f912b98a86072c24579d5
@@ -11,7 +11,7 @@ public class PurpleTestClient extends Ac
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
-        
+   
         TextView text = (TextView) findViewById(R.id.main_text);
         
         text.setText("Purple Version: " + PurpleInstance.createInstance("testclient", getFilesDir()).getVersion());
============================================================
--- android/workspace/im.pidgin.libpurple/native/helpers.c	0fad24fe2b49a81da5d993f14c7504152f01cea3
+++ android/workspace/im.pidgin.libpurple/native/helpers.c	0c0df1819a5cc9d897d0324515e88032ae76ec73
@@ -67,5 +67,5 @@ getMethodIDCachedReferenced(JNIEnv *env,
 		cache->mid = (*env)->GetMethodID(env, class, cache->name,
 				cache->signature);
 	}
-	return cache->mid;
+	return NULL;//cache->mid;
 }
============================================================
--- android/workspace/im.pidgin.libpurple/native/CoreManager.c	409e090faa2bc21553d49a8f68b867ff7987e0dd
+++ android/workspace/im.pidgin.libpurple/native/CoreManager.c	7d76039d84d0731087a4ebd4493cec0407a1becd
@@ -9,6 +9,7 @@
 #include <libpurple/plugin.h>
 #include <libpurple/blist.h>
 #include <libpurple/pounce.h>
+#include <android/log.h>
 
 #include "CoreManager.h"
 #include "EventLoop.h"
@@ -53,6 +54,7 @@ initUi()
 	jboolean success;
 	const char* uiNameNative;
 
+	__android_log_print(ANDROID_LOG_WARN, "jni", "starting");
 	setJavaObject(&coreManagerInstance, env, obj);
 
 	purple_core_set_ui_ops(&coreUiOps);