harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r802879 - in /harmony/enhanced/classlib/trunk: make/depends.properties make/depends.xml modules/awt/build.xml modules/awt/make/depends.properties modules/imageio/build.xml modules/imageio/make/depends.properties
Date Mon, 10 Aug 2009 18:21:29 GMT
Author: hindessm
Date: Mon Aug 10 18:21:29 2009
New Revision: 802879

URL: http://svn.apache.org/viewvc?rev=802879&view=rev
Log:
Push "awt" dependencies down to modules.

Added:
    harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties   (with props)
Modified:
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=802879&r1=802878&r2=802879&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Mon Aug 10 18:21:29 2009
@@ -78,32 +78,6 @@
 servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e
 servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
 
-depends.lib.dir=${depends.dir}/libs/${hy.platform}
-awt.base=http://people.apache.org/~hindessm/classlib-depends/${hy.platform}
-jpeg.ver=6b
-jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
-jpeg.testfile=${jpeg.dir}/jversion.h
-jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
-jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
-jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
-jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
-
-lcms.ver=1.15
-lcms.dir=${depends.lib.dir}/lcms-${lcms.ver}
-lcms.testfile=${lcms.dir}/lcms.h
-lcms.tar=${depends.lib.dir}/lcms-${lcms.ver}.tar.gz
-lcms.url=${awt.base}/lcms-${lcms.ver}.tar.gz
-lcms.md5@x86@=e66de19d497ffe66e6d50f75c95e683e
-lcms.md5@x86_64@=e23282246ba9e1cf8b32c52d7fe97c78
-
-png.ver=1.2.12
-png.dir=${depends.lib.dir}/png-${png.ver}
-png.testfile=${png.dir}/png.h
-png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
-png.url=${awt.base}/png-${png.ver}.tar.gz
-png.md5@x86@=11df6f62db3ac490ae1cabf753c2773c
-png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc
-
 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=802879&r1=802878&r2=802879&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Mon Aug 10 18:21:29 2009
@@ -31,7 +31,7 @@
     <import file="${basedir}/make/depends-common.xml" />
 
     <target name="check" description="Check whether dependencies are available"
-            depends="-check,-check-win,-check-unix,-extract" />
+            depends="-check,-check-win,-extract" />
 
     <target name="-check">
         <check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
@@ -46,45 +46,11 @@
         <check-one-file src="${icu4j-charsets.url}" dest="${icu4j-charsets.jar}" />
   
     </target>
 
-    <target name="-check-win" if="is.windows"
-            depends="-really-check-win,-win-props,-ext-jpeg,-ext-lcms,-ext-png" />
-
-    <target name="-really-check-win" if="is.windows">
+    <target name="-check-win" if="is.windows">
         <property environment="hyenv" />
 
         <check-one-file src="${msvcr.url}" dest="${msvcr.dll}" />
         <check-one-file src="${msvcp.url}" dest="${msvcp.dll}" />
-        <check-one-file src="${jpeg.url}" dest="${jpeg.tar}" />
-        <check-one-file src="${lcms.url}" dest="${lcms.tar}" />
-        <check-one-file src="${png.url}" dest="${png.tar}" />
-    </target>
-
-    <target name="-win-props" if="is.windows">
-        <uptodate property="jpeg.uptodate"
-                  srcfile="${jpeg.tar}"
-                  targetfile="${jpeg.testfile}" />
-        <uptodate property="lcms.uptodate"
-                  srcfile="${lcms.tar}"
-                  targetfile="${lcms.testfile}" />
-        <uptodate property="png.uptodate"
-                  srcfile="${png.tar}"
-                  targetfile="${png.testfile}" />
-    </target>
-
-    <target name="-ext-jpeg" if="is.windows" unless="jpeg.uptodate">
-        <echo>Extracting jpeg dependencies</echo>
-        <untar src="${jpeg.tar}" dest="${depends.lib.dir}" compression="gzip" />
-	<touch file="${jpeg.testfile}" />
-    </target>
-    <target name="-ext-lcms" if="is.windows" unless="lcms.uptodate">
-        <echo>Extracting lcms dependencies</echo>
-        <untar src="${lcms.tar}" dest="${depends.lib.dir}" compression="gzip" />
-	<touch file="${lcms.testfile}" />
-    </target>
-    <target name="-ext-png" if="is.windows" unless="png.uptodate">
-        <echo>Extracting png dependencies</echo>
-        <untar src="${png.tar}" dest="${depends.lib.dir}" compression="gzip" />
-	<touch file="${png.testfile}" />
     </target>
 
     <target name="-extract"
