[Mxquery-commit] SF.net SVN: mxquery:[4310] trunk/MXQuery

[<tim...@us...>]

Revision: 4310
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4310&view=rev
Author:   timchurch
Date:     2011-05-04 19:41:26 +0000 (Wed, 04 May 2011)

Log Message:
-----------
Updated ant build file to create jar file for android

Modified Paths:
--------------
    trunk/MXQuery/build.xml

Removed Paths:
-------------
    trunk/MXQuery/android/src/ch/ethz/mxquery/android/

Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml	2011-05-04 14:46:27 UTC (rev 4309)
+++ trunk/MXQuery/build.xml	2011-05-04 19:41:26 UTC (rev 4310)
@@ -1061,6 +1061,8 @@
     <!-- Android Build Target START-->
 
     <property name="android.dir" value="${root.dir}/android"/>
+	<property name="androidtmp.dir" value="${customtmp.dir}"/>
+	<property name="androidsrc.dir" value="${android.dir}/src"/>
 
     <!-- define "if" statement used below -->
     <taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -1072,13 +1074,114 @@
     <!-- import sdk.dir property if not on Jenkins -->
     <property file="${android.dir}/local.properties"/>
 
-    <if>
-        <isset property="sdk.dir"/>
-        <then>
-            <import file="${android.dir}/build-android.xml"/>
-        </then>
-    </if>
+	<!-- build Android version -->
+	<target name="android-prepare">
+	
+		<!-- merge branches -->
+		<echo message="Merging source trees"/>
+    	<delete>
+        	<fileset dir="${androidtmp.dir}/">
+            	<include name="**/*"/>
+        	</fileset>
+	    </delete>
+ 		<copy todir="${androidtmp.dir}">
+ 			<fileset dir="${src.dir}"/>
+ 		</copy>
+ 		<copy todir="${androidtmp.dir}" overwrite="yes">
+ 			<fileset dir="${androidsrc.dir}"/>
+ 		</copy>
+ 		
+ 		<!-- remove unsupported classes -->
+    	<echo message="Removing unsupported classes"/>
+    	<delete dir="${androidtmp.dir}/ch/ethz/mxquery/dmcq/"/>
+    	<delete>
+    		<fileset dir="${androidtmp.dir}/ch/ethz/mxquery/functions/fn/">
+    			<include name="NormalizeUnicode.java"/>
+    		</fileset>
+    	</delete>
+    	<delete>
+    		<fileset dir="${androidtmp.dir}/ch/ethz/mxquery/query/webservice/">
+    			<include name="MultipleXQueryServer.java"/>
+    			<include name="SingleXQueryServer.java"/>
+    			<include name="XSPMain.java"/>
+    		</fileset>
+    	</delete>
+    	<delete>
+    		<fileset dir="${androidtmp.dir}/ch/ethz/mxquery/util/">
+    			<include name="MultipleSchemaExposer.java"/>
+    			<include name="PerfTools.java"/>
+    			<include name="SingleSchemaExposer.java"/>
+    		</fileset>
+    	</delete>
+    	<delete>
+    		<fileset dir="${androidtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/">
+    			<include name="NonValidatingStaxAdapter.java"/>
+    			<include name="Token2StaxAdapter.java"/>
+    		</fileset>
+    	</delete>
+    	<delete>
+    		<fileset dir="${androidtmp.dir}/examples/">
+    			<include name="InputOutputExample.java"/>
+    			<include name="StreamStatsDemo.java"/>
+    			<include name="XQJExample.java"/>
+    		</fileset>
+    	</delete>
+	</target>
+	
+	<!-- Android-relevant libraries -->
+	<path id="android.lib.path">
+		<fileset dir="./lib">
+			<include name="**/*.jar" />
+		</fileset>
+		<fileset dir="${android.dir}/lib">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+		
+	<target name="compile-android" depends="clean,android-prepare">
+		<depend srcdir="${customtmp.dir}"
+		        destdir="${build.dir}"
+		        cache="depcache"
+		        closure="yes"
+		/>
 
+        <javac source="1.5"
+               srcdir="${customtmp.dir}"
+               destdir="${build.dir}"
+        	   target="1.5"
+               classpathref="project.class.path"
+               debug="${debug}"
+               optimize="${optimize}"
+               extdirs="">
+        	<classpath>
+                <path refid="android.lib.path" />
+            </classpath>
+        </javac>
+	</target>
+	
+	<target name="jar-android" depends="compile-android">
+			<echo message="Creating jar archive..."/>
+			<unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
+			<unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
+			<unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
+			 <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
+			<unjar src="${android.dir}/lib/jsr173_1.0_api-repackaged.jar" dest="${build.dir}"></unjar>
+			<unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
+			<unjar src="${android.dir}/lib/xqjapi-repackaged.jar" dest="${build.dir}"></unjar>
+			<unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
+			<jar jarfile="${dist.dir}/mxquery-android.jar">
+				<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
+				<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
+				<fileset dir="${src.dir}" includes="ch/**/*.xml"/>			
+				<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
+			    <manifest>
+			    	<attribute name="Built-By" value="Tim und Max"/>
+			    </manifest>
+			</jar>
+		</target>
+	
+		
+
     <!-- Android Build Target END -->
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.