harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r650111 - in /harmony/enhanced/jdktools/trunk: build.xml make/build-java.xml make/build-native.xml make/build-test.xml make/properties.xml
Date Mon, 21 Apr 2008 11:38:04 GMT
Author: varlax
Date: Mon Apr 21 04:38:01 2008
New Revision: 650111

URL: http://svn.apache.org/viewvc?rev=650111&view=rev
Log:
Moving jdktools to common properties

Modified:
    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/properties.xml

Modified: harmony/enhanced/jdktools/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/build.xml?rev=650111&r1=650110&r2=650111&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/build.xml Mon Apr 21 04:38:01 2008
@@ -23,6 +23,8 @@
     	Build jdktools
     </description>
 
+    <import file="make/properties.xml"/>
+        
     <target name="help">
         <echo>
 Apache Harmony Ant Build
@@ -56,69 +58,20 @@
 
         </echo>
     </target>
-
-    <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.classlib.loc" value="../working_classlib/deploy" />
-    <property name="external.drlvm.loc" value="../working_vm/deploy" />
-    <property name="external.resources.loc" value="../common_resources" />
-
-    <property name="external.resources" location="${external.resources.loc}" />
-
-    <property name="harmony.jdktools" location="${basedir}"/>
-
-    <condition property="hy.deploy" value="${hy.hdk}">
-        <isset property="hy.hdk"/>
-    </condition>
-    <property name="hy.deploy" location="${external.drlvm.loc}"/>
-
-    <property name="hy.hdk" location="${external.classlib.loc}" />
-    <property name="hy.drlvm" location="${external.drlvm.loc}" />
-    <property name="hy.jdk" location="deploy/jdk" />
-
-    <!-- import properties for snapshot targets -->
-    <import file="${basedir}/make/properties.xml" />
-
-    <!-- ================================
-	 target : rebuild
-	     
-	 builds with a clean first
-	 ================================= -->
     <target name="rebuild" depends="clean,build"
         description="Performs a full build - that is 'clean' then 'build'" />
-	
-    <!-- ================================
-	 target : build
-	     
-	 builds with w/o clean
-	 ================================= -->
+
     <target name="build" depends="build-java,build-native"
         description="Compiles the java and native code to produce a jdk">
     </target>
 
-    <!-- ================================
-	 target : clean
-	     
-	 removes all generated files
-	 ================================= -->
     <target name="clean" depends="clean-java,clean-native,clean-tests"
             description="Removes all the files generated by a build" />
 
-    <!-- ================================
-	 target : rebuild-java
-	     
-	 builds java source with a clean first
-	 ================================= -->
     <target name="rebuild-java" depends="clean-java,build-java"
             description="Like 'rebuild' but for java code only" />
 
-    <!-- ================================= 
-          target: build-java              
-
-          runs the build target in build-java.xml
-         ================================= -->
     <target name="build-java" 
             description="Compiles the java code only" >
         <echo>
@@ -129,17 +82,11 @@
         <ant antfile="make/build-java.xml" inheritall="false" target="build">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================= 
-          target: clean-java              
-
-          runs the clean target in build-java.xml
-         ================================= -->
     <target name="clean-java" 
             description="Removes the compiled java code" >
         <echo>
@@ -150,25 +97,14 @@
         <ant antfile="make/build-java.xml" inheritall="false" target="clean">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================
-	 target : rebuild-native
-	     
-	 builds native source with a clean first
-	 ================================= -->
     <target name="rebuild-native" depends="clean-native,build-native"
             description="Like 'rebuild' but for native code only" />
 
-    <!-- ================================= 
-          target: build-native             
-
-          runs the build target in build-native.xml
-         ================================= -->
     <target name="build-native" 
             description="Compiles the native code only" >
         <echo>
@@ -179,17 +115,11 @@
         <ant antfile="make/build-native.xml" inheritall="false" target="build">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================= 
