harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r658647 - in /harmony/enhanced: common_resources/trunk/make/ drlvm/trunk/make/ jdktools/trunk/ jdktools/trunk/make/ jdktools/trunk/modules/jpda/ jdktools/trunk/modules/samsa/ jdktools/trunk/modules/tools/
Date Wed, 21 May 2008 12:21:20 GMT
Author: varlax
Date: Wed May 21 05:21:20 2008
New Revision: 658647

URL: http://svn.apache.org/viewvc?rev=658647&view=rev
Log:
Moved jdktools to common_resources dependencies;
renamed hy.jdk -> jdktools.deploy.dir for consistency

Modified:
    harmony/enhanced/common_resources/trunk/make/depends.properties
    harmony/enhanced/drlvm/trunk/make/depends.properties
    harmony/enhanced/jdktools/trunk/build.xml
    harmony/enhanced/jdktools/trunk/make/build-java.xml
    harmony/enhanced/jdktools/trunk/make/build-native.xml
    harmony/enhanced/jdktools/trunk/make/build-test.xml
    harmony/enhanced/jdktools/trunk/make/depends.properties
    harmony/enhanced/jdktools/trunk/make/depends.xml
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
    harmony/enhanced/jdktools/trunk/modules/tools/build.xml

Modified: harmony/enhanced/common_resources/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/depends.properties?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/depends.properties (original)
+++ harmony/enhanced/common_resources/trunk/make/depends.properties Wed May 21 05:21:20 2008
@@ -18,11 +18,24 @@
 
 maven2.base=http://repo1.maven.org/maven2
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
+eclipse.base=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500
 
 junit.jar=${depends.jars}/junit_3.8.2/junit.jar
 junit.jar.url=${maven2.base}/junit/junit/3.8.2/junit-3.8.2.jar
 junit.jar.md5=28e7eb9eeefe31a657c68755bfccc541
 
+ecj.jar=${depends.jars}/ecj_3.3/ecj_3.3.jar
+ecj.jar.url=${eclipse.base}/ecj.jar
+ecj.jar.md5=412d8badd227807ef2f52608435240fb
+
+# Cpptasks, version 1.0 beta 3 or above
+# http://sourceforge.net/project/showfiles.php?group_id=36177
+cpptasks=${depends.jars}/cpptasks-1.0b4/cpptasks.zip
+cpptasks.jar=${depends.jars}/cpptasks-1.0b4/cpptasks.jar
+cpptasks.unzip.path=cpptasks-1.0b4/cpptasks.jar
+cpptasks.url=http://puzzle.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip
+cpptasks.md5=118e601b58a48519208efa9893c7c5c0
+
 icuhdr=${depends.oss}/icu4c/icu4c-3.4-harmony-includes.zip
 icuhdr.url=${depends.url}/oss/icu4c-3.4-harmony-includes.zip
 icuhdr.md5=46dbe39e5f6c4ea206a9daad9e29f8b0

Modified: harmony/enhanced/drlvm/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/depends.properties?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/depends.properties (original)
+++ harmony/enhanced/drlvm/trunk/make/depends.properties Wed May 21 05:21:20 2008
@@ -13,14 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Cpptasks, version 1.0 beta 3 or above
-# http://sourceforge.net/project/showfiles.php?group_id=36177
-cpptasks=${depends.jars}/cpptasks-1.0b4/cpptasks.zip
-cpptasks.jar=${depends.jars}/cpptasks-1.0b4/cpptasks.jar
-cpptasks.unzip.path=cpptasks-1.0b4/cpptasks.jar
-cpptasks.url=http://puzzle.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip
-cpptasks.md5=118e601b58a48519208efa9893c7c5c0
-
 # ANother Tool for Language Recognition v2.7.5. generics parser dependency
 antlr=${depends.jars}/antlr-2.7.5/antlr-2.7.5.jar
 antlr.url=http://issues.apache.org/jira/secure/attachment/12358381/antlr-2.7.5.jar

