harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r801361 - in /harmony/enhanced/classlib/trunk: make/build-test.xml make/depends.properties make/depends.xml modules/sql/build.xml modules/sql/make/depends.properties modules/sql/make/run-test.xml
Date Wed, 05 Aug 2009 18:59:36 GMT
Author: hindessm
Date: Wed Aug  5 18:59:35 2009
New Revision: 801361

URL: http://svn.apache.org/viewvc?rev=801361&view=rev
Log:
Push derby.jar dependency down to sql module and copy to hdk sub-dir.

Added:
    harmony/enhanced/classlib/trunk/modules/sql/make/depends.properties   (with props)
Modified:
    harmony/enhanced/classlib/trunk/make/build-test.xml
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml
    harmony/enhanced/classlib/trunk/modules/sql/build.xml
    harmony/enhanced/classlib/trunk/modules/sql/make/run-test.xml

Modified: harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=801361&r1=801360&r2=801361&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-test.xml Wed Aug  5 18:59:35 2009
@@ -105,12 +105,9 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
         <copy todir="${hy.hdk}/build/test"> 
-        <fileset dir="${jetty.dir}">
-            <include name="*.jar" />
-        </fileset>
-        <fileset dir="${derby.dir}">
-            <include name="*.jar" />
-        </fileset>
+            <fileset dir="${jetty.dir}">
+                <include name="*.jar" />
+            </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=801361&r1=801360&r2=801361&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Wed Aug  5 18:59:35 2009
@@ -95,11 +95,6 @@
 dejavu-fonts.url=${sf.base}/dejavu/dejavu-ttf-2.18-1.zip
 dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
 
-derby.dir=${depends.jars}/derby-10.3.1.4
-derby.jar=${derby.dir}/derby.jar
-derby.url=${maven2.base}/org/apache/derby/derby/10.3.1.4/derby-10.3.1.4.jar
-derby.md5=f28d6047ab26445de53c4c96126494df
-
 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=801361&r1=801360&r2=801361&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Wed Aug  5 18:59:35 2009
@@ -42,7 +42,6 @@
         <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="${icu4j.url}" dest="${icu4j.jar}" />
         <check-one-file src="${icu4j-charsets.url}" dest="${icu4j-charsets.jar}" />
   
     </target>
@@ -167,11 +166,6 @@
     <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="${icu4j.dir}" />
     <download-one-file src="${icu4j.url}"
                        dest="${icu4j.jar}"

Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=801361&r1=801360&r2=801361&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Wed Aug  5 18:59:35 2009
@@ -21,11 +21,25 @@
 
     <property name="hy.module" value="sql" />
     <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">
+        <check-one-file src="${derby.url}" dest="${derby.jar}" />
+    </target>
+
+    <target name="fetch-depends">
+        <mkdir dir="${derby.dir}" />
+        <download-one-file src="${derby.url}" dest="${derby.jar}"
+                           md5="${derby.md5}" />
+    </target>
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -45,6 +59,7 @@
         <delete file="${hy.jdk}/jre/lib/boot/sql.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sql-src.jar" />
         <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete dir="${hy.hdk}/build/test/derby" /> 
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -133,8 +148,13 @@
             <fileset dir="src/test/resources" />
         </copy>
         
-        <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
-        <copy file="../../${derby.jar}" todir="${hy.hdk}/build/test" />
+        <copy file="${junit.jar}" todir="${hy.hdk}/build/test" />
+
+        <copy todir="${hy.hdk}/build/test/derby"> 
+            <fileset dir="${derby.dir}">
+                <include name="*.jar" />
+            </fileset>
+        </copy>
     </target>
 
     <target name="compile-tests">

Added: harmony/enhanced/classlib/trunk/modules/sql/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/make/depends.properties?rev=801361&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/make/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/modules/sql/make/depends.properties Wed Aug  5 18:59:35
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.
+
+depends.jars=${depends.dir}/jars
+maven2.base=http://repo1.maven.org/maven2
+derby.dir=${depends.jars}/derby-10.3.1.4
+derby.jar=${derby.dir}/derby.jar
+derby.url=${maven2.base}/org/apache/derby/derby/10.3.1.4/derby-10.3.1.4.jar
+derby.md5=f28d6047ab26445de53c4c96126494df

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

Modified: harmony/enhanced/classlib/trunk/modules/sql/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/make/run-test.xml?rev=801361&r1=801360&r2=801361&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/make/run-test.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/make/run-test.xml Wed Aug  5 18:59:35 2009
@@ -35,7 +35,7 @@
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="sql" jar="sql_tests.jar">
             <junit-elements>
-                <classpath location="../derby.jar" />
+                <classpath location="../derby/derby.jar" />
                 <classpath location="resources" />
             </junit-elements>
         </run-hdk-tests>



Mime
View raw message