harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r770166 - in /harmony/enhanced/classlib/trunk: build.xml make/depends-common.xml make/depends.xml modules/orb/ modules/orb/build.xml modules/orb/make/ modules/orb/make/depends.properties
Date Thu, 30 Apr 2009 11:14:46 GMT
Author: hindessm
Date: Thu Apr 30 11:14:46 2009
New Revision: 770166

URL: http://svn.apache.org/viewvc?rev=770166&view=rev
Log:
Move yoko/bcel dependency to module/orb.

Added:
    harmony/enhanced/classlib/trunk/make/depends-common.xml   (contents, props changed)
      - copied, changed from r770110, harmony/enhanced/classlib/trunk/make/depends.xml
    harmony/enhanced/classlib/trunk/modules/orb/
    harmony/enhanced/classlib/trunk/modules/orb/build.xml   (with props)
    harmony/enhanced/classlib/trunk/modules/orb/make/
    harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties   (with props)
Modified:
    harmony/enhanced/classlib/trunk/build.xml
    harmony/enhanced/classlib/trunk/make/depends.xml

Modified: harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/build.xml?rev=770166&r1=770165&r2=770166&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/build.xml (original)
+++ harmony/enhanced/classlib/trunk/build.xml Thu Apr 30 11:14:46 2009
@@ -277,14 +277,16 @@
         <chksum file="${deploy.zip}" type="sha" />
     </target>
 
-    <target name="check-depends"
+    <target name="check-depends" depends="-init-hdk"
             description="Report on whether the dependencies are met">
         <ant antfile="make/depends.xml" inheritall="false" target="check" />
+        <poll-modules target="check-depends" />
     </target>
 
     <target name="fetch-depends"
         description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed
under terms other than the Apache License v2.">
         <ant antfile="make/depends.xml" inheritall="false" target="download" />
+        <poll-modules target="fetch-depends" />
     </target>
 
     <target name="properties" depends="echo"
@@ -336,6 +338,14 @@
                   tofile="${hy.hdk}/build/ant/make.xml"
                   outputencoding="UTF-8" >
             </copy>
+            <copy file="make/depends-common.xml"
+                  tofile="${hy.hdk}/build/ant/depends.xml"
+                  outputencoding="UTF-8" >
+            </copy>
+            <copy file="make/depends.properties"
+                  tofile="${hy.hdk}/build/ant/depends.properties"
+                  outputencoding="UTF-8" >
+            </copy>
         </sequential>
     </macrodef>
 

Copied: harmony/enhanced/classlib/trunk/make/depends-common.xml (from r770110, harmony/enhanced/classlib/trunk/make/depends.xml)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends-common.xml?p2=harmony/enhanced/classlib/trunk/make/depends-common.xml&p1=harmony/enhanced/classlib/trunk/make/depends.xml&r1=770110&r2=770166&rev=770166&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends-common.xml Thu Apr 30 11:14:46 2009
@@ -19,13 +19,12 @@
 
  -->
 
-<project name="dependencies" default="check" basedir="..">
+<project name="Common dependency definitions" default="none" basedir="..">
     <description>
     Confirm that dependencies are present and fetch missing dependencies
     where possible.
     </description>
 
-    <import file="${basedir}/make/properties.xml" />
     <loadproperties srcfile="${basedir}/make/depends.properties">
       <filterchain>
         <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
@@ -37,242 +36,6 @@
       </filterchain>
     </loadproperties>
 
-    <target name="check" description="Check whether dependencies are available"
-            depends="-check,-check-win,-check-unix,-extract" />
-
-    <target name="-check">
-        <check-one-file src="${yoko.url}" dest="${yoko.jar}" />
-        <check-one-file src="${yoko-core.url}" dest="${yoko-core.jar}" />
-        <check-one-file src="${yoko-rmi-impl.url}" dest="${yoko-rmi-impl.jar}" />
-        <check-one-file src="${yoko-rmi-spec.url}" dest="${yoko-rmi-spec.jar}" />
-        <check-one-file src="${bcel.url}" dest="${bcel.jar}" />
-        <check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
-        <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
-        <check-one-file src="${junit.url}" dest="${junit.jar}" />
-        <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
-        <check-one-file src="${mx4j.url}" dest="${mx4j.zip}" />
-        <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="${derby.url}" dest="${derby.jar}" />
-        <check-one-file src="${asm.url}" dest="${asm.jar}" />
-        <check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
-        <check-one-file src="${icu4j-charsets.url}" dest="${icu4j-charsets.jar}" />
   