-          target: clean-native              
-
-          runs the clean target in build-native.xml
-         ================================= -->
     <target name="clean-native"
         description="Removes the compiled native code" >
         <echo>
@@ -200,17 +130,11 @@
         <ant antfile="make/build-native.xml" inheritall="false" target="clean">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================= 
-          target: clean-tests              
-
-          runs the clean target in build-tests.xml
-         ================================= -->
     <target name="clean-tests"
         description="Removes the compiled tests and results" >
         <echo>
@@ -221,17 +145,11 @@
         <ant antfile="make/build-test.xml" inheritall="false" target="clean">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-	    <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================= 
-          target: test              
-
-          runs the test-all target in build-test.xml
-         ================================= -->
     <target name="test"
             description="Runs all tests">
         <echo>
@@ -242,26 +160,12 @@
         <ant antfile="make/build-test.xml" inheritall="false" target="test-all">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-	    <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
-	    <property name="hy.deploy" value="${hy.deploy}"/>
         </ant>
     </target>
 
 
-    <!-- ================================= 
-          target: -properties
-         ================================= -->
-    <target name="-properties" depends="svn-prop">
-        <property name="deploy.file.prefix"
-                  value="incubator-harmony-classlib-r${svn.revision}" />
-        <property name="deploy.tar"
-                  value="${deploy.file.prefix}-${hy.os}-${hy.arch}-snapshot.tar.gz" />
-        <property name="deploy.zip"
-                  value="${deploy.file.prefix}-${hy.os}-${hy.arch}-snapshot.zip" />
-    </target>
-
     <target name="check-depends"
             description="Report on whether the dependencies are met">
         <ant antfile="make/depends.xml" inheritall="false" target="check">
@@ -276,20 +180,9 @@
         </ant>
     </target>
 
-    <target name="properties" depends="echo"
+    <target name="properties" depends="tools-echo"
         description="Display the properties that are use in the ant build files"
             />
-
-    <macrodef name="chksum">
-        <attribute name="file" />
-        <attribute name="type" default="md5" />
-        <sequential>
-            <checksum property="@{file}.@{type}" file="@{file}"
-                      algorithm="@{type}" />
-            <echo file="@{file}.@{type}"
-                  message="${@{file}.@{type}}  @{file}${line.separator}" />
-        </sequential>
-    </macrodef>
 
 </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=650111&r1=650110&r2=650111&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-java.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-java.xml Mon Apr 21 04:38:01 2008
@@ -32,64 +32,27 @@
     <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" />
-    <property name="hy.jdk" location="deploy/jdk" />
-    <property file="make/depends.properties" />
 
-
-    <!-- ================================= 
-          target: build
-         ================================= -->
     <target name="build" depends="-layout, build-modules"
             description="Compile Java source in modules and construct deploy directory."
/>
 
-    <!-- ================================= 
-          target: clean            
-         ================================= -->
     <target name="clean" depends="clean-modules, -clean-layout"
         description="Remove binaries generated by modules and delete the deploy directory."/>
 
-    <!-- =================================
-          target: clean-modules
-          invokes target clean-java for all modules
-         ================================= -->
     <target name="clean-modules">
         <call-modules target="clean-java" />
     </target>
 
-    <!-- =================================
-          target: build-modules
-          invokes target build-java for all modules
-         ================================= -->
     <target name="build-modules" depends="-prepare-depends">
-            <fail>
-                <condition>
-                    <and>
-                        <equals arg1="${hy.javac.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-                        <not>
-                            <available classname="${hy.javac.compiler}"/>
-                        </not>
-                    </and>
-                </condition>
-The Eclipse compiler class for Ant could not be found. Please place the ECJ JAR in ANT_HOME/lib.
-The JAR can be downloaded directly from eclipse.org or copied from COMMON_RESOURCES/depends/jars/ecj_3.x
folder after the fetch-depends target for JDKTOOLS has been run.
-Alternatively, you can switch to another compiler, e.g. specify '-Dhy.javac.compiler=modern'
for classic javac.                
-            </fail>
+        <ensure-javac/>
         <mkdir dir="${build.output}" />
         <call-modules target="build-java" />
     </target>
 
 