Modified: harmony/enhanced/jdktools/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/build.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/build.xml Wed May 21 05:21:20 2008
@@ -165,24 +165,18 @@
         </ant>
     </target>
 
-
     <target name="check-depends"
             description="Report on whether the dependencies are met">
-        <ant antfile="make/depends.xml" inheritall="false" target="check">
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+        <ant antfile="make/depends.xml" target="check"/>
     </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">
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+        <ant antfile="make/depends.xml" target="fetch"/>
     </target>
 
     <target name="properties" depends="tools-echo"
-        description="Display the properties that are use in the ant build files"
-            />
+        description="Display the properties that are use in the ant build files"/>
 
 </project>
 

Modified: harmony/enhanced/jdktools/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-java.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-java.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-java.xml Wed May 21 05:21:20 2008
@@ -52,11 +52,11 @@
 
     <target name="-layout" depends="-prepare-depends">
         <!-- Create the target directory structure -->
-        <mkdir dir="${hy.jdk}/jre/bin" />
-        <mkdir dir="${hy.jdk}/bin" />
+        <mkdir dir="${jdktools.deploy.dir}/jre/bin" />
+        <mkdir dir="${jdktools.deploy.dir}/bin" />
 
         <!-- Copy across the jdk/lib dependency jars -->
-        <copy todir="${hy.jdk}/lib" flatten="yes">
+        <copy todir="${jdktools.deploy.dir}/lib" flatten="yes">
             <fileset file="${ecj.jar}" />
         </copy>
     </target>
@@ -64,7 +64,7 @@
 
     <target name="-clean-layout">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${hy.jdk}">
+            <fileset dir="${jdktools.deploy.dir}">
                 <exclude name="jre/bin/default/**" />
                 <exclude name="jre/bin/**" />
                 <exclude name="jre/lib/ext/**" />

Modified: harmony/enhanced/jdktools/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-native.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-native.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-native.xml Wed May 21 05:21:20 2008
@@ -31,7 +31,7 @@
     <property name="depends.build" location="depends/build" />
     <property name="depends.libs" location="depends/libs/${hy.platform}" />
     <property name="depends.files" location="depends/files" />
-    <property name="native.lib.target" location="${hy.jdk}/lib" />
+    <property name="native.lib.target" location="${jdktools.deploy.dir}/lib" />
 
     <target name="build" depends="-layout, build-modules" />
 
@@ -51,14 +51,14 @@
         description="Construct the correct directory structure for native binaries">
 
     	<!-- Create the target directory structure -->
-        <mkdir dir="${hy.jdk}/jre/bin" />
-        <mkdir dir="${hy.jdk}/include" />
+        <mkdir dir="${jdktools.deploy.dir}/jre/bin" />
+        <mkdir dir="${jdktools.deploy.dir}/include" />
     	<mkdir dir="${native.lib.target}"/>
     </target>
 
     <target name="-clean-layout">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${hy.jdk}">
+            <fileset dir="${jdktools.deploy.dir}">
                 <include name="**/bin/java${exe.suffix}" />
                 <include name="**/bin/javaw${exe.suffix}" />
                 <include name="**/bin/*${shlib.suffix}*" />

Modified: harmony/enhanced/jdktools/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-test.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-test.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-test.xml Wed May 21 05:21:20 2008
@@ -30,7 +30,7 @@
     <condition property="not.copy.jre">
         <isset property="test.jre.home"/>
     </condition>
-    <property name="test.jre.home" location="${hy.jdk}" />
+    <property name="test.jre.home" location="${jdktools.deploy.dir}" />
 
     <property name="tests.build.output" location="build/tests" />
     <property name="tests.depends.jars" location="${hy.hdk}/jdk/jre/lib/boot" />
@@ -97,17 +97,17 @@
     <target name="copy-jre" depends="copy-jre-files, chmod-jre-files" unless="not.copy.jre"/>
 
     <target name="copy-jre-files" unless="not.copy.jre">
