harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r938599 - in /harmony/enhanced/java/branches/mrh: build.xml drlvm/build.xml drlvm/make/properties.xml
Date Tue, 27 Apr 2010 18:43:42 GMT
Author: hindessm
Date: Tue Apr 27 18:43:41 2010
New Revision: 938599

URL: http://svn.apache.org/viewvc?rev=938599&view=rev
Log:
Remove copying of drlvm.

Modified:
    harmony/enhanced/java/branches/mrh/build.xml
    harmony/enhanced/java/branches/mrh/drlvm/build.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=938599&r1=938598&r2=938599&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Tue Apr 27 18:43:41 2010
@@ -341,37 +341,9 @@ Usage:
     <!-- ============================================================== -->
     <target name="assemble-artifacts"
         depends="init,
-                 assemble-stuff,
                  assemble-hdk-doc,
                  chmod-stuff"/>
 
-    <target name="assemble-stuff">
-        <!-- create the top-level hdk directory -->
-        <mkdir dir="${target.dir}/hdk"/>
-
-        <!-- delete files that the VM wants to override -->
-        <delete>
-            <fileset dir="${target.dir}">
-                <includesfile
-                     name="${vm.dir.loc}/make/classlib.override.file.patterns"
-                     />
-            </fileset>
-        </delete>
-
-        <!-- now copy the drlvm/build/deploy/jre/bin/default -->
-        <!-- plus specific file that the VM overrides -->
-        <copy todir="${target.dir}/hdk">
-            <fileset dir="${vm.dir.loc}/deploy">
-                <exclude name="**/jre/bin/*" />
-
-                <!-- TODO: where should these .pdb files go? -->
-                <exclude name="**/*.pdb" unless="copy.progdb" />
-            </fileset>
-            <fileset dir="${vm.dir.loc}/deploy"
-                includesfile="${vm.dir.loc}/make/classlib.override.file.patterns" />
-        </copy>
-    </target>
-
     <target name="chmod-stuff" if="is.unix">
         <chmod file="${target.dir}/hdk/jdk/bin/*" perm="ugo+x" />
         <chmod file="${target.dir}/hdk/jdk/jre/bin/java*" perm="ugo+x" />
@@ -387,7 +359,7 @@ Usage:
     <target name="assemble-hdk-doc">
 
         <copy todir="${target.dir}/hdk" overwrite="true">
-            <fileset dir="./">
+            <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
             </fileset>
@@ -401,7 +373,7 @@ Usage:
     <target name="assemble-jre-doc">
 
         <copy todir="${target.dir}/hdk/jdk/jre" overwrite="true">
-            <fileset dir="./">
+            <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
             </fileset>
@@ -410,7 +382,7 @@ Usage:
 
     <target name="assemble-jdk-doc">
         <copy todir="${target.dir}/hdk/jdk/" overwrite="true">
-            <fileset dir="./">
+            <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
             </fileset>
@@ -492,7 +464,9 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
-            <property name="deploy.canonical.flag" value="true"/>
+            <property name="deploy.canonical.flag" value="false"/>
+            <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
+            <property name="import.hdk" value="false"/>
         </ant>
     </target>
 
@@ -519,7 +493,9 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
-            <property name="deploy.canonical.flag" value="true"/>
+            <property name="deploy.canonical.flag" value="false"/>
+            <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
+            <property name="import.hdk" value="false"/>
         </ant>
     </target>
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/build.xml?rev=938599&r1=938598&r2=938599&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/build.xml Tue Apr 27 18:43:41 2010
@@ -180,10 +180,10 @@ Usage:
         <mkdir dir="${drlvm.deploy.dir}/include" />        
         <copy todir="${drlvm.deploy.dir}">
             <fileset dir="${hy.hdk}">
-                <include name="**" if="import.hdk"/>
-                <include name="jdk/jre/**" unless="import.hdk"/>
-                <exclude name="jdk/jre/bin/default/**" unless="import.hdk"/>
-                <exclude name="jdk/jre/bin/*hythr*" unless="import.hdk"/>
+                <include name="**" unless="skip.import.hdk"/>
+                <include name="jdk/jre/**" if="skip.import.hdk"/>
+                <exclude name="jdk/jre/bin/default/**" if="skip.import.hdk"/>
+                <exclude name="jdk/jre/bin/*hythr*" if="skip.import.hdk"/>
             </fileset>
         </copy>
     </target>
@@ -239,7 +239,7 @@ Usage:
       so irrespective of the platform, compiler or release/debug
       there's a predicable place to find the output 
       ================================================================== -->
-    <target name="deploy-canonical" if="deploy.canonical.flag">
+    <target name="deploy-canonical" unless="skip.deploy.canonical">
         <property name="canonical.deploy.dir" location="${drlvm.base.dir}/deploy" />
         <delete dir="${canonical.deploy.dir}" failonerror="false" />
         <mkdir dir="${canonical.deploy.dir}" />

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml?rev=938599&r1=938598&r2=938599&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml Tue Apr 27 18:43:41 2010
@@ -98,6 +98,13 @@
         <isset property="shlib.is.linklib"/>
     </condition>
     <property name="base.test.dir" location="${drlvm.build.dir}/tests"/>
+
+    <condition property="skip.deploy.canonical" value="true">
+        <equals arg1="${deploy.canonical.flag}" arg2="false" />
+    </condition>
+    <condition property="skip.import.hdk" value="true">
+        <equals arg1="${import.hdk}" arg2="false" />
+    </condition>
     
     <target name="drlvm-echo" depends="svn-info">
         <echo message="DRLVM build Configuration:" />



Mime
View raw message