svn commit: r998812 - in /harmony/enhanced/java/branches/java6/classlib/modules/x-tools: build.xml make/depends.properties

[hi...@apache.org]

Author: hindessm
Date: Mon Sep 20 07:15:45 2010
New Revision: 998812

URL: http://svn.apache.org/viewvc?rev=998812&view=rev
Log:
Fix x-tools dependency on ecj.

Added:
    harmony/enhanced/java/branches/java6/classlib/modules/x-tools/make/depends.properties   (with props)
Modified:
    harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml?rev=998812&r1=998811&r2=998812&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml Mon Sep 20 07:15:45 2010
@@ -17,19 +17,30 @@
 -->
 
 <project name="ANNOTATION Build" default="build" basedir=".">
-    <description>Build for ANNOTATION component</description>
+    <description>Build for X-Tools component</description>
 
     <property name="hy.module" value="x-tools" />
     <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="-build-no-check"/>
+    <target name="build" depends="check-depends,-build-no-check"/>
     <target name="-build-no-check" depends="-build-jar,-test-jar"
             if="build.x.tools" />
 
+    <target name="check-depends" unless="skip.java.build">
+        <check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
+        <copy file="${ecj.jar}" todir="${hy.jdk}/lib" />
+    </target>
+
+    <target name="fetch-depends" unless="skip.java.build">
+        <mkdir dir="${ecj.dir}" />
+        <download-one-file src="${ecj.url}" dest="${ecj.jar}" md5="${ecj.md5}"/>
+    </target>
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>

Added: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/make/depends.properties?rev=998812&view=auto
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/make/depends.properties (added)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/make/depends.properties Mon Sep 20 07:15:45 2010
@@ -0,0 +1,22 @@
+# 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
+eclipse.base=http://download.eclipse.org/eclipse/downloads/drops
+ecj.ver=3.5.1
+ecj.dir=${depends.jars}/ecj_${ecj.ver}
+ecj.jar=${ecj.dir}/ecj-${ecj.ver}.jar
+ecj.url=${eclipse.base}/R-${ecj.ver}-200909170800/ecj-${ecj.ver}.jar
+ecj.md5=3ad7eff5648879a38729d679022925e9

Propchange: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native