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 2008/01/17 20:34:58 UTC
svn commit: r612947 - in /harmony/enhanced:
classlib/trunk/depends/libs/freebsd.x86/
classlib/trunk/depends/libs/linux.ia64/
classlib/trunk/depends/libs/linux.ppc32/
classlib/trunk/depends/libs/linux.ppc64/
classlib/trunk/depends/libs/linux.x86.libstdc...
Author: hindessm
Date: Thu Jan 17 11:34:56 2008
New Revision: 612947
URL: http://svn.apache.org/viewvc?rev=612947&view=rev
Log:
Remove icu dlls and download them from svn standard tree at fetch-depends
stage. This should reduce the size of the initial checkout and workspace
for most people. I've added platform specific depends.properties files
I suspect that these could be useful to simplify some of the existing
depends.xml complexity (such as the "-select-win-deps-x86", etc targets).
This is work in progress. There are a couple more things I want to do
but I thought I check this in to see if anything breaks.
Added:
harmony/enhanced/classlib/trunk/make/freebsd.x86/
harmony/enhanced/classlib/trunk/make/freebsd.x86/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/linux.ia64/
harmony/enhanced/classlib/trunk/make/linux.ia64/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/linux.ppc32/
harmony/enhanced/classlib/trunk/make/linux.ppc32/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/linux.ppc64/
harmony/enhanced/classlib/trunk/make/linux.ppc64/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/linux.x86/
harmony/enhanced/classlib/trunk/make/linux.x86.libstdc++6/
harmony/enhanced/classlib/trunk/make/linux.x86.libstdc++6/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/linux.x86/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/linux.x86_64/
harmony/enhanced/classlib/trunk/make/linux.x86_64/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/macosx.ppc32/
harmony/enhanced/classlib/trunk/make/macosx.ppc32/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/windows.x86/
harmony/enhanced/classlib/trunk/make/windows.x86/depends.properties (with props)
harmony/enhanced/classlib/trunk/make/windows.x86_64/
harmony/enhanced/classlib/trunk/make/windows.x86_64/depends.properties (with props)
Removed:
harmony/enhanced/classlib/trunk/depends/libs/freebsd.x86/
harmony/enhanced/classlib/trunk/depends/libs/linux.ia64/
harmony/enhanced/classlib/trunk/depends/libs/linux.ppc32/
harmony/enhanced/classlib/trunk/depends/libs/linux.ppc64/
harmony/enhanced/classlib/trunk/depends/libs/linux.x86/
harmony/enhanced/classlib/trunk/depends/libs/linux.x86.libstdc++6/
harmony/enhanced/classlib/trunk/depends/libs/linux.x86_64/
harmony/enhanced/classlib/trunk/depends/libs/macosx.ppc32/
harmony/enhanced/classlib/trunk/depends/libs/windows.x86/
harmony/enhanced/classlib/trunk/depends/libs/windows.x86_64/
Modified:
harmony/enhanced/classlib/trunk/make/build-native.xml
harmony/enhanced/classlib/trunk/make/depends.properties
harmony/enhanced/classlib/trunk/make/depends.xml
harmony/enhanced/classlib/trunk/make/properties.xml
harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
Modified: harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-native.xml?rev=612947&r1=612946&r2=612947&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Thu Jan 17 11:34:56 2008
@@ -125,7 +125,7 @@
<!-- Copy across dependency shared libs -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${depends.libs}${hy.libstdc++.suffix}" includes="*${shlib.suffix}*" />
+ <fileset dir="${icudll.dir}" includes="*${shlib.suffix}*" />
</copy>
</target>
Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=612947&r1=612946&r2=612947&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Thu Jan 17 11:34:56 2008
@@ -140,4 +140,7 @@
derby.url=http://www.ibiblio.org/maven/org.apache.derby/jars/derby-10.3.1.4.jar
derby.md5=f28d6047ab26445de53c4c96126494df
-
+depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
+icudll.dir=${depends.dir}/libs/${hy.platform.variant}/icu-3.4
+icudll.zip=${depends.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
+icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=612947&r1=612946&r2=612947&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Thu Jan 17 11:34:56 2008
@@ -26,6 +26,7 @@
</description>
<import file="${basedir}/make/properties.xml" />
+ <property file="make/${hy.platform.variant}/depends.properties" />
<property file="make/depends.properties" />
<target name="check" description="Check whether dependencies are available"
@@ -47,6 +48,7 @@
<check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" />
<check-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}" />
<check-one-file src="${derby.url}" dest="${derby.jar}" />
+ <check-one-file src="${icudll.url}" dest="${icudll.zip}" />
</target>
<target name="-check-win" if="is.windows" depends="-really-check-win" />
@@ -106,7 +108,7 @@
</target>
<target name="-extract"
- depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-idea-from-bcprov" />
+ depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-idea-from-bcprov,-extract-icudlls" />
<target name="-extract-props">
<uptodate property="dejavu-fonts.uptodate"
@@ -124,6 +126,9 @@
<srcfiles dir="depends/files/bcprov"
includes="**/IDEAEngine.class" />
</uptodate>
+ <uptodate property="icudlls.uptodate"
+ srcfile="${icudll.zip}"
+ targetfile="${icudll.dir}/uptodate" />
</target>
@@ -182,6 +187,11 @@
</zip>
</target>
+ <target name="-extract-icudlls" unless="icudlls.uptodate">
+ <unzip src="${icudll.zip}" dest="${icudll.dir}" />
+ <touch file="${icudll.dir}/uptodate" />
+ </target>
+
<!--
* FIXME : the following awful little hack is because we noticed that for whatever
* reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
@@ -410,6 +420,10 @@
<download-one-file src="${derby.url}"
dest="${derby.jar}"
md5="${derby.md5}" />
+ <mkdir dir="${icudll.dir}" />
+ <download-one-file src="${icudll.url}"
+ dest="${icudll.zip}"
+ md5="${icudll.md5}" />
</target>
<target name="-download-win" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">
Added: harmony/enhanced/classlib/trunk/make/freebsd.x86/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/freebsd.x86/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/freebsd.x86/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/freebsd.x86/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=7e78475ec05805083e58879eda6e5df9
Propchange: harmony/enhanced/classlib/trunk/make/freebsd.x86/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/make/linux.ia64/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/linux.ia64/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/linux.ia64/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/linux.ia64/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=1136e736ce8976da898f2a3d34cb8469
Propchange: harmony/enhanced/classlib/trunk/make/linux.ia64/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/make/linux.ppc32/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/linux.ppc32/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/linux.ppc32/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/linux.ppc32/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=1a7e73cf283dc362b69350f163a3f256
Propchange: harmony/enhanced/classlib/trunk/make/linux.ppc32/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/make/linux.ppc64/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/linux.ppc64/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/linux.ppc64/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/linux.ppc64/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=d6d67c23093425b7a1adda1550944745
Propchange: harmony/enhanced/classlib/trunk/make/linux.ppc64/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/make/linux.x86.libstdc++6/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/linux.x86.libstdc%2B%2B6/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/linux.x86.libstdc++6/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/linux.x86.libstdc++6/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=efca3002eaa3e4727633eb096ad4561c
Propchange: harmony/enhanced/classlib/trunk/make/linux.x86.libstdc++6/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/make/linux.x86/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/linux.x86/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/linux.x86/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/linux.x86/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=545626f5c5336168005dad74d7f6f30c
Propchange: harmony/enhanced/classlib/trunk/make/linux.x86/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/make/linux.x86_64/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/linux.x86_64/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/linux.x86_64/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/linux.x86_64/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=dd65a5c4d519799607ce9463f7e5cd26
Propchange: harmony/enhanced/classlib/trunk/make/linux.x86_64/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/make/macosx.ppc32/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/macosx.ppc32/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/macosx.ppc32/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/macosx.ppc32/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=96607064b85027427f29d39fc9ec5f90
Propchange: harmony/enhanced/classlib/trunk/make/macosx.ppc32/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=612947&r1=612946&r2=612947&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Thu Jan 17 11:34:56 2008
@@ -319,6 +319,9 @@
</condition>
<property name="hy.libstdc++.suffix" value="" />
+ <property name="hy.platform.variant"
+ value="${hy.platform}${hy.libstdc++.suffix}" />
+
<target name="echo" depends="svn-prop, svn-info, test-jre-vm-info"
description="Display the properties defined by this ant file" >
<echo>
Added: harmony/enhanced/classlib/trunk/make/windows.x86/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/windows.x86/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/windows.x86/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/windows.x86/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=f8b46d05e08ca98e42738f159ae1dd40
Propchange: harmony/enhanced/classlib/trunk/make/windows.x86/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/make/windows.x86_64/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/windows.x86_64/depends.properties?rev=612947&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/windows.x86_64/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/make/windows.x86_64/depends.properties Thu Jan 17 11:34:56 2008
@@ -0,0 +1 @@
+icudll.md5=53b383e6424103823493087e5dddff54
Propchange: harmony/enhanced/classlib/trunk/make/windows.x86_64/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml?rev=612947&r1=612946&r2=612947&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Thu Jan 17 11:34:56 2008
@@ -51,13 +51,13 @@
<target name="-init-unix" if="is.unix">
<!-- These links should really be removed by the clean target but this
is a workaround for a debian packaging problem. It should
- be fixed properly then the icu4c libs are moved from classlib. -->
- <delete file="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicuuc.so" />
- <symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicuuc.so"
- resource="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicuuc.so.34"/>
- <delete file="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicudata.so" />
- <symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicudata.so"
- resource="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicudata.so.34"/>
+ be fixed properly then the icu4c libs are moved from classlib. -->
+ <delete file="${external.dep.CLASSLIB}/depends/libs/${hy.platform.variant}/icu-3.4/libicuuc.so" />
+ <symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/${hy.platform.variant}/icu-3.4/libicuuc.so"
+ resource="${external.dep.CLASSLIB}/depends/libs/${hy.platform.variant}/icu-3.4/libicuuc.so.34"/>
+ <delete file="${external.dep.CLASSLIB}/depends/libs/${hy.platform.variant}/icu-3.4/libicudata.so" />
+ <symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/${hy.platform.variant}/icu-3.4/libicudata.so"
+ resource="${external.dep.CLASSLIB}/depends/libs/${hy.platform.variant}/icu-3.4/libicudata.so.34"/>
</target>
<target name="init" depends="common_vm, -check-version, stamp_version, copy_version, -init-unix">
@@ -225,8 +225,8 @@
<linkerarg value="/NODEFAULTLIB:msvcrt.lib" if="is.windows"/>
<linkerarg value="--version-script=${build.vm.home}/vmcore/build/vmcore.exp" if="is.unix"/>
- <libset type="shared" libs="icuuc"
- dir="${external.dep.CLASSLIB}/depends/libs/${hy.platform}" if="is.unix"/>
+ <libset type="shared" libs="icuuc"
+ dir="${external.dep.CLASSLIB}/depends/libs/${hy.platform.variant}/icu-3.4" if="is.unix"/>
<syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread,gcc_s,rt" if="is.linux"/>
<syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/>
<libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>