-    </target>
-
-    <target name="-check-win" if="is.windows" depends="-really-check-win" />
-
-    <target name="-really-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="${awtdeps.url}" dest="${awtdeps.tar}" />
-        <uptodate property="awtdeps.uptodate"
-                  srcfile="${awtdeps.tar}"
-                  targetfile="${awtdeps.testfile}" />
-        <antcall target="-awt-tar-extract" />
-    </target>
-
-    <target name="-extract"
-         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-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="mx4j.uptodate"
-                  srcfile="${mx4j.zip}"
-                  targetfile="${mx4j.jar}" />
-        <uptodate property="xerces.uptodate"
-                  srcfile="${xerces.zip}"
-                  targetfile="${xerces.dir}/xercesImpl.jar" />
-        <uptodate property="xalan.uptodate"
-                  srcfile="${xalan.orig.jar}"
-                  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-mx4j" unless="mx4j.uptodate">
-
-        <!-- This doesn't work for me since my ant doesn't support
-             mapper in unzip.
-
-        <unzip src="${mx4j.zip}" dest="${mx4j.dir}">
-            <patternset>
-                <include name="**/mx4j.jar"/>
-                <include name="**/mx4j-remote.jar"/>
-            </patternset>
-            <mapper type="flatten" />
-        </unzip>
-          -->
-
-        <unzip src="${mx4j.zip}" dest="${mx4j.dir}.tmp" />
-        <copy todir="${mx4j.dir}" flatten="yes">
-            <fileset dir="${mx4j.dir}.tmp/mx4j-3.0.2/lib">
-                <include name="mx4j.jar"/>
-                <include name="mx4j-remote.jar"/>
-            </fileset>
-        </copy>
-        <delete dir="${mx4j.dir}.tmp" />
-	<touch file="${mx4j.jar}" />
-    </target>
-
-    <target name="-extract-xerces" unless="xerces.uptodate">
-        <unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
-        <copy todir="${xerces.dir}" flatten="yes">
-            <fileset dir="${xerces.dir}.tmp/xerces-2_9_1">
-                <include name="resolver.jar" />
-		<include name="xercesImpl.jar" />
-		<include name="xml-apis.jar" />
-            </fileset>
-        </copy>
-        <delete dir="${xerces.dir}.tmp" />
-	<touch file="${xerces.dir}/xercesImpl.jar" />
-    </target>
-
-    <target name="-fix-xalan-manifest" unless="xalan.uptodate">
-        <unjar src="${xalan.orig.jar}" dest="${xalan.dir}.tmp" />
-        <delete file="${xalan.jar}" />
-        <replace file="${xalan.dir}.tmp/META-INF/MANIFEST.MF"
-                 token="Class-Path: xercesImpl.jar xml-apis.jar serializer.jar"
-                 value="" />
-        <jar destfile="${xalan.jar}" basedir="${xalan.dir}.tmp"
-             manifest="${xalan.dir}.tmp/META-INF/MANIFEST.MF" />
-        <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" />
-
-    <target name="-download">
-
-    <mkdir dir="${yoko.dir}" />
-    <download-one-file src="${yoko.url}" dest="${yoko.jar}"
-                           md5="${yoko.md5}" />
-
-    <mkdir dir="${yoko-core.dir}" />
-    <download-one-file src="${yoko-core.url}" dest="${yoko-core.jar}"
-                           md5="${yoko-core.md5}" />
-
-    <mkdir dir="${yoko-rmi-impl.dir}" />
-    <download-one-file src="${yoko-rmi-impl.url}" dest="${yoko-rmi-impl.jar}"
-                           md5="${yoko-rmi-impl.md5}" />
-
-    <mkdir dir="${yoko-rmi-spec.dir}" />
-    <download-one-file src="${yoko-rmi-spec.url}" dest="${yoko-rmi-spec.jar}"
-                           md5="${yoko-rmi-spec.md5}" />
-
-    <mkdir dir="${bcel.dir}" />
-    <download-one-file src="${bcel.url}" dest="${bcel.jar}"
-                           md5="${bcel.md5}" />
-
-    <mkdir dir="${xalan.dir}" />
-    <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
-                           md5="${xalan.md5}" />
-
-    <mkdir dir="${xerces.dir}" />
-    <download-one-file src="${xerces.url}" dest="${xerces.zip}"
-                           md5="${xerces.md5}" />
-
-    <mkdir dir="${junit.dir}" />
-    <download-one-file src="${junit.url}" dest="${junit.jar}"
-                           md5="${junit.md5}" />
-
-    <mkdir dir="${bcprov.dir}" />
-    <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
-                           md5="${bcprov.md5}" />
-
-    <mkdir dir="${mx4j.dir}" />
-    <download-one-file src="${mx4j.url}" dest="${mx4j.zip}"
-                           md5="${mx4j.md5}" />
-
-    <mkdir dir="${jetty.dir}" />
-    <download-one-file src="${jetty.url}" dest="${jetty.jar}"
-                           md5="${jetty.md5}" />
- 
-    <download-one-file src="${jetty-util.url}" dest="${jetty-util.jar}"
-                           md5="${jetty-util.md5}" />
-                           
-        <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="${derby.dir}" />
-    <download-one-file src="${derby.url}"
-                       dest="${derby.jar}"
-                       md5="${derby.md5}" />
-
-    <mkdir dir="${asm.dir}" />
-    <download-one-file src="${asm.url}" dest="${asm.jar}"
-                           md5="${asm.md5}" />
-
-    <mkdir dir="${icu4j.dir}" />
-    <download-one-file src="${icu4j.url}"
-                       dest="${icu4j.jar}"
-                       md5="${icu4j.md5}" />
-    <download-one-file src="${icu4j-charsets.url}"
-                       dest="${icu4j-charsets.jar}"
-                       md5="${icu4j-charsets.md5}" />
-    </target>
-
-    <target name="-download-win" if="is.windows">
-
-    <property environment="hyenv" />
-
-    <mkdir dir="${msvcr.dir}" />
-    <download-one-file src="${msvcr.url}"
-                       dest="${msvcr.dll}"
-                       md5="${msvcr.md5}"
-                       md5-deprecated="${msvcr.md5.deprecated}" />
-
-    <mkdir dir="${msvcp.dir}" />
-    <download-one-file src="${msvcp.url}"
-                       dest="${msvcp.dll}"
-                       md5="${msvcp.md5}"
-                       md5-deprecated="${msvcp.md5.deprecated}" />
-
-    <mkdir dir="${awtdeps.dir}" />
-    <download-one-file src="${awtdeps.url}"
-                       dest="${awtdeps.tar}"
-                       md5="${awtdeps.md5}" />
-    </target>
-
     <macrodef name="download-one-file">
         <attribute name="src" />
         <attribute name="dest" />