-    <!-- ================================= 
-          target: -layout              
-          Construct the correct directory structure for the class libs
-         ================================= -->
     <target name="-layout" depends="-prepare-depends">
-
-        <!-- Create the structure -->
+        <!-- Create the target directory structure -->
         <mkdir dir="${hy.jdk}/jre/bin" />
-
-        <!-- Create the structure -->
         <mkdir dir="${hy.jdk}/bin" />
 
         <!-- Copy across the jdk/lib dependency jars -->
@@ -99,9 +62,6 @@
     </target>
 
 
-    <!-- ================================= 
-          target: -clean-layout              
-         ================================= -->
     <target name="-clean-layout">
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${hy.jdk}">
@@ -109,19 +69,10 @@
                 <exclude name="jre/bin/**" />
                 <exclude name="jre/lib/ext/**" />
             </fileset>
-            <!--fileset dir="${hy.hdk}">
-                <include name="LICENSE" />
-                <include name="NOTICE" />
-            </fileset-->
         </delete>
     </target>
 
-    <!-- =================================
-         target: -prepare-depends
-         Check for jars required to compile prefs
-         ================================= --> 
     <target name="-prepare-depends">
-
         <ant antfile="make/depends.xml" inheritall="false" target="check">
             <property name="external.resources" value="${external.resources}"/>
         </ant>

Modified: harmony/enhanced/jdktools/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-native.xml?rev=650111&r1=650110&r2=650111&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-native.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-native.xml Mon Apr 21 04:38:01 2008
@@ -28,52 +28,25 @@
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
 
-    <property file="make/depends.properties" />
-
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="deploy/jdk" />
     <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" />
 
-    <!-- ================================= 
-          target: build
-         ================================= -->
-    <target name="build"
-        depends="-layout, build-modules" />
-
-
-    <!-- ================================= 
-          target: clean              
-         ================================= -->
-    <target name="clean"
-        depends="clean-modules, -clean-layout" />
-
-
-    <!-- ================================= 
-          target: build-modules
-          invokes target build-native for all modules              
-         ================================= -->
+    <target name="build" depends="-layout, build-modules" />
+
+    <target name="clean" depends="clean-modules, -clean-layout" />
+
     <target name="build-modules" >
     	<mkdir dir="${native.lib.target}" />
         <call-modules target="build-native" />
     </target>
 
-
-    <!-- ================================= 
-          target: clean-modules              
-          invokes target calean-native for all modules              
-         ================================= -->
     <target name="clean-modules" >
         <call-modules target="clean-native" />
     	<delete dir="${native.lib.target}" />
     </target>
 
-
-    <!-- ================================= 
-          target: -layout              
-         ================================= -->
     <target name="-layout"
         description="Construct the correct directory structure for native binaries">
 
@@ -83,9 +56,6 @@
     	<mkdir dir="${native.lib.target}"/>
     </target>
 
-    <!-- ================================= 
-          target: -clean-layout              
-         ================================= -->
     <target name="-clean-layout">
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${hy.jdk}">

Modified: harmony/enhanced/jdktools/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-test.xml?rev=650111&r1=650110&r2=650111&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-test.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-test.xml Mon Apr 21 04:38:01 2008
@@ -25,10 +25,7 @@
     <import file="${basedir}/make/properties.xml" />
 
     <!-- set global properties for this build. -->
-
     <property name="tests.output" location="build/test_report" />
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
 
     <condition property="not.copy.jre">
         <isset property="test.jre.home"/>
@@ -37,7 +34,6 @@
 
     <property name="tests.build.output" location="build/tests" />
     <property name="tests.depends.jars" location="${hy.hdk}/jdk/jre/lib/boot" />
