X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=build-template.xml;h=c0089e955f8cac06a459df3a267cf1913c271bb0;hb=388326445947f44a11a57d2daf2fd7d08b1463eb;hp=88abf025a63093153b11fc2f7713f4c8db323e02;hpb=a6a27eb6f7fedc3421e3ea42ca8ea3dddfc9df0f;p=mikumikustudio%2Flibgdx-mikumikustudio.git

diff --git a/build-template.xml b/build-template.xml
index 88abf025a..c0089e955 100644
--- a/build-template.xml
+++ b/build-template.xml
@@ -11,35 +11,26 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
 -->
 <project name="template" default="all" basedir=".">
 	<!-- default values -->
-	<property name="src" value="src"/>
+	<path id="src">
+		<pathelement location="src"/>
+	</path>
+	<path id="classpath"/>
 	<property name="jni" value="jni"/>
 	<property name="target" value="target" />
 	<property name="libs" value="libs" />
-	<path id="classpath"/>
 	<zipfileset id="jarfiles" dir="." excludes="**"/>
+	<fileset id="resourcefiles" dir="." excludes="**"/>
 	
-	<!-- clean output directories -->	
+	<!-- clean output directories, create libs directory -->	
 	<target name="clean">		
+		<mkdir dir="${libs}" />
 		<delete dir="${target}" />
 	</target>
 
 	<!-- init task, creates all necessary directories -->
-	<target name="init" depends="clean">
-		<mkdir dir="${libs}/android32" />
-		<mkdir dir="${libs}/armeabi" />
-		<mkdir dir="${libs}/armeabi-v7a" />
-		<mkdir dir="${libs}/linux32" />
-		<mkdir dir="${libs}/linux64" />
-		<mkdir dir="${libs}/macosx32" />
-		<mkdir dir="${libs}/windows32" />
-		<mkdir dir="${libs}/windows64" />
-		<mkdir dir="${libs}/ios32"/>
-		
+	<target name="init" depends="clean">		
 		<mkdir dir="${target}" />
 		<mkdir dir="${target}/java" />
-		<!-- need to copy the internal font to target if compiling the gdx core :/ -->
-		<copy failonerror="false" tofile="${target}/java/com/badlogic/gdx/utils/arial-15.png" file="src/com/badlogic/gdx/utils/arial-15.png" />
-		<copy failonerror="false" tofile="${target}/java/com/badlogic/gdx/utils/arial-15.fnt" file="src/com/badlogic/gdx/utils/arial-15.fnt" />
 		<!-- need to copy jni headers for gdx-jnigen -->
 		<copy failonerror="false" todir="${target}/java">
 			<fileset dir="src">
@@ -56,7 +47,10 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
 
 	<!-- compiles the java code -->
 	<target name="compile" depends="init">
-		<javac debug="on" encoding="utf-8" source="1.6" target="1.6" srcdir="${src}" destdir="${target}/java">
+		<javac debug="on" encoding="utf-8" source="1.6" target="1.6" destdir="${target}/java" includeantruntime="false">
+			<src>
+				<path refid="src"/>
+			</src>
 			<classpath>
 				<path refid="classpath"/>
 				<fileset file="${libs}/*.jar">
@@ -77,28 +71,30 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
 			</and>
 		</condition>
 	</target>
+	
 	<target name="compile-natives" depends="init, check-natives" if="natives-present">
+		<mkdir dir="${libs}/android32" />
+		<mkdir dir="${libs}/armeabi" />
+		<mkdir dir="${libs}/armeabi-v7a" />
+        <mkdir dir="${libs}/x86" />
+		<mkdir dir="${libs}/linux32" />
+		<mkdir dir="${libs}/linux64" />
+		<mkdir dir="${libs}/macosx32" />
+		<mkdir dir="${libs}/windows32" />
+		<mkdir dir="${libs}/windows64" />
+		<mkdir dir="${libs}/ios32"/>
 		<echo message="compiling natives code"/>
 		<ant antfile="build.xml" target="clean" dir="${jni}"/>
 		<ant antfile="build.xml" target="all" dir="${jni}"/>
-		<!-- copy shared libs for android -->
-		<copy failonerror="false" todir="${distDir}/armeabi">
-			<fileset dir="${libs}/armeabi">
-				<include name="**/*.so"/>
-			</fileset>
-		</copy>
-		<copy failonerror="false" todir="${distDir}/armeabi-v7a">
-			<fileset dir="${libs}/armeabi-v7a">
-				<include name="**/*.so"/>
-			</fileset>
-		</copy>
 	</target>
 	
 	<!-- create source and class jar -->
 	<target name="all" depends="compile,compile-natives">
 		<!-- source jar -->
 		<mkdir dir="${distDir}/sources" />
-		<jar destfile="${distDir}/sources/${jar}-sources.jar" basedir="${src}" />
+		
+		<!-- FIXME doesn't work for bullet, as this only takes the src/ folder -->
+		<jar destfile="${distDir}/sources/${jar}-sources.jar" basedir="src"/>			
 		
 		<!-- copy shared libs for desktop -->
 		<copy failonerror="false" todir="${distDir}">
@@ -108,7 +104,7 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
 			</fileset>
 		</copy>
 		
-		<!-- copy shared libs for android -->
+		<!-- copy shared libs for android & ios -->
 		<copy failonerror="false" todir="${distDir}/armeabi">
 			<fileset dir="${libs}/armeabi">
 				<include name="**/*.so"/>
@@ -119,15 +115,27 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
 				<include name="**/*.so"/>
 			</fileset>
 		</copy>
+        <copy failonerror="false" todir="${distDir}/x86">
+			<fileset dir="${libs}/x86">
+				<include name="**/*.so"/>
+			</fileset>
+		</copy>
+        <copy failonerror="false" todir="${distDir}/ios">
+			<fileset dir="${libs}/ios32">
+				<include name="**/*.a"/>
+			</fileset>
+		</copy>
 		
 		<!-- class jar -->
 		<jar destfile="${distDir}/${jar}.jar">
 			<fileset dir="${target}/java"/>
+			<fileset refid="resourcefiles"/>
 			<!-- merge dependencies found in libs/ folder, exclude native, debug and android/gwt jars -->
 			<zipgroupfileset file="${libs}/*.jar">
 				<exclude name="*-natives.jar"/>
 				<exclude name="*-debug.jar"/>
 				<exclude name="android-*.jar"/>
+                <exclude name="robovm-*.jar"/>
 				<exclude name="gwt*.jar"/>
 			</zipgroupfileset>
 			<!-- merge dependencies specified in parent build.xml -->