/soc/2012/michael/android: cf0b33852da5: Added HAVE_SSL to purpl...

[Michael Zangl]

Changeset: cf0b33852da5b9106f43deef764c7e41d42c83c7
Author:	 Michael Zangl <michael at soc.pidgin.im>
Date:	 2012-07-25 13:16 +0200
Branch:	 soc.2012.android
URL: http://hg.pidgin.im/soc/2012/michael/android/rev/cf0b33852da5

Description:

Added HAVE_SSL to purple build file and fixed a bug where the updated purple.so was not copied.

diffstat:

 android/workspace/im.pidgin.libpurple.build/buildscripts/purple.ant       |  2 +-
 android/workspace/im.pidgin.libpurple/.externalToolBuilders/deploy.launch |  3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (29 lines):

diff --git a/android/workspace/im.pidgin.libpurple.build/buildscripts/purple.ant b/android/workspace/im.pidgin.libpurple.build/buildscripts/purple.ant
--- a/android/workspace/im.pidgin.libpurple.build/buildscripts/purple.ant
+++ b/android/workspace/im.pidgin.libpurple.build/buildscripts/purple.ant
@@ -35,7 +35,7 @@
 		--with-static-prpls="all"
 		--disable-schemas-install
 		noinst_PROGRAMS=""
-		CFLAGS="-I${libpurple.prefix}/include -I${libpurple.prefix}/include/libxml2 -DANDROID"
+		CFLAGS="-I${libpurple.prefix}/include -I${libpurple.prefix}/include/libxml2 -DANDROID -DHAVE_SSL"
 		LDFLAGS="-L${libpurple.prefix}/lib"
 		PKG_CONFIG_PATH="${libpurple.prefix}/lib/pkgconfig"
 		" />
diff --git a/android/workspace/im.pidgin.libpurple/.externalToolBuilders/deploy.launch b/android/workspace/im.pidgin.libpurple/.externalToolBuilders/deploy.launch
--- a/android/workspace/im.pidgin.libpurple/.externalToolBuilders/deploy.launch
+++ b/android/workspace/im.pidgin.libpurple/.externalToolBuilders/deploy.launch
@@ -2,11 +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/deploy" 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"/>
-<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/native" type="2"/>
</resources>}"/>
+<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/native" type="2"/>
<item path="/im.pidgin.libpurple.build/build/prefix" type="2"/>
</resources>}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/im.pidgin.libpurple/native/distribute.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"/>