-    <property file="make/depends.properties" />
 
     <!-- this list of components to test will grow to eventually be all modules -->
     <target name="test-all"

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?rev=650111&r1=650110&r2=650111&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Mon Apr 21 04:38:01 2008
@@ -19,387 +19,62 @@
 
  -->
 
-<project name="Top-Level property definitions" default="echo" basedir="..">
+<project name="Top-Level property definitions">
     <description>
         Ant file of common properties to be imported by other ant files
     </description>
-
-    <!-- Debug or release version -->
-    <property name="hy.cfg" value="debug" />
-
-    <!-- Javac properties -->
-    <!-- Explicitly set to ECJ as the default compiler. -->
-    <property name="hy.javac.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"
/>
-    <property name="hy.javac.source" value="1.5" />
-    <property name="hy.javac.target" value="1.5" />
-    <property name="hy.javac.maxmem" value="384M" />
-
-    <condition property="hy.javac.debug" value="on" else="off">
-        <equals arg1="${hy.cfg}" arg2="debug" />
-    </condition>
-
-    <!-- Local variable tables should be available in debug, and unavailable in release
modes. -->
-    <condition property="build.compilerarg" value="-nowarn -g" else="-nowarn -g:lines,source">
-        <equals arg1="${hy.cfg}" arg2="debug" />
-    </condition>
+    
+    <dirname property="prop.imported.basedir" file="${ant.file.Top-Level property definitions}"/>
+    <property name="jdktools.base.dir" location="${prop.imported.basedir}/.." />
+    
+    <property file="jdktools.properties"/>
+    <property file="${user.home}/jdktools.properties"/>
 
     <!-- Test run property -->
     <property name="hy.test.forkmode" value="perBatch" />
-    <property name="hy.test.timeout" value="900000" />
-    <property name="hy.test.vm.name" value="drl" />
-    <property name="hy.test.vmargs" value="" />
-
-    <!-- Conditions for operating systems -->
-    <condition property="is.windows">
-        <os family="Windows" />
-    </condition>
-    <condition property="is.linux">
-        <os name="linux" />
-    </condition>
-    <condition property="is.macosx">
-        <os name="mac os x" />
-    </condition>
-    <condition property="is.freebsd">
-        <os name="freebsd" />
-    </condition>
-    <condition property="is.aix">
-        <os name="aix" />
-    </condition>
-    <condition property="is.unix">
-        <os family="unix" />
-    </condition>
-
-    <!-- Normalized operating system family -->
-    <condition property="hy.os.family" value="windows">
-        <isset property="is.windows" />
-    </condition>
-    <property name="hy.os.family" value="unix" />
-
-    <!-- Normalized operating system name -->
-
-    <!-- this special case makes sense -->
-    <condition property="hy.os" value="windows">
-        <isset property="is.windows"/>
-    </condition>
-    <condition property="hy.os" value="linux">
-        <os name="linux" />
-    </condition>
-    <condition property="hy.os" value="freebsd">
-        <os name="freebsd" />
-    </condition>
-    <condition property="hy.os" value="macosx">
-        <isset property="is.macosx"/>
-    </condition>
-    <condition property="hy.os" value="aix">
-        <os name="aix" />
-    </condition>
-
-    <property name="hy.os" value="${os.name}" />
-
-
-    <!-- Conditions for different architectures -->
-    <condition property="is.x86_64">
-        <or>
-            <equals arg1="x86_64" arg2="${os.arch}"/>
-            <equals arg1="amd64" arg2="${os.arch}"/>
-        </or>
-    </condition>
-    <condition property="is.x86">
-	<and>
-	    <not>
-        <isset property="is.x86_64" />
-            </not>
-            <or>
-                <equals arg1="x86" arg2="${os.arch}"/>
-                <equals arg1="i386" arg2="${os.arch}"/>
-                <equals arg1="i686" arg2="${os.arch}"/>
-            </or>
-        </and>
-    </condition>
-    <condition property="is.ia64">
-        <equals arg1="ia64" arg2="${os.arch}"/>
-    </condition>
-    <condition property="is.64bit">
-        <or>
-            <isset property="is.ia64" />
-            <isset property="is.x86_64" />
-        </or>
-    </condition>
-    <condition property="is.32bit">
-        <or>
-            <isset property="is.x86" />
-        </or>
-    </condition>
-    <condition property="hy.bits" value="32">
-        <isset property="is.32bit" />
-    </condition>
-    <property name="hy.bits" value="64" />
+    <property name="hy.test.vm.name" value="drl"/>
 