@@ -296,7 +59,7 @@
             <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
             </antcall>
-        <fail unless="@{dest}.md5.verified">
+            <fail unless="@{dest}.md5.verified">
 ...
 
 File @{dest} has incorrect md5 checksum.
@@ -322,14 +85,14 @@
         <attribute name="dest" />
         <sequential>
             <echo level="info">Checking for @{dest}</echo>
-        <available file="@{dest}" type="file"
+            <available file="@{dest}" type="file"
                        property="@{dest}.exists" />
-        <fail>
-        <condition>
-            <not>
-            <isset property="@{dest}.exists" />
-            </not>
-        </condition>
+            <fail>
+                <condition>
+                    <not>
+                        <isset property="@{dest}.exists" />
+                    </not>
+                </condition>
 ...
 
 Missing dependency.  The jar from:
@@ -352,14 +115,14 @@
         <attribute name="message" />
         <sequential>
             <echo level="info">Checking for system file @{src}</echo>
-        <available file="@{src}" type="file"
+            <available file="@{src}" type="file"
                        property="@{src}.exists" />
-        <fail>
-        <condition>
-            <not>
-            <isset property="@{src}.exists" />
-            </not>
-        </condition>
+            <fail>
+                <condition>
+                    <not>
+                        <isset property="@{src}.exists" />
+                    </not>
+                </condition>
 ...
 
 Missing dependency.  The system file:
@@ -387,21 +150,21 @@
         <attribute name="message" />
         <sequential>
             <echo>Checking for @{dest}</echo>
-        <available file="@{dest}" type="file"
+            <available file="@{dest}" type="file"
                        property="@{dest}.exists" />
