You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/09/15 13:53:46 UTC
svn commit: r997294 - in /harmony/enhanced/java/branches/java6: ./ classlib/
classlib/depends/libs/ classlib/modules/luni/
classlib/modules/luni/src/main/native/include/ drlvm/ ibm-v4/
ibm-v4/include/ jdktools/
Author: hindessm
Date: Wed Sep 15 11:53:45 2010
New Revision: 997294
URL: http://svn.apache.org/viewvc?rev=997294&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@997267:
r997267 | hindessm | 2010-09-15 11:33:45 +0100 (Wed, 15 Sep 2010) | 3 lines
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/branches/java6/ibm-v4/include/
- copied from r997267, harmony/enhanced/java/trunk/ibm-v4/include/
harmony/enhanced/java/branches/java6/ibm-v4/include/jni.h
- copied unchanged from r997267, harmony/enhanced/java/trunk/ibm-v4/include/jni.h
harmony/enhanced/java/branches/java6/ibm-v4/include/jni_types.h
- copied unchanged from r997267, harmony/enhanced/java/trunk/ibm-v4/include/jni_types.h
harmony/enhanced/java/branches/java6/ibm-v4/include/jvmti.h
- copied unchanged from r997267, harmony/enhanced/java/trunk/ibm-v4/include/jvmti.h
harmony/enhanced/java/branches/java6/ibm-v4/include/jvmti_types.h
- copied unchanged from r997267, harmony/enhanced/java/trunk/ibm-v4/include/jvmti_types.h
Removed:
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/include/jni.h
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/include/jni_types.h
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/include/jvmti.h
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/include/jvmti_types.h
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/build.xml
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/drlvm/build.xml
harmony/enhanced/java/branches/java6/ibm-v4/build.xml
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 11:53:45 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212
+/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212,997267
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Modified: harmony/enhanced/java/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/build.xml?rev=997294&r1=997293&r2=997294&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/build.xml (original)
+++ harmony/enhanced/java/branches/java6/build.xml Wed Sep 15 11:53: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" />
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 11:53:45 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212
+/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212,997267
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 11:53:45 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212,997267
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml?rev=997294&r1=997293&r2=997294&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml Wed Sep 15 11:53: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 -->
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 11:53:45 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212
+/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212,997267
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Modified: harmony/enhanced/java/branches/java6/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/build.xml?rev=997294&r1=997293&r2=997294&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/build.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/build.xml Wed Sep 15 11:53: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/branches/java6/ibm-v4/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/ibm-v4/build.xml?rev=997294&r1=997293&r2=997294&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/ibm-v4/build.xml (original)
+++ harmony/enhanced/java/branches/java6/ibm-v4/build.xml Wed Sep 15 11:53: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">
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 11:53:45 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212
+/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996,997081,997093,997116,997212,997267
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147