harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r371541 - /incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml
Date Mon, 23 Jan 2006 14:12:52 GMT
Author: geirm
Date: Mon Jan 23 06:12:51 2006
New Revision: 371541

URL: http://svn.apache.org/viewcvs?rev=371541&view=rev
Log:
Tweak to use our own jni.h rather than that of the building JDK.  I hope this fixes a problem
privately reported by George - please test on Win32



Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml?rev=371541&r1=371540&r2=371541&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml Mon Jan 23
06:12:51 2006
@@ -150,36 +150,42 @@
     <target name="init.java_home">
 
         <property name="JAVA_HOME" value="${env.JAVA_HOME}" />
-        <property name="jni_h.path"    location="${env.JAVA_HOME}/include"/>
+<!--        <property name="jni_h.path"    location="${env.JAVA_HOME}/include"/>
-->
         <echo message="JAVA_HOME=${JAVA_HOME}"/>
 
     </target>
 
     <target name="init.win" depends="init, init.java_home" if="if.win">
-        <property name="cPath" value="${PATH};${env.Path}" />
-        <property name="cINCLUDE" value="${INCLUDE};${env.include};${env.INCLUDE}" />
+    	
+    	<property name="native.include.path" value="../../native-src/win.IA32/include" />
+
+    	<property name="cPath" value="${PATH};${env.Path}" />
+        <property name="cINCLUDE" value="${INCLUDE};${env.include};${env.INCLUDE};${native.include.path}"
/>
         <property name="cLIB" value="${LIB};${env.lib};${env.LIB}" />
         <property name="src.java" value="${src.win.java}" />
         <property name="compile.native.tail" value="windows" />
 
         <property name="src.tst.common.ps" value="${src.tst}/windows" />
 
-        <property name="jni_md_h.path" location="${env.JAVA_HOME}/include/win32"/>
+        <property name="jni_h.path"    location="${native.include.path}"/>
+        <property name="jni_md_h.path" location="${native.include.path}"/>
 
     </target>
 
     
     <target name="init.linux" depends="init, init.java_home" if="if.linux">
 
+       	<property name="native.include.path" value="../../native-src/linux.IA32/include"
/>
+
         <property name="cPath" value="${env.PATH}" />
-        <property name="cINCLUDE" value="${env.INCLUDE}" />
+        <property name="cINCLUDE" value="${env.INCLUDE};${native.include.path}" />
         <property name="cLIB" value="${env.LIB}" />
         <property name="src.java" value="${src.linux.java}" />
         <property name="compile.native.tail" value="linux" />
 
         <property name="src.tst.common.ps" value="${src.tst}/linux" />
 
-        <property name="jni_md_h.path" location="${env.JAVA_HOME}/include/linux"/>
+        <property name="jni_md_h.path" location="${native.include.path}"/>
 
     </target>
 



Mime
View raw message