-    <!-- Normalized architecture name -->
-    <condition property="hy.arch" value="x86_64">
-        <isset property="is.x86_64" />
-    </condition>
-    <condition property="hy.arch" value="x86">
-        <and>
-            <isset property="is.x86" />
-            <isset property="is.32bit" />
-        </and>
-    </condition>
-    <property name="hy.arch" value="${os.arch}" />
+    <!-- set the path root for the classlib : must be relative to the build directory
-->
+    <property name="external.classlib.loc" value="${jdktools.base.dir}/../working_classlib/deploy"
/>
+    <property name="external.drlvm.loc" value="${jdktools.base.dir}/../working_vm/deploy"
/>
+    <property name="external.resources.loc" value="${jdktools.base.dir}/../common_resources"
/>
+    <property name="external.resources" location="${external.resources.loc}" />
+
+    <property name="harmony.jdktools" location="${jdktools.base.dir}"/>
+    <condition property="hy.deploy" value="${hy.hdk}">
+        <isset property="hy.hdk"/>
+    </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" />
+
+    <!-- set the path root for the external resources  -->
+    <property name="common.resources.loc" value="${jdktools.base.dir}/../common_resources"
/>
+    <property name="common.resources" location="${common.resources.loc}" />
+    <fail>
+        <condition>
+            <not><available file="${common.resources}/make/properties.xml"/></not>
+        </condition>
+        Primary dependency is missing: common_resources.
+        You need to check it out from SVN repository or specify it's location:
+        ant -Dcommon.resources.loc=path
+    </fail>
     
-    <condition property="hy.arch.define" value="HYX86">
-        <equals arg1="${hy.arch}" arg2="x86"/>
-    </condition>
-    <condition property="hy.arch.define" value="HYX86_64">
-        <equals arg1="${hy.arch}" arg2="x86_64"/>
-    </condition>
-    <condition property="hy.arch.define" value="HYIA64">
-        <equals arg1="${hy.arch}" arg2="ia64"/>
-    </condition>
-
-    <!-- use native compiler option "-march=pentium3" on 32-bit linux/unix platform -->
-    <condition property="hy.cflags" value="-march=pentium3">
-        <and>
-            <isset property="is.32bit"/>
-            <not>
-                <isset property="is.windows"/>
-            </not>
-        </and>
-    </condition>
+    <import file="${common.resources}/make/properties.xml"/>
+    <import file="${common.resources}/make/depends.xml"/>
     
-    <!-- Normalized platform name -->
-    <property name="hy.platform" value="${hy.os}.${hy.arch}"/>
-    <property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>
 