@@ -123,32 +89,6 @@
         <delete dir="${xalan.dir}.tmp" />
     </target>
 
-    <target name="-check-unix" if="is.unix">
-        
-        <property name="lcms.msg"
-                  value="liblcms development package not installed
-${line.separator}For Debian/Ubuntu try: apt-get install liblcms1-dev
-${line.separator}For Fedora try: yum install lcms-devel" />
-        <check-os-file src="${lcms.home}/include/lcms.h"
-                       message="${lcms.msg}" />
-
-        <property name="png.msg"
-                  value="libpng development package not installed
-${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev
-${line.separator}For Fedora try: yum install libpng-devel" />
-        <check-os-file src="${png.home}/include/png.h"
-                       message="${png.msg}" />
-
-        <property name="jpeg.msg"
-                  value="libjpeg development package not installed
-${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev
-${line.separator}For Fedora try: yum install libjpeg-devel" />
-        <mkdir dir="depends/libs/build/jpeg" />
-        <check-os-file src="${jpeg.home}/include/jconfig.h"
-                       message="${jpeg.msg}" />
-
-    </target>
-
     <target name="download" description="Download required jars"
             depends="-download,-download-win" />
 
@@ -210,18 +150,6 @@
                            md5="${msvcp.md5}"
                            md5-deprecated="${msvcp.md5.deprecated}" />
 
-        <mkdir dir="${jpeg.dir}" />
-        <download-one-file src="${jpeg.url}"
-                           dest="${jpeg.tar}"
-                           md5="${jpeg.md5}" />
-        <mkdir dir="${lcms.dir}" />
-        <download-one-file src="${lcms.url}"
-                           dest="${lcms.tar}"
-                           md5="${lcms.md5}" />
-        <mkdir dir="${png.dir}" />
-        <download-one-file src="${png.url}"
-                           dest="${png.tar}"
-                           md5="${png.md5}" />
     </target>
 
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=802879&r1=802878&r2=802879&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Mon Aug 10 18:21:29 2009
@@ -22,7 +22,6 @@
     <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" />
 
@@ -33,12 +32,42 @@
 
     <target name="check-depends" depends="-check-depends,-extract" />
 
-    <target name="-check-depends">
+    <target name="-check-depends"
+            depends="-check-win-depends,-check-unix-depends">
         <check-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}" />
     </target>
 
+    <target name="-check-win-depends" if="is.windows">
+        <check-one-file src="${jpeg.url}" dest="${jpeg.tar}" />
+        <check-one-file src="${lcms.url}" dest="${lcms.tar}" />
+        <check-one-file src="${png.url}" dest="${png.tar}" />
+    </target>
+
+    <target name="-check-unix-depends" if="is.unix">
+        <property name="jpeg.msg"
+                  value="libjpeg development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev
+${line.separator}For Fedora try: yum install libjpeg-devel" />
+        <check-os-file src="${jpeg.home}/include/jconfig.h"
+                       message="${jpeg.msg}" />
+
+        <property name="lcms.msg"
+                  value="liblcms development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install liblcms1-dev
+${line.separator}For Fedora try: yum install lcms-devel" />
+        <check-os-file src="${lcms.home}/include/lcms.h"
+                       message="${lcms.msg}" />
+
+        <property name="png.msg"
+                  value="libpng development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev
+${line.separator}For Fedora try: yum install libpng-devel" />
+        <check-os-file src="${png.home}/include/png.h"
+                       message="${png.msg}" />
+    </target>
+
     <target name="-extract"
-         depends="-extract-props,-extract-dejavu-fonts" />
+            depends="-extract-props,-extract-dejavu-fonts,-extract-win" />
 
     <target name="-extract-props">
         <uptodate property="dejavu-fonts.uptodate"
@@ -51,12 +80,58 @@
         <touch file="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
     </target>
 
-    <target name="fetch-depends">
+    <target name="-extract-win"
+            depends="-ext-props,-ext-jpeg,-ext-lcms,-ext-png" />
+
+    <target name="-ext-props" if="is.windows">
+        <uptodate property="jpeg.uptodate"
+                  srcfile="${jpeg.tar}"
+                  targetfile="${jpeg.testfile}" />
+        <uptodate property="lcms.uptodate"
+                  srcfile="${lcms.tar}"
+                  targetfile="${lcms.testfile}" />
+        <uptodate property="png.uptodate"
+                  srcfile="${png.tar}"
+                  targetfile="${png.testfile}" />
+    </target>
+
+    <target name="-ext-jpeg" if="is.windows" unless="jpeg.uptodate">
+        <echo>Extracting jpeg dependencies</echo>
+        <untar src="${jpeg.tar}" dest="${depends.lib.dir}" compression="gzip" />
+        <touch file="${jpeg.testfile}" />
+    </target>
+    <target name="-ext-lcms" if="is.windows" unless="lcms.uptodate">
+        <echo>Extracting lcms dependencies</echo>
+        <untar src="${lcms.tar}" dest="${depends.lib.dir}" compression="gzip" />
+        <touch file="${lcms.testfile}" />
+    </target>
+    <target name="-ext-png" if="is.windows" unless="png.uptodate">
+        <echo>Extracting png dependencies</echo>
+        <untar src="${png.tar}" dest="${depends.lib.dir}" compression="gzip" />
+        <touch file="${png.testfile}" />
+    </target>
+
+    <target name="fetch-depends" depends="-fetch-win-depends">
         <mkdir dir="${dejavu-fonts.dir}" />
         <download-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}"
                            md5="${dejavu-fonts.md5}" />
     </target>
 