-        <copy todir="${hy.jdk}/jre" overwrite="no">
+        <copy todir="${jdktools.deploy.dir}/jre" overwrite="no">
               <fileset dir="${hy.deploy}/jdk/jre" />
         </copy>
     </target>
 
     <target name="chmod-jre-files" if="is.unix" unless="not.copy.jre">
-        <chmod file="${hy.jdk}/jre/bin/java" perm="ugo+x" />
+        <chmod file="${jdktools.deploy.dir}/jre/bin/java" perm="ugo+x" />
     </target>
 
     <target name="clean-jre">
-        <delete dir="${hy.jdk}/jre" />
+        <delete dir="${jdktools.deploy.dir}/jre" />
     </target>
 
     <target name="process-empty" depends="-check-for-empty, -process-empty"/>

Modified: harmony/enhanced/jdktools/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/depends.properties?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/depends.properties (original)
+++ harmony/enhanced/jdktools/trunk/make/depends.properties Wed May 21 05:21:20 2008
@@ -13,34 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.dir=${external.resources}/depends
-depends.jars=${depends.dir}/jars
-maven2.base=http://repo1.maven.org/maven2
-eclipse.base=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500
-
-ecj.dir=${depends.jars}/ecj_3.3
-ecj.jar=${ecj.dir}/ecj_3.3.jar
-ecj.url=${eclipse.base}/ecj.jar
-ecj.md5=412d8badd227807ef2f52608435240fb
-
-icu.dir=${depends.jars}/com.ibm.icu.base-3.3
-icu.zip=${icu.dir}/com.ibm.icu.base-3.3.zip
+icu=${depends.jars}/eclipse-ICU4J/com.ibm.icu.base-3.3.zip
 icu.url=${eclipse.base}/com.ibm.icu.base-3.3.zip
 icu.md5=5b8a0fc0e48431d376c7efd7be8c0f7b
-icu.jar.name=com.ibm.icu.base_3.6.1.v20070417.jar
-icu.jar=${icu.dir}/${icu.jar.name}
+icu.unzip.path=eclipse/plugins/com.ibm.icu.base_3.6.1.v20070417.jar
+icu.jar=${depends.jars}/eclipse-ICU4J/com.ibm.icu.base_3.6.1.v20070417.jar
 
-jdt.dir=${depends.jars}/eclipse-JDT-3.3
-jdt.zip=${jdt.dir}/eclipse-JDT-3.3.zip
+jdt=${depends.jars}/eclipse-JDT-3.3/eclipse-JDT-3.3.zip
 jdt.url=${eclipse.base}/eclipse-JDT-3.3.zip
 jdt.md5=7a82530972e2943a2f20cb6d3bffe0d6