-    <condition property="exe.suffix" value=".exe">
-        <isset property="is.windows"/>
-    </condition>
-    <property name="exe.suffix" value="" />
-
-    <condition property="shlib.suffix" value=".dll">
-        <isset property="is.windows"/>
-    </condition>
-    <property name="shlib.suffix" value=".so" />
-
-    <condition property="progdb.suffix" value=".pdb">
-        <isset property="is.windows" />
-    </condition>
-
-    <condition property="manifest.suffix" value=".manifest">
-        <isset property="is.windows" />
-    </condition>
-
-    <condition property="linklib.suffix" value=".lib">
-        <isset property="is.windows"/>
-    </condition>
-    <property name="linklib.suffix" value=".so" />
-
-    <condition property="make.command" value="nmake.exe">
-        <isset property="is.windows"/>
-    </condition>
-    <condition property="make.command" value="gmake">
-        <or>
-            <isset property="is.aix"/>
-            <isset property="is.freebsd"/>
-        </or>
-    </condition>
-    <property name="make.command" value="make" />
-
-    <condition property="make.arg" value="/nologo">
-        <isset property="is.windows"/>
-    </condition>
-    <property name="make.arg" value="" />
-
-    <property name="png.home" value="/usr" />
-    <property name="lcms.home" value="/usr" />
-    <property name="jpeg.home" value="/usr" />
-
-    <!-- default property for call-modules macro - i.e. all modules -->
-    <property name="build.module" value="*" />
-    <property name="exclude.module" value="nothing" />
-
-    <!-- names of exclude lists, used by prepare-exclude-list macro -->
-    <property name="common.exclude.file" value="exclude.common" />
-    <property name="common.exclude.interm" value="exclude.interm" />
-    <property name="platform.exclude.file"
-              value="exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="platform.exclude.interm"
-              value="exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <target name="echo" depends="svn-prop, svn-info"
+    <target name="tools-echo" depends="echo"
             description="Display the properties defined by this ant file" >
         <echo>
-Harmony release configuration property:
-
-  hy.cfg = ${hy.cfg}
-
-Harmony javac properties:
-
-  hy.javac.compiler = ${hy.javac.compiler}
-  hy.javac.target = ${hy.javac.target}
-  hy.javac.source = ${hy.javac.source}
-  hy.javac.debug  = ${hy.javac.debug}
-  hy.javac.maxmem = ${hy.javac.maxmem}
-
-Harmony platform properties:
-
-  hy.os = ${hy.os}
-  hy.arch = ${hy.arch}
-  hy.bits = ${hy.bits}
-  hy.platform = ${hy.platform}
-  hy.platform.path = ${hy.platform.path}
-
-  is.windows = ${is.windows}
-  is.unix = ${is.unix}
-  is.linux = ${is.linux}
-  is.32bit = ${is.32bit}
-  is.64bit = ${is.64bit}
-  is.x86 = ${is.x86}
-  is.x86_64 = ${is.x86_64}
-  is.ia64 = ${is.ia64}
-
-  exe.suffix = ${exe.suffix}
-  shlib.suffix = ${shlib.suffix}
-  make.command = ${make.command}
-
-  hy.hdk = ${hy.hdk}
+JDK tools build settigns:
+            
   hy.cflags = ${hy.cflags}
   hy.arch.define = ${hy.arch.define}
-
-
-The following property is only set if the "svn-prop" target has been
-called:
-
-  svn.revision = ${svn.revision}
-
-
-The following property is only set if the "svn-info" target has been
-called:
-
-  svn.info = ${svn.info}
-
-Ant native properties, for information, but please use Harmony
-properties in preference to these:
-
-  os.name = ${os.name}
-  os.arch = ${os.arch}
-
+            
         </echo>
     </target>