+    <target name="-fetch-win-depends" if="is.windows">
+        <mkdir dir="${jpeg.dir}" />
+        <download-one-file src="${jpeg.url}"
+                           dest="${jpeg.tar}"
+                           md5="${jpeg.md5}" />
+        <mkdir dir="${lcms.dir}" />
+        <download-one-file src="${lcms.url}"
+                           dest="${lcms.tar}"
+                           md5="${lcms.md5}" />
+        <mkdir dir="${png.dir}" />
+        <download-one-file src="${png.url}"
+                           dest="${png.tar}"
+                           md5="${png.md5}" />
+    </target>
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>

Modified: 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=802879&r1=802878&r2=802879&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties Mon Aug 10 18:21:29
2009
@@ -19,3 +19,29 @@
 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.lib.dir=${depends.dir}/libs/${hy.platform}
+awt.base=http://people.apache.org/~hindessm/classlib-depends/${hy.platform}
+jpeg.ver=6b
+jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
+jpeg.testfile=${jpeg.dir}/jversion.h
+jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
+jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
+jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
+jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
+
+lcms.ver=1.15
+lcms.dir=${depends.lib.dir}/lcms-${lcms.ver}
+lcms.testfile=${lcms.dir}/lcms.h
+lcms.tar=${depends.lib.dir}/lcms-${lcms.ver}.tar.gz
+lcms.url=${awt.base}/lcms-${lcms.ver}.tar.gz
+lcms.md5@x86@=e66de19d497ffe66e6d50f75c95e683e
+lcms.md5@x86_64@=e23282246ba9e1cf8b32c52d7fe97c78
+
+png.ver=1.2.12
+png.dir=${depends.lib.dir}/png-${png.ver}
+png.testfile=${png.dir}/png.h
+png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
+png.url=${awt.base}/png-${png.ver}.tar.gz
+png.md5@x86@=11df6f62db3ac490ae1cabf753c2773c
+png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=802879&r1=802878&r2=802879&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Mon Aug 10 18:21:29 2009
@@ -21,11 +21,73 @@
 
     <property name="hy.module" value="imageio" />
     <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-win-depends,-check-unix-depends" />