-        <available file="@{src}" type="file"
+            <available file="@{src}" type="file"
                        property="@{src}.exists" />
-        <fail>
-        <condition>
+            <fail>
+                <condition>
                     <and>
-                <not>
-                <isset property="@{dest}.exists" />
+                        <not>
+                            <isset property="@{dest}.exists" />
                         </not>
                         <not>
-                <isset property="@{src}.exists" />
-                </not>
+                            <isset property="@{src}.exists" />
+                        </not>
                     </and>
-        </condition>
+                </condition>
 ...
 
 Missing dependency.  The file from:

Propchange: harmony/enhanced/classlib/trunk/make/depends-common.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/make/depends-common.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=770166&r1=770165&r2=770166&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Thu Apr 30 11:14:46 2009
@@ -19,33 +19,19 @@
 
  -->
 
-<project name="dependencies" default="check" basedir="..">
+<project name="Top-Level dependency definitions" default="check" basedir="..">
     <description>
     Confirm that dependencies are present and fetch missing dependencies
     where possible.
     </description>
 
     <import file="${basedir}/make/properties.xml" />
-    <loadproperties srcfile="${basedir}/make/depends.properties">
-      <filterchain>
-        <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-            <param type="token" name="${hy.arch}" value=""/>
-            <param type="token" name="${hy.os.family}" value=""/>
-            <param type="token" name="${hy.platform}" value=""/>
-            <param type="token" name="${hy.platform.variant}" value=""/>
-        </filterreader>
-      </filterchain>
-    </loadproperties>
+    <import file="${basedir}/make/depends-common.xml" />
 
     <target name="check" description="Check whether dependencies are available"
             depends="-check,-check-win,-check-unix,-extract" />
 
     <target name="-check">
-        <check-one-file src="${yoko.url}" dest="${yoko.jar}" />
-        <check-one-file src="${yoko-core.url}" dest="${yoko-core.jar}" />
-        <check-one-file src="${yoko-rmi-impl.url}" dest="${yoko-rmi-impl.jar}" />
-        <check-one-file src="${yoko-rmi-spec.url}" dest="${yoko-rmi-spec.jar}" />
-        <check-one-file src="${bcel.url}" dest="${bcel.jar}" />
         <check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
         <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
@@ -179,26 +165,6 @@
 
     <target name="-download">
 
-    <mkdir dir="${yoko.dir}" />
-    <download-one-file src="${yoko.url}" dest="${yoko.jar}"
-                           md5="${yoko.md5}" />
-
-    <mkdir dir="${yoko-core.dir}" />
-    <download-one-file src="${yoko-core.url}" dest="${yoko-core.jar}"
-                           md5="${yoko-core.md5}" />
-
-    <mkdir dir="${yoko-rmi-impl.dir}" />
-    <download-one-file src="${yoko-rmi-impl.url}" dest="${yoko-rmi-impl.jar}"
-                           md5="${yoko-rmi-impl.md5}" />
-
-    <mkdir dir="${yoko-rmi-spec.dir}" />
-    <download-one-file src="${yoko-rmi-spec.url}" dest="${yoko-rmi-spec.jar}"
-                           md5="${yoko-rmi-spec.md5}" />
-
-    <mkdir dir="${bcel.dir}" />
-    <download-one-file src="${bcel.url}" dest="${bcel.jar}"
-                           md5="${bcel.md5}" />
-
     <mkdir dir="${xalan.dir}" />
     <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
                            md5="${xalan.md5}" />
@@ -273,158 +239,4 @@
                        md5="${awtdeps.md5}" />
     </target>
 