-jdt.jdi.jar.name=jdi.jar
-jdt.jdi.jar=${jdt.dir}/${jdt.jdi.jar.name}
-jdt.jdimodel.jar.name=jdimodel.jar
-jdt.jdimodel.jar=${jdt.dir}/${jdt.jdimodel.jar.name}
-
-junit.dir=${depends.jars}/junit_3.8.2
-junit.jar=${junit.dir}/junit.jar
-junit.url=${maven2.base}/junit/junit/3.8.2/junit-3.8.2.jar
-junit.md5=28e7eb9eeefe31a657c68755bfccc541
-
+jdt.unzip.path=eclipse/plugins/org.eclipse.jdt.debug_*/*.jar
+jdt.jdi.jar=${depends.jars}/eclipse-JDT-3.3/jdi.jar
+jdt.jdimodel.jar=${depends.jars}/eclipse-JDT-3.3/jdimodel.jar

Modified: harmony/enhanced/jdktools/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/depends.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/depends.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/depends.xml Wed May 21 05:21:20 2008
@@ -19,204 +19,44 @@
 
  -->
 
-<project name="dependencies" default="check" basedir="..">
+<project name="jdktools-depends">
     <description>
     Confirm that dependencies are present and fetch missing dependencies
     where possible.
     </description>
+    
+    <dirname property="dd.basedir" file="${ant.file.jdktools-depends}"/>
+    <import file="${dd.basedir}/properties.xml"/>
+    
+    <target name="check">
+        <check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
+        <check-one-file src="${junit.jar.url}" dest="${junit.jar}" />
 
-    <property file="make/depends.properties" />
-    <import file="${basedir}/make/properties.xml" />
+        <poll-modules target="check-depends" dir="${jdktools.base.dir}/modules"/>
 
-    <target name="check" description="Check whether dependencies are available"
-            depends="-check" />
-
-    <target name="-check">
-        <check-one-file src="${ecj.url}" dest="${ecj.jar}" />
-        <check-one-file src="${junit.url}" dest="${junit.jar}" />
-    </target>
-
-    <target name="download" description="Download required jars"
-            depends="-download,-extract" />
-
-    <target name="-download">
-
-    <mkdir dir="${ecj.dir}" />
-    <download-one-file src="${ecj.url}" dest="${ecj.jar}"
-                           md5="${ecj.md5}" />
-        
-    <mkdir dir="${icu.dir}" />
-    <download-one-file src="${icu.url}" dest="${icu.zip}"
-                           md5="${icu.md5}" />
-        
-    <mkdir dir="${jdt.dir}" />
-    <download-one-file src="${jdt.url}" dest="${jdt.zip}"
-                           md5="${jdt.md5}" />
-        
-    <mkdir dir="${junit.dir}" />
-    <download-one-file src="${junit.url}" dest="${junit.jar}"
-                           md5="${junit.md5}" />
-
-    </target>
-
-    <target name="-extract" depends="-extract-props,-really-extract" />
-    <target name="-extract-props" depends="-extract-props-icu,-extract-props-jdt"/>
-    <target name="-really-extract" depends="-really-extract-icu,-really-extract-jdt"/>
-
-    <target name="-extract-props-icu">
-        <uptodate property="icu.uptodate"
-                  srcfile="${icu.zip}"
-                  targetfile="${icu.jar}" />
-    </target>
-    <target name="-extract-props-jdt">
-        <uptodate property="jdt.uptodate"
-                  srcfile="${jdt.zip}"
-                  targetfile="${jdt.jdi.jar}" />
-    </target>
-
-    <target name="-really-extract-icu" unless="icu.uptodate">
-        <unzip src="${icu.zip}" dest="${icu.dir}.tmp" />
-        <copy todir="${icu.dir}" flatten="yes">
-            <fileset dir="${icu.dir}.tmp/eclipse/plugins">
-                <include name="com.ibm.icu.base_*.jar"/>
-            </fileset>
-        </copy>
-        <delete dir="${icu.dir}.tmp" />
-    </target>
-    <target name="-really-extract-jdt" unless="jdt.uptodate">
-        <unzip src="${jdt.zip}" dest="${jdt.dir}.tmp" />
-        <copy todir="${jdt.dir}" flatten="yes">
-            <fileset dir="${jdt.dir}.tmp/eclipse/plugins">
-                <include name="org.eclipse.jdt.debug_*/jdi.jar"/>
-                <include name="org.eclipse.jdt.debug_*/jdimodel.jar"/>
-            </fileset>
-        </copy>
-        <delete dir="${jdt.dir}.tmp" />
-    </target>
-
-    <macrodef name="download-one-file">
-        <attribute name="src" />
-        <attribute name="dest" />
-        <attribute name="md5" />
-        <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">
-                <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
-            </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}
-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}" usetimestamp="true" 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>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>
-
-    <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" />
+        <!-- TODO define which harmony externals are needed
         <fail>
-        <condition>
-                    <and>
+            <condition>
                 <not>
-                <isset property="@{dest}.exists" />
-                        </not>
-                        <not>
-                <isset property="@{src}.exists" />
-                </not>
+                    <and>
+                    <available file="${hy.hdk}/include"/>
+                    <available file="${hy.hdk}/lib"/>
                     </and>
