From 57dfc22ded974c379d93732056db877e43770526 Mon Sep 17 00:00:00 2001
From: Stella Laurenzo <stella@laurenzo.org>
Date: Tue, 21 Jun 2011 11:10:18 -0700
Subject: [PATCH] Integrate native build with ant

---
 build.xml              | 39 +++++++++++++++++++++++++++++++++++++--
 csrc/Makefile.osx      |  6 +++---
 src/mapnik/Mapnik.java |  2 +-
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 0dc8d5d..9f58d99 100644
--- a/build.xml
+++ b/build.xml
@@ -1,12 +1,47 @@
-<project name="mapnik_jni" default="jar">
+<project name="mapnik_jni" default="all">
 	<target name="compile">
 		<mkdir dir="build/classes"/>
 		<mkdir dir="csrc"/>
 		<javac srcdir="src" destdir="build/classes" debug="on" source="1.5" target="1.5" includeantruntime="false"/>
+	</target>
+	
+	<target name="headers" depends="compile">
 		<javah class="mapnik.Parameters,mapnik.Mapnik,mapnik.Map,mapnik.Layer,mapnik.FeatureTypeStyle,mapnik.Datasource,mapnik.DatasourceCache,mapnik.Projection,mapnik.Query,mapnik.FeatureSet,mapnik.Geometry" outputfile="csrc/mapnikjni.h" classpath="build/classes"/>
 	</target>
 	
 	<target name="jar" depends="compile">
-		<jar jarfile="build/mapnik_jni.jar" basedir="build/classes"/>
+		<mkdir dir="build/dist"/>
+		<jar jarfile="build/dist/mapnik-jni.jar" basedir="build/classes"/>
+	</target>
+	
+	<target name="clean">
+		<delete dir="build"/>
+		<delete dir="csrc">
+			<include name="*.jnilib"/>
+			<include name="*.so"/>
+			<include name="*.dll"/>
+		</delete>
 	</target>
+	
+	<target name="native-init">
+		<condition property="platform.osx">
+			<os family="mac"/>
+		</condition>
+	</target>
+	<target name="native-osx" if="platform.osx">
+		<exec dir="csrc" executable="make" failonerror="true">
+			<arg value="-f"/>
+			<arg value="Makefile.osx"/>
+		</exec>
+		<mkdir dir="build/dist"/>
+		<copy todir="build/dist">
+			<fileset dir="csrc">
+				<include name="*.jnilib"/>
+			</fileset>
+		</copy>
+	</target>
+	<target name="native" depends="native-init,native-osx"/>
+	
+	<target name="all" depends="jar,native"/>
+	<target name="dist" depends="clean,all"/>
 </project>
\ No newline at end of file
diff --git a/csrc/Makefile.osx b/csrc/Makefile.osx
index 45c47ac..28d3624 100644
--- a/csrc/Makefile.osx
+++ b/csrc/Makefile.osx
@@ -1,5 +1,5 @@
-libmapnik_jni.jnilib: mapnikjni.cpp mapnikjni.h
-	g++ -dynamiclib -o libmapnik_jni.jnilib \
+libmapnik-jni.jnilib: mapnikjni.cpp mapnikjni.h
+	g++ -dynamiclib -o libmapnik-jni.jnilib \
 		-I/usr/X11/include \
 		-I/usr/X11/include/freetype2 \
 		-I/System/Library/Frameworks/JavaVM.framework/Headers \
@@ -7,5 +7,5 @@ libmapnik_jni.jnilib: mapnikjni.cpp mapnikjni.h
 		-lmapnik2 -framework JavaVM
 	
 clean:
-	rm libmapnik_jni.jnilib
+	rm libmapnik-jni.jnilib
 	
diff --git a/src/mapnik/Mapnik.java b/src/mapnik/Mapnik.java
index 490c269..b62d51f 100644
--- a/src/mapnik/Mapnik.java
+++ b/src/mapnik/Mapnik.java
@@ -8,7 +8,7 @@ public class Mapnik {
 	public synchronized static void initialize() {
 		if (initialized) return;
 		try {
-			System.loadLibrary("mapnik_jni");
+			System.loadLibrary("mapnik-jni");
 		} finally {
 			nativeInit();
 			initialized=true;