harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r997267 - in /harmony/enhanced/java/trunk: ./ classlib/modules/luni/ classlib/modules/luni/src/main/native/include/ drlvm/ ibm-v4/ ibm-v4/include/
Date Wed, 15 Sep 2010 10:33:46 GMT
Author: hindessm
Date: Wed Sep 15 10:33:45 2010
New Revision: 997267

URL: http://svn.apache.org/viewvc?rev=997267&view=rev
Log:
Build against one set of jvmti/jni headers rather than two.  Move the
headers so they are taken from the VM.

Added:
    harmony/enhanced/java/trunk/ibm-v4/include/
    harmony/enhanced/java/trunk/ibm-v4/include/jni.h
      - copied unchanged from r996832, harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/include/jni.h
    harmony/enhanced/java/trunk/ibm-v4/include/jni_types.h
      - copied unchanged from r996832, harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/include/jni_types.h
    harmony/enhanced/java/trunk/ibm-v4/include/jvmti.h
      - copied unchanged from r996832, harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/include/jvmti.h
    harmony/enhanced/java/trunk/ibm-v4/include/jvmti_types.h
      - copied unchanged from r996832, harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/include/jvmti_types.h
Removed:
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/include/jni.h
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/include/jni_types.h
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/include/jvmti.h
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/include/jvmti_types.h
Modified:
    harmony/enhanced/java/trunk/build.xml
    harmony/enhanced/java/trunk/classlib/modules/luni/build.xml
    harmony/enhanced/java/trunk/drlvm/build.xml
    harmony/enhanced/java/trunk/ibm-v4/build.xml

Modified: harmony/enhanced/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/build.xml?rev=997267&r1=997266&r2=997267&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/build.xml (original)
+++ harmony/enhanced/java/trunk/build.xml Wed Sep 15 10:33:45 2010
@@ -463,7 +463,7 @@ Usage:
     </propertyset>
     
     <target name="build-classlib"
-            depends="init,-build-classlib,assemble-hdk-doc"/>
+            depends="init,-init-hdk,-build-classlib,assemble-hdk-doc"/>
     <target name="-build-classlib" depends="auto-fetch-classlib-libs">
         <ant antfile="classlib/build.xml" target="build" inheritAll="false" >
             <propertyset refid="required.props" />
@@ -525,6 +525,15 @@ Usage:
         </ant>
     </target>
 
+    <target name="-init-hdk">
+        <ant antfile="${vm.dir.loc}/build.xml"
+             target="-init-hdk" inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="svn.info" value="${harmony.long.version}"/>
+            <property name="svn.revision" value="${harmony.version}"/>
+        </ant>
+    </target>
+
     <!-- ============================================================== -->
     <!-- ensures that dependencies are up to date and then builds a vm  -->
     <!-- ============================================================== -->
@@ -582,7 +591,7 @@ Usage:
     <!-- ensures dependencies are up to date, then builds jdktools      -->
     <!-- ============================================================== -->
     <target name="build-jdktools"
-            depends="init,auto-fetch-jdktools-libs">
+            depends="init,-init-hdk,auto-fetch-jdktools-libs">
         <ant antfile="jdktools/build.xml" target="build" inheritall="false" >
             <propertyset refid="required.props" />
             <property name="common.resources" location="common_resources" />

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/build.xml?rev=997267&r1=997266&r2=997267&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/build.xml Wed Sep 15 10:33:45 2010
@@ -53,14 +53,6 @@
                 <include name="vmizip.h"/>
             </fileset>
         </copy>
-        <copy todir="${hy.jdk}/include" preservelastmodified="true">
-            <fileset dir="src/main/native/include">
-                <include name="jni.h" />
-                <include name="jni_types.h" />
-                <include name="jvmti.h" />
-                <include name="jvmti_types.h" />
-            </fileset>
-        </copy>
     </target>
 
     <!-- Build native code -->
@@ -211,14 +203,6 @@
                 <include name="hymagic.h" />
             </fileset>
         </delete>
-        <delete failonerror="false">
-            <fileset dir="${hy.jdk}/include">
-                <include name="jni.h" />
-                <include name="jni_types.h" />
-                <include name="jvmti.h" />
-                <include name="jvmti_types.h" />
-            </fileset>
-        </delete>
     </target>
 
     <!-- Clean overlaid OSS packages -->

Modified: harmony/enhanced/java/trunk/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/build.xml?rev=997267&r1=997266&r2=997267&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/build.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/build.xml Wed Sep 15 10:33:45 2010
@@ -170,6 +170,16 @@ Usage:
         <ant antfile="make/vm/gc_gen.xml"/>
     </target>
 
+    <target name="-init-hdk">
+        <copy todir="${hy.hdk}/jdk/include">
+            <fileset dir="vm/include">
+                <include name="jvmti.h" />
+                <include name="jvmti_types.h" />
+                <include name="jni.h" />
+                <include name="jni_types.h" />
+            </fileset>
+        </copy>
+    </target>
 
     <!-- ================================================================
             import the deploy stuff from hdk / classlib

Modified: harmony/enhanced/java/trunk/ibm-v4/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/ibm-v4/build.xml?rev=997267&r1=997266&r2=997267&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/ibm-v4/build.xml (original)
+++ harmony/enhanced/java/trunk/ibm-v4/build.xml Wed Sep 15 10:33:45 2010
@@ -43,6 +43,17 @@
 
     <property name="ibm.vme.dir" value="${hy.os}-${hy.arch}.vme" />
 
+    <target name="-init-hdk">
+        <copy todir="${hy.hdk}/jdk/include">
+            <fileset dir="include">
+                <include name="jvmti.h" />
+                <include name="jvmti_types.h" />
+                <include name="jni.h" />
+                <include name="jni_types.h" />
+            </fileset>
+        </copy>
+    </target>
+
     <target name="build">
         <mkdir dir="${hy.hdk}/jdk" />
         <copy todir="${hy.hdk}/jdk">



Mime
View raw message