-    <macrodef name="download-one-file">
-        <attribute name="src" />
-        <attribute name="dest" />
-        <attribute name="md5" />
-        <attribute name="md5-deprecated" default="" />
-        <sequential>
-            <echo>Checking @{dest}</echo>
-            <available file="@{dest}" type="file"
-                       property="@{dest}.exists" />
-            <antcall target="-really-download">
-                <param name="src" value="@{src}" />
-                <param name="dest" value="@{dest}" />
-            </antcall>
-            <checksum file="@{dest}" property="@{dest}.md5" />
-            <condition property="@{dest}.md5.verified" value="true">
-                <or>
-                    <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
-                    <equals arg1="${@{dest}.md5}" arg2="@{md5-deprecated}" />
-                </or>
-            </condition>
-            <antcall target="-remove-file-if-bad">
-                <param name="jar" value="@{dest}" />
-            </antcall>
-        <fail unless="@{dest}.md5.verified">
-...
-
-File @{dest} has incorrect md5 checksum.
-    Expected: @{md5} (or @{md5-deprecated})
-    Found:    ${@{dest}.md5}
-
-            </fail>
-            <echo>Checksum verified (${@{dest}.md5.verified})</echo>
-        </sequential>
-    </macrodef>
-
-    <target name="-really-download" unless="${dest}.exists">
-        <echo>Fetching ${dest}</echo>
-        <get src="${src}" dest="${dest}" verbose="true" />
-    </target>
-
-    <target name="-remove-file-if-bad" unless="${dest}.md5.verified">
-        <delete file="${dest}" />
-    </target>
-
-    <macrodef name="check-one-file">
-        <attribute name="src" />
-        <attribute name="dest" />
-        <sequential>
-            <echo level="info">Checking for @{dest}</echo>
-        <available file="@{dest}" type="file"
-                       property="@{dest}.exists" />
-        <fail>
-        <condition>
-            <not>
-            <isset property="@{dest}.exists" />
-            </not>
-        </condition>
-...
-
-Missing dependency.  The jar from:
-
-  @{src}
-
-should be downloaded to:
-
-  @{dest}
-
-Run "ant fetch-depends" to automatically fetch dependencies.
-Note: Some of Harmony's dependencies are licensed under terms other
-than the Apache License v2.
-            </fail>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="check-os-file">
-        <attribute name="src" />
-        <attribute name="message" />
-        <sequential>
-            <echo level="info">Checking for system file @{src}</echo>
-        <available file="@{src}" type="file"
-                       property="@{src}.exists" />
-        <fail>
-        <condition>
-            <not>
-            <isset property="@{src}.exists" />
-            </not>
-        </condition>
-...
-
-Missing dependency.  The system file:
-
-  @{src}
-
-is missing.
-
-@{message}
-            </fail>
-        </sequential>
-    </macrodef>
-
-    <target name="-awt-tar-extract" unless="awtdeps.uptodate">
-        <echo>Extracting awt dependencies</echo>
-        <untar src="${awtdeps.tar}" dest="${awtdeps.extract.dir}"
-               compression="gzip" />
-        <echo file="${awtdeps.testfile}"
-              message="${awtdeps.tar} extracted${line.separator}" />
-    </target>
-
-    <macrodef name="check-one-link">
-        <attribute name="src" />
-        <attribute name="dest" />
-        <attribute name="message" />
-        <sequential>
-            <echo>Checking for @{dest}</echo>
-        <available file="@{dest}" type="file"
-                       property="@{dest}.exists" />
-        <available file="@{src}" type="file"
-                       property="@{src}.exists" />
-        <fail>
-        <condition>
-                    <and>
-                <not>
-                <isset property="@{dest}.exists" />
-                        </not>
-                        <not>
-                <isset property="@{src}.exists" />
-                </not>
-                    </and>
-        </condition>
-...
-
-Missing dependency.  The file from:
-
-  @{src}
-
-should be linked to:
-
-  @{dest}
-
-But @{src} doesn't exist.
-@{message}
-            </fail>
-            <antcall target="-really-link">
-                <param name="src" value="@{src}" />
-                <param name="dest" value="@{dest}" />
-            </antcall>
-        </sequential>
-    </macrodef>
-
-    <target name="-really-link" unless="${dest}.exists">
-        <echo>Linking ${dest}</echo>
-        <symlink resource="${src}" link="${basedir}/${dest}" />
-    </target>
-
 </project>

