You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/06/15 16:54:10 UTC
svn commit: r414600 - in
/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra:
harmony39.xml harmony39/ harmony88.xml harmony88/ hello.xml icu4c.xml
Author: geirm
Date: Thu Jun 15 07:54:10 2006
New Revision: 414600
URL: http://svn.apache.org/viewvc?rev=414600&view=rev
Log:
changes that bring DRLVM working with the current
classlib "in situ"
(partial commit - I'm going slowly here...)
Removed:
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/harmony39/
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/harmony39.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/harmony88/
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/harmony88.xml
Modified:
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/hello.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/icu4c.xml
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/hello.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/hello.xml?rev=414600&r1=414599&r2=414600&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/hello.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/hello.xml Thu Jun 15 07:54:10 2006
@@ -27,7 +27,7 @@
<project name="extra.hello">
<target name="init" >
- <property name="build.java.depends" value="vm.kernel_classes,classlib.luni" />
+ <property name="build.java.depends" value="vm.kernel_classes" />
<mkdir dir="${build.dir}/_other" />
@@ -57,7 +57,8 @@
<path id="java.class.path">
<fileset dir="${vm.kernel_classes.jardir}" includes="${vm.kernel_classes.jarname}" />
- <fileset dir="${classlib.luni.jardir}" includes="${classlib.luni.jarname}" />
+
+ <fileset dir="${external.dep.CLASSLIB.jardir}" includes="*.jar" />
</path>
</target>
</project>
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/icu4c.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/icu4c.xml?rev=414600&r1=414599&r2=414600&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/icu4c.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/icu4c.xml Thu Jun 15 07:54:10 2006
@@ -27,34 +27,27 @@
<project name="extra.icu4c">
<target name="init">
- <property name="jarname" value="icu4j_3_4.jar,icu4jni-3.4.jar" />
+ <property name="jarname" value="icu4j-3.4.jar,icu4jni-3.4.jar" />
<property name="libname" value="icuuc"/>
<property name="libdir" value="${build.dir}/_bin"/>
<property name="jardir" value="${build.dir}/_jar"/>
- <select os="win">
- <property name="from.dir"
- location="${build.CLASSLIB.home}/depends/oss/win.IA32" />
- </select>
-
- <select os="lnx">
- <property name="from.dir"
- location="${build.CLASSLIB.home}/depends/oss/linux.IA32" />
- </select>
+ <property name="from.dir"
+ location="${build.CLASSLIB.home}/depends/oss" />
<dependset>
<srcfileset dir="${from.dir}" includes="icu4c-3.4-harmony.zip" />
- <targetfileset dir="${jardir}" includes="icu4j_3_4.jar" />
+ <targetfileset dir="${jardir}" includes="icu4j-3.4.jar" />
</dependset>
<if>
<not>
- <available file="${jardir}/icu4j_3_4.jar"/>
+ <available file="${jardir}/icu4j-3.4.jar"/>
</not>
<then>
- <unzip src="${from.dir}/icu4c-3.4-harmony.zip" dest="${build.dir}" />
+ <unzip src="${from.dir}/icu4c-3.4-harmony.zip" dest="${build.dir}/unicode" />
- <copy file="${build.CLASSLIB.home}/depends/jars/icu4j_3_4.jar"
+ <copy file="${build.CLASSLIB.home}/modules/text/depends/icu4j/icu4j-3.4.jar"
todir="${jardir}" />
<copy file="${build.CLASSLIB.home}/depends/jars/icu4jni-3.4.jar"
@@ -66,20 +59,26 @@
<copy todir="${libdir}">
<fileset dir="${build.CLASSLIB.home}/depends/libs/win.IA32" includes="icu*,ICU*"/>
</copy>
+
+ <move todir="${build.dir}/_bin">
+ <fileset dir="${build.dir}/unicode">
+ <include name="icuuc.lib"/>
+ </fileset>
+ </move>
</select>
<select os="lnx">
<copy todir="${libdir}">
<fileset dir="${build.CLASSLIB.home}/depends/libs/linux.IA32" includes="libicu*,libICU*"/>
</copy>
- </select>
- <move todir="${build.dir}/_bin">
- <fileset dir="${build.dir}/text">
- <include name="*"/>
- </fileset>
- </move>
+ <move todir="${build.dir}/_bin">
+ <fileset dir="${build.dir}/unicode">
+ <include name="libicuuc.so*"/>
+ </fileset>
+ </move>
+ </select>
- <property name="includes" value="${build.dir}/include" />
+ <property name="includes" value="${build.dir}" />
</target>
-</project>
+</project>
\ No newline at end of file