File lejos_nxj-build-java9.patch of Package lejos_nxj

Overview Repositories Revisions Requests Users Attributes Meta

File lejos_nxj-build-java9.patch of Package lejos_nxj (Revision 98bb615b6dd30204fe57dae4f19bcb1f)

Currently displaying revision 98bb615b6dd30204fe57dae4f19bcb1f , Show latest

diff -ruN leJOS_NXJ_0.9.1beta-3_source.orig/libnxt/build.xml leJOS_NXJ_0.9.1beta-3_source/libnxt/build.xml
--- leJOS_NXJ_0.9.1beta-3_source.orig/libnxt/build.xml	2012-05-29 00:13:58.000000000 +0200
+++ leJOS_NXJ_0.9.1beta-3_source/libnxt/build.xml	2012-07-11 11:29:55.746681715 +0200
@@ -1,18 +1,49 @@
 
 
 <project name="libnxt" default="make" basedir=".">
-	
 	<taskdef resource="cpptasks.tasks">
 	  <classpath>
-	    <pathelement location="../release/lejos_nxj/3rdparty/lib/cpptasks.jar"/>
+	    <pathelement location="../release/lejos_nxj/build/cpptasks.jar"/>
 	  </classpath>
 	</taskdef>
 	<typedef resource="cpptasks.types">
 	  <classpath>
-	    <pathelement location="../release/lejos_nxj/3rdparty/lib/cpptasks.jar"/>
+	    <pathelement location="../release/lejos_nxj/build/cpptasks.jar"/>
 	  </classpath>
 	</typedef>
-	-->
+	
+	<condition property="jni.include.dir" value="${java.home}/include">
+		<or>
+			<os name="Linux"/>
+			<os family="windows"/>
+			<os name="SunOS"/>
+		</or>
+	</condition>
+	<condition property="jni.include.dir" value="/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/">
+		<and>
+			<os family="mac"/>
+			<matches pattern="^10\.5.*" string="${os.version}"/>
+		</and>
+	</condition>
+	<condition property="jni.include.dir" value="/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/">
+		<and>
+			<os family="mac"/>
+			<matches pattern="^10\.4.*" string="${os.version}"/>
+		</and>
+	</condition>
+	<fail unless="jni.include.dir">OS not recognized</fail>
+	
+	<condition property="jni.sys.dir" value="${jni.include.dir}/linux">
+		<os name="Linux"/>
+	</condition>
+	<condition property="jni.sys.dir" value="${jni.include.dir}/win32">
+	    <os family="windows"/>
+	</condition>
+	<condition property="jni.sys.dir" value="${jni.include.dir}/solaris">
+	    <os name="SunOS"/>
+	</condition>
+	<fail unless="jni.sys.dir">OS not recognized</fail>
 	
 	
 	<target name="clean" description="cleans all compilation artifacts">

Places

File lejos_nxj-build-java9.patch of Package lejos_nxj (Revision 98bb615b6dd30204fe57dae4f19bcb1f)

Places