-        </condition>
+                </not>
+            </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}" />
+Missing dependency: pre-built class library (or HDK)
+at ${hy.hdk}. 
+You may point to the correct location via "hy.hdk" property:
+"ant -Dhy.hdk=a-hdk-root"
+        </fail-->
+    </target>
+        
+    <target name="fetch">
+        <fetch dep="junit.jar"/>
+        <fetch dep="ecj.jar"/>
+        <poll-modules target="fetch-depends" dir="${jdktools.base.dir}/modules"/>
     </target>
 
 </project>

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Wed May 21 05:21:20 2008
@@ -46,9 +46,7 @@
     </condition>
     <property name="hy.deploy" location="${external.drlvm.loc}"/>
     <property name="hy.hdk" location="${external.classlib.loc}" />
-    <property name="hy.jdk" location="deploy/jdk" />
-
-    <property file="make/depends.properties" />
+    <property name="jdktools.deploy.dir" location="${jdktools.base.dir}/deploy/jdk" />
 
     <!-- set the path root for the external resources  -->
     <property name="common.resources.loc" value="${jdktools.base.dir}/../common_resources"
/>
@@ -65,16 +63,10 @@
     <import file="${common.resources}/make/properties.xml"/>
     <import file="${common.resources}/make/depends.xml"/>
     
-
+    <property file="${jdktools.base.dir}/make/depends.properties" />
+    
     <target name="tools-echo" depends="echo"
             description="Display the properties defined by this ant file" >
-        <echo>
-JDK tools build settigns:
-            
-  hy.cflags = ${hy.cflags}
-  hy.arch.define = ${hy.arch.define}
-            
-        </echo>
     </target>
 
 </project>

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Wed May 21 05:21:20 2008
@@ -20,7 +20,6 @@
     <description>Build for JPDA component</description>
 
     <!-- import common properties -->
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
     <property name="tests.build.output" location="${basedir}/../../build/tests" />
     <import file="../../make/properties.xml" />
 
@@ -41,9 +40,18 @@
         </or>
     </fileset>
 
-    <property file="../../make/depends.properties" />
+    <target name="fetch-depends">
+        <fetch dep="jdt"/>
+        <fetch dep="icu"/>
+    </target>
+
+    <target name="check-depends">
+        <check-one-file src="${jdt.url}" dest="${jdt.jdi.jar}" />
+        <check-one-file src="${jdt.url}" dest="${jdt.jdimodel.jar}" />
+        <check-one-file src="${icu.url}" dest="${icu.jar}" />
+    </target>
 
-    <target name="build" depends="build-java, build-native" />
+    <target name="build" depends="check-depends, build-java, build-native" />
 
     <target name="clean" depends="clean-java, clean-native" />
 
@@ -63,20 +71,12 @@
 
     <target name="compile-java">
         <echo message="Compiling JPDA classes" />
-
+        <ensure-javac/>
         <mkdir dir="${hy.build}" />
-        <mkdir dir="${hy.jdk}/lib" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="${hy.jpda.src.main.java}"
-               destdir="${hy.build}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <compilerarg line="${build.compilerarg}" />
+               destdir="${hy.build}">
 
             <!-- HDK class library -->
             <classpath>
@@ -90,14 +90,14 @@
                 <pathelement path="${jdt.jdi.jar}"/>
                 <pathelement path="${jdt.jdimodel.jar}"/>
             </classpath>
-        </javac>
+        </hy.javac>
     </target>
 
     <!-- create jdtstub.jar to resolve JDI implementation dependency -->
     <target name="build-jar" depends="svn-info">
-        <mkdir dir="${hy.jdk}/lib" />
+        <mkdir dir="${jdktools.deploy.dir}/lib" />
 
-        <jar destfile="${hy.jdk}/lib/jdtstub.jar"
+        <jar destfile="${jdktools.deploy.dir}/lib/jdtstub.jar"
              manifest="${hy.jpda}/META-INF/MANIFEST.MF">
 
             <fileset refid="classes" />
