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 2009/08/06 13:18:12 UTC
svn commit: r801602 - in /harmony/enhanced/classlib/trunk:
make/build-java.xml make/depends.properties make/depends.xml
modules/awt/build.xml modules/awt/make/depends.properties
Author: hindessm
Date: Thu Aug 6 11:18:11 2009
New Revision: 801602
URL: http://svn.apache.org/viewvc?rev=801602&view=rev
Log:
Move dejavu font dependency to awt module.
Added:
harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties (with props)
Modified:
harmony/enhanced/classlib/trunk/make/build-java.xml
harmony/enhanced/classlib/trunk/make/depends.properties
harmony/enhanced/classlib/trunk/make/depends.xml
harmony/enhanced/classlib/trunk/modules/awt/build.xml
Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=801602&r1=801601&r2=801602&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Thu Aug 6 11:18:11 2009
@@ -247,17 +247,7 @@
<include name="rowset.properties" />
</fileset>
</copy>
-
- <mkdir dir="${hy.jdk}/jre/lib/fonts" />
- <copy todir="${hy.jdk}/jre/lib/fonts">
- <fileset dir="${dejavu-fonts.fonts.dir}">
- <include name="DejaVuSans.ttf" />
- <include name="DejaVuSans-*.ttf" />
- <exclude name="DejaVuSans-ExtraLight.ttf" />
- <include name="DejaVuSerif.ttf" />
- <include name="DejaVuSerif-*.ttf" />
- </fileset>
- </copy>
+
</target>
Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=801602&r1=801601&r2=801602&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Thu Aug 6 11:18:11 2009
@@ -16,7 +16,6 @@
depends.dir=depends
depends.jars=${depends.dir}/jars
maven2.base=http://repo1.maven.org/maven2
-sf.base=http://internap.dl.sourceforge.net/sourceforge
xalan.dir=${depends.jars}/xalan-j_2.7.0
xalan.orig.jar=${xalan.dir}/xalan.orig.jar
@@ -89,12 +88,6 @@
awtdeps.md5@x86_64@=f2bbb1f4f23100393783fd02a77fcc68
awtdeps.testfile@x86_64@=${awtdeps.extract.dir}/win64_2007-02-08.txt
-dejavu-fonts.dir=${depends.dir}/dejavu-fonts
-dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
-dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
-dejavu-fonts.url=${sf.base}/dejavu/dejavu-ttf-2.18-1.zip
-dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
-
depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
bcprov.ver=bcprov-jdk15-141
Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=801602&r1=801601&r2=801602&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Thu Aug 6 11:18:11 2009
@@ -41,7 +41,6 @@
<check-one-file src="${jetty.url}" dest="${jetty.jar}" />
<check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
<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="${icu4j.url}" dest="${icu4j.jar}" />
<check-one-file src="${icu4j-charsets.url}" dest="${icu4j-charsets.jar}" />
</target>
@@ -61,12 +60,9 @@
</target>
<target name="-extract"
- depends="-extract-props,-extract-dejavu-fonts,-extract-xerces,-fix-xalan-manifest" />
+ depends="-extract-props,-extract-xerces,-fix-xalan-manifest" />
<target name="-extract-props">
- <uptodate property="dejavu-fonts.uptodate"
- srcfile="${dejavu-fonts.zip}"
- targetfile="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
<uptodate property="xerces.uptodate"
srcfile="${xerces.zip}"
targetfile="${xerces.dir}/xercesImpl.jar" />
@@ -75,12 +71,6 @@
targetfile="${xalan.jar}" />
</target>
-
- <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
- <unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />
- <touch file="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
- </target>
-
<target name="-extract-xerces" unless="xerces.uptodate">
<unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
<copy todir="${xerces.dir}" flatten="yes">
@@ -162,10 +152,6 @@
<download-one-file src="${servlet-api.url}" dest="${servlet-api.jar}"
md5="${servlet-api.md5}" />
- <mkdir dir="${dejavu-fonts.dir}" />
- <download-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}"
- md5="${dejavu-fonts.md5}" />
-
<mkdir dir="${icu4j.dir}" />
<download-one-file src="${icu4j.url}"
dest="${icu4j.jar}"
Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=801602&r1=801601&r2=801602&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Thu Aug 6 11:18:11 2009
@@ -21,11 +21,41 @@
<property name="hy.module" value="awt" />
<property name="hy.hdk" location="${basedir}/../../deploy" />
+ <property name="depends.dir" location="${basedir}/../../depends" />
+
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <import file="${hy.hdk}/build/ant/depends.xml" />
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, copy-resources, build-jar" />
+ <target name="build"
+ depends="check-depends,compile-java, copy-resources, build-jar" />
+
+ <target name="check-depends" depends="-check-depends,-extract" />
+
+ <target name="-check-depends">
+ <check-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}" />
+ </target>
+
+ <target name="-extract"
+ depends="-extract-props,-extract-dejavu-fonts" />
+
+ <target name="-extract-props">
+ <uptodate property="dejavu-fonts.uptodate"
+ srcfile="${dejavu-fonts.zip}"
+ targetfile="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
+ </target>
+
+ <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
+ <unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />
+ <touch file="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
+ </target>
+
+ <target name="fetch-depends">
+ <mkdir dir="${dejavu-fonts.dir}" />
+ <download-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}"
+ md5="${dejavu-fonts.md5}" />
+ </target>
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -46,6 +76,7 @@
<delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
+ <delete dir="${hy.jdk}/jre/lib/fonts" quiet="true" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
@@ -92,7 +123,18 @@
<mkdir dir="${hy.jdk}/jre/lib/cmm" />
<copy todir="${hy.jdk}/jre/lib/cmm">
<fileset dir="src/main/resources/cmm"/>
- </copy>
+ </copy>
+
+ <mkdir dir="${hy.jdk}/jre/lib/fonts" />
+ <copy todir="${hy.jdk}/jre/lib/fonts">
+ <fileset dir="${dejavu-fonts.fonts.dir}">
+ <include name="DejaVuSans.ttf" />
+ <include name="DejaVuSans-*.ttf" />
+ <exclude name="DejaVuSans-ExtraLight.ttf" />
+ <include name="DejaVuSerif.ttf" />
+ <include name="DejaVuSerif-*.ttf" />
+ </fileset>
+ </copy>
</target>
<target name="-copy-win-resources" if="is.windows">
@@ -335,7 +377,7 @@
<fileset dir="src/test/api/resources" />
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="${junit.jar}" todir="${hy.hdk}/build/test" />
</target>
<target name="compile-tests">
Added: harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties?rev=801602&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties Thu Aug 6 11:18:11 2009
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sf.base=http://internap.dl.sourceforge.net/sourceforge
+dejavu-fonts.dir=${depends.dir}/dejavu-fonts
+dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
+dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
+dejavu-fonts.url=${sf.base}/dejavu/dejavu-ttf-2.18-1.zip
+dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
Propchange: harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native