Added: harmony/enhanced/classlib/trunk/modules/orb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/orb/build.xml?rev=770166&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/orb/build.xml (added)
+++ harmony/enhanced/classlib/trunk/modules/orb/build.xml Thu Apr 30 11:14:46 2009
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<project name="ORB Build" default="build" basedir=".">
+    <description>Build for ORB component</description>
+
+    <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
+
+    <target name="build" depends="check-depends, -copy-jars" />
+
+    <target name="check-depends">
+        <check-one-file src="${yoko.url}" dest="${yoko.jar}" />
+        <check-one-file src="${yoko-core.url}" dest="${yoko-core.jar}" />
+        <check-one-file src="${yoko-rmi-impl.url}"
+                        dest="${yoko-rmi-impl.jar}" />
+        <check-one-file src="${yoko-rmi-spec.url}"
+                        dest="${yoko-rmi-spec.jar}" />
+        <check-one-file src="${bcel.url}" dest="${bcel.jar}" />
+    </target>
+
+    <target name="fetch-depends">
+
+        <mkdir dir="${yoko.dir}" />
+        <download-one-file src="${yoko.url}" dest="${yoko.jar}"
+                           md5="${yoko.md5}" />
+        
+        <mkdir dir="${yoko-core.dir}" />
+        <download-one-file src="${yoko-core.url}" dest="${yoko-core.jar}"
+                           md5="${yoko-core.md5}" />
+        
+        <mkdir dir="${yoko-rmi-impl.dir}" />
+        <download-one-file src="${yoko-rmi-impl.url}"
+                           dest="${yoko-rmi-impl.jar}"
+                           md5="${yoko-rmi-impl.md5}" />
+        
+        <mkdir dir="${yoko-rmi-spec.dir}" />
+        <download-one-file src="${yoko-rmi-spec.url}"
+                           dest="${yoko-rmi-spec.jar}"
+                           md5="${yoko-rmi-spec.md5}" />
+
+        <mkdir dir="${bcel.dir}" />
+        <download-one-file src="${bcel.url}" dest="${bcel.jar}"
+                           md5="${bcel.md5}" />
+
+    </target>
+
+    <target name="-copy-jars">
+        <copy todir="${hy.jdk}/jre/lib/boot">
+            <fileset dir="${depends.jars}">
+                <patternset includes="yoko-1.0/yoko-rmi-spec.jar" />
+                <patternset includes="yoko-1.0/yoko-rmi-impl.jar" />
+                <patternset includes="yoko-1.0/yoko.jar" />
+                <patternset includes="yoko-1.0/yoko-core.jar" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="test" />
+
+    <target name="clean">
+        <delete dir="${hy.jdk}/jre/lib/boot/yoko-1.0" />
+    </target>
+
+</project>

Propchange: harmony/enhanced/classlib/trunk/modules/orb/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties?rev=770166&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties Thu Apr 30 11:14:46
2009
@@ -0,0 +1,45 @@
+# 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.jars=${depends.dir}/jars
+maven2.base=http://repo1.maven.org/maven2
+yoko.base=${maven2.base}/org/apache/yoko
+
+yoko.dir=${depends.jars}/yoko-1.0
+yoko.jar=${yoko.dir}/yoko.jar
+yoko.url=${yoko.base}/yoko-spec-corba/1.0/yoko-spec-corba-1.0.jar
+yoko.md5=9785a46807b2f9d374296b4af1ff97fb
+
+yoko-core.dir=${depends.jars}/yoko-1.0
+yoko-core.jar=${yoko.dir}/yoko-core.jar
+yoko-core.url=${yoko.base}/yoko-core/1.0/yoko-core-1.0.jar
+yoko-core.md5=14acb2d10e6725ebda5bd02e7afc8218
+
+yoko-rmi-impl.dir=${depends.jars}/yoko-1.0
+yoko-rmi-impl.jar=${yoko-rmi-impl.dir}/yoko-rmi-impl.jar
+yoko-rmi-impl.url=${yoko.base}/yoko-rmi-impl/1.0/yoko-rmi-impl-1.0.jar
+yoko-rmi-impl.md5=dee6e519c83796d99a51b1379abf772a
+
+yoko-rmi-spec.dir=${depends.jars}/yoko-1.0
+yoko-rmi-spec.jar=${yoko-rmi-spec.dir}/yoko-rmi-spec.jar
+yoko-rmi-spec.url=${yoko.base}/yoko-rmi-spec/1.0/yoko-rmi-spec-1.0.jar
+yoko-rmi-spec.md5=2f8e962b3a5b9dea0a573a5285b669f6
+
+# bcel is needed by yoko-rmi
+bcel.dir=${depends.jars}/bcel-5.2
+bcel.jar=${bcel.dir}/bcel-5.2.jar
+bcel.url=${maven2.base}/org/apache/bcel/bcel/5.2/bcel-5.2.jar
+bcel.md5=43d54687362fc2991d61201c453a8286
+

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



Mime
View raw message