@@ -110,7 +110,7 @@
             <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/lib/jdtstub-src.jar">
+        <jar destfile="${jdktools.deploy.dir}/lib/jdtstub-src.jar">
             <fileset dir="${hy.jpda.src.main.java}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -123,8 +123,8 @@
 
     <!-- copy all required jars with JDI implementation and dependent classes -->
     <target name="copy-jars">
-        <mkdir dir="${hy.jdk}/lib" />
-        <copy todir="${hy.jdk}/lib" flatten="true">
+        <mkdir dir="${jdktools.deploy.dir}/lib" />
+        <copy todir="${jdktools.deploy.dir}/lib" flatten="true">
             <fileset file="${icu.jar}"/>
             <fileset file="${jdt.jdimodel.jar}"/>
         </copy>
@@ -144,7 +144,7 @@
         <antcall target="-build-native-windows" />
 
         <!-- copy to our local jdk skeleton -->
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+        <copy todir="${jdktools.deploy.dir}/jre/bin" overwrite="yes">
             <fileset dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}">
                 <include name="*${shlib.suffix}"/>
                 <include name="*${progdb.suffix}" if="is.windows" />
@@ -164,11 +164,8 @@
     <target name="clean-java">
         <echo message="Cleaning JPDA classes" />
 
-        <delete file="${hy.jdk}/lib/jdtstub.jar" />
-        <delete file="${hy.jdk}/lib/jdtstub-src.jar" />
-
-        <delete file="${hy.jdk}/lib/${icu.jar.name}" />
-        <delete file="${hy.jdk}/lib/${jdt.jdimodel.jar.name}" />
+        <delete file="${jdktools.deploy.dir}/lib/jdtstub.jar" />
+        <delete file="${jdktools.deploy.dir}/lib/jdtstub-src.jar" />
 
         <delete includeemptydirs="true" failonerror="false">
             <!--fileset refid="classes" /-->
@@ -192,16 +189,12 @@
     <!-- Compile JDWP tests always with debug info included -->
     <target name="build-tests" >
         <echo message="Compiling JPDA tests" />
-
+        <ensure-javac/>
         <mkdir dir="${tests.build.output}/classes" />
-        <javac
+        <hy.javac
             srcdir="${hy.jpda.src.test}"
             destdir="${tests.build.output}/classes"
             sourcepath=""
-            compiler="${hy.javac.compiler}"
-            memoryMaximumSize="${hy.javac.maxmem}"
-            source="${hy.javac.source}" 
-            target="${hy.javac.target}"
             debug="on">
 
             <!-- HDK class library -->
@@ -216,7 +209,7 @@
                 <pathelement path="${tests.build.output}/classes"/>
                 <pathelement path="${junit.jar}"/>
             </classpath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="prepare-exclude">
@@ -227,7 +220,7 @@
 
     <target name="run-tests" depends="build-tests, prepare-exclude">
 
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
+        <property name="test.jre.home" value="${jdktools.deploy.dir}/jre" />
         <property name="test.jre.jvm" value="${test.jre.home}/bin/java" />
         <property name="test.debugger.jvm" value="${test.jre.jvm}" />
         <property name="test.debuggee.jvm" value="${test.jre.jvm}" />

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Wed May 21 05:21:20 2008
@@ -26,8 +26,6 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <property file="../../make/depends.properties" />
-
     <!-- filename for tests exclude list -->
     <property name="samsa.exclude.file" location="${hy.hdk}/build/jdktools.samsa.exclude"
/>
 
@@ -47,7 +45,6 @@
     <target name="-compile-native" >
 
         <echo message="Compiling SAMSA natives" />
-        <echo message="hy.drlvm=${hy.drlvm}" />
         <echo message="harmony.jdktools=${harmony.jdktools}" />
             
         <make dir="${hy.samsa.src.main.native}/samsa/${hy.os.family}" />
@@ -60,29 +57,29 @@
         <property name="hy.samsa.exe"
                   location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/samsa${exe.suffix}"
/>
 