+
+    <target name="-check-win-depends" if="is.windows"
+            depends="-really-check-win-depends,-ext-props,-ext-jpeg,-ext-png" />
+
+    <target name="-really-check-win-depends" if="is.windows">
+        <check-one-file src="${jpeg.url}" dest="${jpeg.tar}" />
+        <check-one-file src="${png.url}" dest="${png.tar}" />
+    </target>
+
+    <target name="-check-unix-depends" if="is.unix">
+        <property name="jpeg.msg"
+                  value="libjpeg development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev
+${line.separator}For Fedora try: yum install libjpeg-devel" />
+        <check-os-file src="${jpeg.home}/include/jconfig.h"
+                       message="${jpeg.msg}" />
+
+        <property name="png.msg"
+                  value="libpng development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev
+${line.separator}For Fedora try: yum install libpng-devel" />
+        <check-os-file src="${png.home}/include/png.h"
+                       message="${png.msg}" />
+    </target>
+
+    <target name="-ext-props" if="is.windows">
+        <uptodate property="jpeg.uptodate"
+                  srcfile="${jpeg.tar}"
+                  targetfile="${jpeg.testfile}" />
+                <uptodate property="png.uptodate"
+                  srcfile="${png.tar}"
+                  targetfile="${png.testfile}" />
+    </target>
+
+    <target name="-ext-jpeg" if="is.windows" unless="jpeg.uptodate">
+        <echo>Extracting jpeg dependencies</echo>
+        <untar src="${jpeg.tar}" dest="${depends.lib.dir}" compression="gzip" />
+        <touch file="${jpeg.testfile}" />
+    </target>
+
+    <target name="-ext-png" if="is.windows" unless="png.uptodate">
+        <echo>Extracting png dependencies</echo>
+        <untar src="${png.tar}" dest="${depends.lib.dir}" compression="gzip" />
+        <touch file="${png.testfile}" />
+    </target>
+
+    <target name="fetch-depends" if="is.windows">
+        <mkdir dir="${jpeg.dir}" />
+        <download-one-file src="${jpeg.url}"
+                           dest="${jpeg.tar}"
+                           md5="${jpeg.md5}" />
+        <mkdir dir="${png.dir}" />
+        <download-one-file src="${png.url}"
+                           dest="${png.tar}"
+                           md5="${png.md5}" />
+    </target>
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -175,8 +237,7 @@
             <fileset dir="src/test/resources" />
         </copy>
 
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
+        <copy file="${junit.jar}" tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Added: harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties?rev=802879&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties Mon Aug 10 18:21:29
2009
@@ -0,0 +1,33 @@
+# 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.
+
+depends.dir=depends
+depends.lib.dir=${depends.dir}/libs/${hy.platform}
+awt.base=http://people.apache.org/~hindessm/classlib-depends/${hy.platform}
+jpeg.ver=6b
+jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
+jpeg.testfile=${jpeg.dir}/jversion.h
+jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
+jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
+jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
+jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
+
+png.ver=1.2.12
+png.dir=${depends.lib.dir}/png-${png.ver}
+png.testfile=${png.dir}/png.h
+png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
+png.url=${awt.base}/png-${png.ver}.tar.gz
+png.md5@x86@=11df6f62db3ac490ae1cabf753c2773c
+png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message