-
-    <target name="svn-prop">
-        <exec executable="svn">
-            <arg value="--non-interactive" />
-            <arg value="info" />
-            <redirector outputproperty="svn.revision">
-                <outputfilterchain>
-                    <linecontains>
-                        <contains value="Revision: " />
-                    </linecontains>
-                    <tokenfilter>
-                        <replacestring from="Revision: " to=""/>
-                    </tokenfilter>
-                </outputfilterchain>
-            </redirector>
-        </exec>
-    </target>
-
-    <target name="svn-info">
-        <exec executable="svn"
-              failifexecutionfails="false"
-              resultproperty="svn.rc">
-            <arg value="info" />
-            <redirector outputproperty="svn.info.tmp">
-                <outputfilterchain>
-                    <linecontainsregexp>
-                        <regexp pattern="Repository Root:|Revision:" />
-                    </linecontainsregexp>
-                    <tokenfilter>
-                        <replacestring from="Repository Root: " to=""/>
-                        <replacestring from="Revision: " to=" "/>
-                    </tokenfilter>
-                    <striplinebreaks/>
-                </outputfilterchain>
-            </redirector>
-        </exec>
-        <condition property="svn.info" value="${svn.info.tmp}" >
-            <equals arg1="${svn.rc}" arg2="0" />
-        </condition>
-        <tstamp>
-            <format property="svn.info" pattern="'Unknown revision at' dd-MMM-yyyy hh:mm
aa"/>
-        </tstamp>
-    </target>
-
-    <macrodef name="call-modules">
-        <attribute name="target" />
-        <sequential>
-            <subant target="@{target}">
-                <dirset dir="modules" includes="${build.module}" excludes="${exclude.module}"
/>
-            </subant>
-        </sequential>
-    </macrodef>
-
-
-    <!-- macros for modules -->
-    <!-- TOFIX move to a shared file in the HDK/build/make directory. -->
-
-    <macrodef name="make">
-        <attribute name="dir" />
-        <attribute name="target" default="" />
-        <sequential>
-            <echo>Making "@{target}" in @{dir}</echo>
-            <echo> LOCAL MAKE DEFN L ${hy.drlvm}</echo>
-            <exec failonerror="true"
-                  executable="${make.command}"
-                  dir="@{dir}">
-                <env key="HY_HDK" value="${hy.hdk}" />
-                <env key="HY_DRLVM" value="${hy.drlvm}" />
-                <env key="HY_JDKTOOLS" value="${harmony.jdktools}" />
-                <env key="HY_CFG" value="${hy.cfg}" />
-                <env key="HY_ARCH" value="${hy.arch}" />
-                <env key="HY_OS" value="${hy.os}" />
-                <env key="HY_NO_SIG" value="false" />
-                <env key="HY_NO_THR" value="false" />
-                <env key="HY_SHLIB_SUFFIX" value="${shlib.suffix}" />
-                <env key="HY_PLATFORM" value="${hy.platform}" />
-                <env key="HY_CFLAGS" value="${hy.cflags}" />
-                <env key="HY_ARCH_DEFINE" value="${hy.arch.define}" />
-                <arg line="${make.arg}" />
-                <arg line="@{target}" />
-            </exec>
-        </sequential>
-    </macrodef>
-
-    <!-- To use with -Dtest.case=... option                   -->
-    <!-- if ${test.case} is provided in package+class form    -->
-    <!-- it is converted to dir+filename form                 -->
-    <pathconvert property="converted.tc" >
-        <path path="${test.case}"/>
-        <compositemapper>
-            <unpackagemapper from="${basedir}${file.separator}*Test" to="*Test.java" />
-            <globmapper from="${basedir}${file.separator}*.java" to="*.java" />
-        </compositemapper>
-    </pathconvert>
-
-    <!-- Concatenate several exclude lists into single list -->
-    <macrodef name="prepare-exclude-list">
-       <attribute name="moduleName"/>
-       <!-- directory with exclude lists for the module -->
-       <attribute name="dir"/>
-       <!-- name of concatenated list, should be an absolute pathname -->
-       <attribute name="result"/>
-       <sequential>
-           <echo message="" file="@{result}"/>
-           <concat destfile="@{result}" force="yes" fixlastline="yes" append="true">
-               <fileset dir="@{dir}">
-                   <include name="${common.exclude.file}"/> 
-                   <include name="${platform.exclude.file}"/>
-                   <include name="${common.exclude.interm}" if="exclude.interm" />
-                   <include name="${platform.exclude.interm}" if="exclude.interm" />
-		   <size value="0" when="more"/>
-               </fileset>
-           </concat>
-       </sequential>
-   </macrodef>
 
 </project>



Mime
View raw message