harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r480397 - in /harmony/enhanced/jdktools/trunk: build.xml make/build-java.xml make/depends.properties
Date Wed, 29 Nov 2006 04:33:59 GMT
Author: geirm
Date: Tue Nov 28 20:33:58 2006
New Revision: 480397

URL: http://svn.apache.org/viewvc?view=rev&rev=480397
Log:
more tweaks to the build to work with dependencies
in "common_resources"

Modified:
    harmony/enhanced/jdktools/trunk/build.xml
    harmony/enhanced/jdktools/trunk/make/build-java.xml
    harmony/enhanced/jdktools/trunk/make/depends.properties

Modified: harmony/enhanced/jdktools/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/build.xml?view=diff&rev=480397&r1=480396&r2=480397
==============================================================================
--- harmony/enhanced/jdktools/trunk/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/build.xml Tue Nov 28 20:33:58 2006
@@ -25,7 +25,7 @@
 
     <target name="help">
         <echo>
-Apache Harmony Ant Build
+Apache Harmony JDK Tools Build
 
 Usage:
 
@@ -48,9 +48,16 @@
         </echo>
     </target>
 
-    <property file="${user.home}/.harmony-classlib.properties" />
+    <property file="jdktools.properties"/>
+    <property file="${user.home}/jdktools.properties"/>
+    
+    <!-- set the path root for the classlib : must be relative to the build directory
-->
+    <property name="external.HDK.loc" value="../working_classlib/deploy" />
+    <property name="external.resources.loc" value="../common_resources" />
 
-    <property name="hy.hdk" location="deploy" />
+    <property name="external.resources" location="${external.resources.loc}" />
+
+    <property name="hy.hdk" location="${external.HDK.loc}" />
     <property name="hy.jdk" location="deploy/jdk" />
 
     <!-- import properties for snapshot targets -->
@@ -93,6 +100,7 @@
         </echo>
         <ant antfile="make/build-java.xml" inheritall="false" target="build">
             <property name="hy.hdk" value="${hy.hdk}"/>
+            <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
@@ -167,7 +175,10 @@
 
     <target name="check-depends"
             description="Report on whether the dependencies are met">
-        <ant antfile="make/depends.xml" inheritall="false" target="check" />
+        <echo>WOOGIE : ${external.resources}</echo>
+        <ant antfile="make/depends.xml" inheritall="false" target="check">
+            <property name="external.resources" value="${external.resources}"/>
+        </ant>
     </target>
 
     <target name="fetch-depends"

Modified: harmony/enhanced/jdktools/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-java.xml?view=diff&rev=480397&r1=480396&r2=480397
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-java.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-java.xml Tue Nov 28 20:33:58 2006
@@ -29,7 +29,7 @@
     <import file="${basedir}/make/properties.xml" />
 
     <property name="build.output" location="build/classes" />
-    <property name="depends.jars" location="depends/jars" />
+    <property name="depends.jars" location="${external.resources}/depends/jars" />
     <property name="depends.manifests" location="depends/manifests" />
     <property name="depends.files" location="depends/files" />
     <property name="hy.hdk" location="deploy" />
@@ -130,7 +130,7 @@
 
         <!-- Create the structure -->
         <mkdir dir="${hy.jdk}/jre/bin" />
-
+            
         <!-- Copy across the jdk/lib dependency jars -->
         <copy todir="${hy.jdk}/lib" flatten="yes">
             <fileset file="${ecj.jar}" />
@@ -162,8 +162,9 @@
          ================================= --> 
     <target name="-prepare-depends">
 
-        <ant antfile="make/depends.xml" inheritall="false" target="check"/>
-
+        <ant antfile="make/depends.xml" inheritall="false" target="check">
+            <property name="external.resources" value="${external.resources}"/>
+       </ant>
     </target>
 
 </project>

Modified: harmony/enhanced/jdktools/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/depends.properties?view=diff&rev=480397&r1=480396&r2=480397
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/depends.properties (original)
+++ harmony/enhanced/jdktools/trunk/make/depends.properties Tue Nov 28 20:33:58 2006
@@ -13,9 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.dir=depends
+depends.dir=${external.resources}/depends
 depends.jars=${depends.dir}/jars
-ibiblio.base=http://www.ibiblio.org
 
 ecj.dir=${depends.jars}/ecj_3.2
 ecj.jar=${ecj.dir}/ecj_3.2.jar



Mime
View raw message