-        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/java${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/java${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/java${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javac${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/javac${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javac${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/javac${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javah${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/javah${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javah${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/javah${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javadoc${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/javadoc${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javadoc${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/javadoc${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/keytool${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/keytool${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/keytool${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/keytool${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jarsigner${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/jarsigner${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/appletviewer${exe.suffix}"
/>
-        <chmod file="${hy.jdk}/bin/appletviewer${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/appletviewer${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/appletviewer${exe.suffix}" perm="ugo+x"
/>
 
-        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/unpack200${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/unpack200${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/unpack200${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/unpack200${exe.suffix}" perm="ugo+x" />
 
     </target>
 
@@ -91,8 +88,8 @@
         <property name="hy.javaw.exe"
                   location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/javaw${exe.suffix}"
/>
 
-        <copy file="${hy.javaw.exe}" tofile="${hy.jdk}/bin/javaw${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.javaw.exe}" tofile="${jdktools.deploy.dir}/bin/javaw${exe.suffix}"
/>
+        <chmod file="${jdktools.deploy.dir}/bin/javaw${exe.suffix}" perm="ugo+x" />
     </target>
 
     <!-- copy samsa symbol info for different tools -->
@@ -103,21 +100,21 @@
         <property name="hy.javaw.progdb"
                   location="${hy.samsa.src.main.native}/samsa/${hy.os.family}/javaw${progdb.suffix}"
/>
 
-        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/java${progdb.suffix}" />
-        <copy file="${hy.javaw.progdb}" tofile="${hy.jdk}/bin/javaw${progdb.suffix}" />
-        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javac${progdb.suffix}" />
-        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javah${progdb.suffix}" />
-        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/javadoc${progdb.suffix}"
/>
-        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/keytool${progdb.suffix}"
/>
-        <copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/jarsigner${progdb.suffix}"
/>
-    	<copy file="${hy.samsa.progdb}" tofile="${hy.jdk}/bin/unpack200${progdb.suffix}"
/>
+        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/java${progdb.suffix}"
/>
+        <copy file="${hy.javaw.progdb}" tofile="${jdktools.deploy.dir}/bin/javaw${progdb.suffix}"
/>
+        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javac${progdb.suffix}"
/>
+        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javah${progdb.suffix}"
/>
+        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/javadoc${progdb.suffix}"
/>
+        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/keytool${progdb.suffix}"
/>
+        <copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/jarsigner${progdb.suffix}"
/>
+    	<copy file="${hy.samsa.progdb}" tofile="${jdktools.deploy.dir}/bin/unpack200${progdb.suffix}"
/>
 
     </target>
 
     <!-- copy samsa configuration data for different tools -->
     <target name="-copy-native-data" >
 
-        <copy todir="${hy.jdk}/bin/data" overwrite="yes">
+        <copy todir="${jdktools.deploy.dir}/bin/data" overwrite="yes">
             <fileset dir="${hy.samsa.src.main.resources}/data/">
                 <include name="*.dat" />
             </fileset>
@@ -133,7 +130,7 @@
 
     <target name="run-tests" depends="prepare-exclude" >
 
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
+        <property name="test.jre.home" value="${jdktools.deploy.dir}/jre" />
 
         <echo message="Running SAMSA tests" />
         <echo message="test.jre.home=${test.jre.home}" />

Modified: harmony/enhanced/jdktools/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/build.xml?rev=658647&r1=658646&r2=658647&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/tools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/tools/build.xml Wed May 21 05:21:20 2008
@@ -20,10 +20,8 @@
     <description>Build for Tools component</description>
 
     <!-- import common properties -->
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
     <property name="tests.build.output" location="../../build/tests" />
     <import file="${basedir}/../../make/properties.xml" />
-    <property file="${basedir}/../../make/depends.properties" />
 
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -41,8 +39,17 @@
             </present>
         </or>
     </fileset>
+    
+    <target name="check-depends">
+        <check-one-file src="${jdt.url}" dest="${jdt.jdi.jar}" />
+    </target>
+    
+    <target name="fetch-depends">
+        <fetch dep="jdt"/>
+    </target>
+
 
-    <target name="build" depends="build-java, copy-resources, build-jar" />
+    <target name="build" depends="check-depends, build-java, copy-resources, build-jar"
/>
     <target name="build-java" depends="compile-java, copy-resources, build-jar" />
     <target name="build-native" />
 
@@ -66,8 +73,8 @@
     <target name="clean-java">
         <echo message="Cleaning TOOLS classes" />
 
-        <delete file="${hy.jdk}/lib/tools.jar" />
-        <delete file="${hy.jdk}/lib/tools-src.jar" />
+        <delete file="${jdktools.deploy.dir}/lib/tools.jar" />
+        <delete file="${jdktools.deploy.dir}/lib/tools-src.jar" />
         <delete includeemptydirs="true" failonerror="false">
             <!--fileset refid="classes" /-->
             <fileset dir="${hy.build}" />
@@ -77,20 +84,12 @@
 
     <target name="compile-java">
         <echo message="Compiling TOOLS classes" />
-
+        <ensure-javac/>
         <mkdir dir="${hy.build}" />
-        <mkdir dir="${hy.jdk}/lib" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="${hy.tools.src.main.java}"
-               destdir="${hy.build}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <compilerarg line="${build.compilerarg}" />
+               destdir="${hy.build}">
 
             <bootclasspath>
                 <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
@@ -104,7 +103,7 @@
             <classpath>
                 <pathelement path="${jdt.jdi.jar}"/>
             </classpath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="copy-resources">
@@ -117,9 +116,9 @@
     </target>
 
     <target name="build-jar" depends="svn-info">
-        <mkdir dir="${hy.jdk}/lib" />
+        <mkdir dir="${jdktools.deploy.dir}/lib" />
 
-        <jar destfile="${hy.jdk}/lib/tools.jar"
+        <jar destfile="${jdktools.deploy.dir}/lib/tools.jar"
              manifest="${hy.tools}/META-INF/MANIFEST.MF">
 
             <fileset refid="classes" />
@@ -136,7 +135,7 @@
             <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/lib/tools-src.jar">
+        <jar destfile="${jdktools.deploy.dir}/lib/tools-src.jar">
             <fileset dir="${hy.tools.src.main.java}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -149,17 +148,13 @@
 
     <target name="build-tests">
         <echo message="Compiling TOOLS tests" />
-
+        <ensure-javac/>
         <mkdir dir="${tests.build.output}/classes" />
 
-        <javac srcdir="${hy.tools.src.test.java}"
+        <hy.javac srcdir="${hy.tools.src.test.java}"
                destdir="${tests.build.output}/classes"
                sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               debug="on">
 
             <bootclasspath>
                 <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
@@ -167,14 +162,14 @@
                 </fileset>
             </bootclasspath>
             <classpath>
-                <pathelement path="${hy.jdk}/lib/tools.jar"/>
+                <pathelement path="${jdktools.deploy.dir}/lib/tools.jar"/>
                 <pathelement path="${junit.jar}"/>
             </classpath>
             <classpath location="${tests.build.output}/classes" />
 
             <!-- temporarely exclude one test that breaks compilation -->
             <exclude name="**/javah/Test02.java"/>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="prepare-exclude">
@@ -185,7 +180,7 @@
 
     <target name="run-tests" depends="build-tests, prepare-exclude">
 
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
+        <property name="test.jre.home" value="${jdktools.deploy.dir}/jre" />
 
         <echo message="Running TOOLS tests" />
         <echo message="test.jre.home=${test.jre.home}" />
@@ -206,7 +201,7 @@
 
             <classpath>
                 <pathelement path="${tests.build.output}/classes"/>
-                <pathelement path="${hy.jdk}/lib/tools.jar"/>
+                <pathelement path="${jdktools.deploy.dir}/lib/tools.jar"/>
             </classpath>
 
             <formatter type="xml" />



Mime
View raw message