harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r922581 - in /harmony/enhanced/branches/java6: ./ LICENSE NOTICE README build.xml common_resources/ debian/ ibm-v4/ ibm-v4/build.xml ibm-v4/make/ ibm-v4/make/classlib.override.file.patterns rat.excludes
Date Sat, 13 Mar 2010 15:30:11 GMT
Author: hindessm
Date: Sat Mar 13 15:30:09 2010
New Revision: 922581

URL: http://svn.apache.org/viewvc?rev=922581&view=rev
Log:
Merge up to trunk@921782

Added:
    harmony/enhanced/branches/java6/ibm-v4/   (props changed)
      - copied from r921782, harmony/enhanced/trunk/ibm-v4/
    harmony/enhanced/branches/java6/ibm-v4/build.xml
      - copied unchanged from r921782, harmony/enhanced/trunk/ibm-v4/build.xml
    harmony/enhanced/branches/java6/ibm-v4/make/
      - copied from r921782, harmony/enhanced/trunk/ibm-v4/make/
    harmony/enhanced/branches/java6/ibm-v4/make/classlib.override.file.patterns
      - copied unchanged from r921782, harmony/enhanced/trunk/ibm-v4/make/classlib.override.file.patterns
Removed:
    harmony/enhanced/branches/java6/common_resources/
Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/LICENSE   (props changed)
    harmony/enhanced/branches/java6/NOTICE   (props changed)
    harmony/enhanced/branches/java6/README   (props changed)
    harmony/enhanced/branches/java6/build.xml   (contents, props changed)
    harmony/enhanced/branches/java6/debian/   (props changed)
    harmony/enhanced/branches/java6/rat.excludes   (props changed)

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 15:30:09 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-912354,912355-920147*
+/harmony/enhanced/trunk:810871-921782

Propchange: harmony/enhanced/branches/java6/LICENSE
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/NOTICE
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/README
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/build.xml?rev=922581&r1=922580&r2=922581&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/build.xml (original)
+++ harmony/enhanced/branches/java6/build.xml Sat Mar 13 15:30:09 2010
@@ -29,6 +29,16 @@
     <!-- debug or release version -->
     <property name="hy.cfg" value="release" />
 
+    <!-- property to identify when components are being built by the 
+         federated build -->
+    <property name="is.federated.build" value="true" />
+
+    <property name="vm.dir" value="working_vm" />
+    <property name="vm.dir.loc" location="${vm.dir}" />
+    <condition property="is.svn.vm" value="true">
+        <available file="${vm.dir.loc}/.svn" type="dir" />
+    </condition>
+
     <property name="hy.local.zlib" value="false" />
 
     <description>
@@ -342,28 +352,27 @@ Usage:
         <mkdir dir="${target.dir}/hdk"/>
 
         <!-- copy the classlib/deploy tree as the hdk
-             filtering out the jre, as that comes from
-             working_vm -->
-        <!-- TODO: classlib files should come from classlib.  So we
-             should filter out classlib files when copying out of
-             working_vm and *not* when copying out of
-             working_classlib.  And if necessary add specific excludes
-             so we know exactly why it is not done in the obvious
-             way. -->
+             filtering out specific files overriden by the VM -->
         <copy todir="${target.dir}/hdk">
             <fileset dir="working_classlib/deploy">
-                <exclude name="**/jre/**/*" />
-                <exclude name="**/jdk/include/*" />
+                <excludesfile
+                     name="${vm.dir.loc}/make/classlib.override.file.patterns"
+                     />
+                <include name="**/*" />
             </fileset>
         </copy>
 
-        <!-- now copy the drlvm/build/deploy -->
-        <!-- set overwrite flag to take hythr from VM -->
-        <copy todir="${target.dir}/hdk" overwrite="true">
-            <fileset dir="working_vm/deploy">
+        <!-- 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>
 
         <!-- now copy the working_jdktools/deploy/jdk -->
@@ -381,29 +390,6 @@ Usage:
         <chmod file="${target.dir}/hdk/jdk/jre/bin/pack200*" perm="ugo+x" />
     </target>
 
-    <target name="assemble-jdk">
-
-        <!-- create the top-level jdk directory -->
-        <mkdir dir="${target.dir}/jdk"/>
-
-        <!-- now copy the drlvm/build/deploy/jre
-             contents into the jre in the JDK -->
-        <copy todir="${target.dir}/jdk/jre">
-            <fileset dir="working_vm/build/deploy/jdk/jre">
-                <exclude name="**/*.pdb" unless="copy.progdb" />
-            </fileset>
-        </copy>
-
-        <!-- now copy the drlvm/build/deploy/jre
-             contents into the jre in the JDK -->
-        <copy todir="${target.dir}/jdk/">
-            <fileset dir="working_jdktools/deploy/jdk">
-                <exclude name="**/*.pdb" unless="copy.progdb" />
-            </fileset>
-        </copy>
-
-    </target>
-
     <!-- ============================================================== -->
     <!-- copies a license and notices into the root of the hdk          -->
     <!-- ============================================================== -->
@@ -449,6 +435,7 @@ Usage:
         <propertyref name="hy.local.zlib" />
         <propertyref name="use.libstdc++5" />
         <propertyref name="harmony.java.version" />
+        <propertyref name="is.federated.build" />
     </propertyset>
     
     <target name="build-classlib" depends="auto-fetch-classlib-libs">
@@ -508,7 +495,8 @@ Usage:
     <!-- ensures that dependencies are up to date and then builds a vm  -->
     <!-- ============================================================== -->
     <target name="build-vm" depends="auto-fetch-vm-libs">
-        <ant antfile="working_vm/build.xml" target="build" inheritAll="false" >
+        <ant antfile="${vm.dir.loc}/build.xml"
+             target="build" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -525,7 +513,8 @@ Usage:
     </target>
 
     <target name="fetch-vm-libs">
-        <ant antfile="working_vm/build.xml" target="fetch-depends" inheritall="false"
>
+        <ant antfile="${vm.dir.loc}/build.xml"
+             target="fetch-depends" inheritall="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -533,7 +522,8 @@ Usage:
     </target>
 
     <target name="clean-vm">
-        <ant antfile="working_vm/build.xml" target="clean" inheritall="false" >
+        <ant antfile="${vm.dir.loc}/build.xml"
+             target="clean" inheritall="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -607,18 +597,22 @@ Usage:
     <!-- ============================================================== -->
     <target name="reset"
         description="removes vm and classlib dirs and resets - BE SURE YOU WANT TO DO THIS"
-        depends="clean">
+        depends="clean,reset-vm">
 
-        <!-- delete the working directories and then do an svn update to reset them -->
+        <!-- delete the working directories -->
         <delete dir="working_classlib"/>
-        <delete dir="working_vm"/>
 
+        <!-- do an svn update to reset them -->
         <exec executable="svn" dir="." failonerror="true">
             <arg line="update" />
         </exec>
 
     </target>
 
+    <target name="reset-vm" if="is.svn.vm">
+        <delete dir="${vm.dir.loc}" />
+    </target>
+
     <target name="clean"
         depends="init-classlib-hdk,
                  clean-jdktools,
@@ -629,10 +623,10 @@ Usage:
     </target>
 
     <!-- ============================================================== -->
-    <!-- switches the working_vm directory to vm module (DRLVM for now) -->
+    <!-- switches the vm.dir directory to vm module (DRLVM for now) -->
     <!-- ============================================================== -->
     <target name="switch-svn-vm" depends="init" if="is.svn">
-        <exec executable="svn" dir="working_vm" failonerror="true">
+        <exec executable="svn" dir="${vm.dir.loc}" failonerror="true">
             <arg line="-r${svn.revision}"/>
             <arg line="switch" />
             <arg line="${vm.svn.url}" />
@@ -828,6 +822,7 @@ Usage:
         <condition property="is.svn">
             <isset property="federated.entry.revision"/>
         </condition>
+
         <condition property="svn.revision" value="${federated.entry.revision}" else="unknown">
             <isset property="is.svn"/>
         </condition>

Propchange: harmony/enhanced/branches/java6/build.xml
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/debian/
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/ibm-v4/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 13 15:30:09 2010
@@ -0,0 +1,3 @@
+linux-x86.vme
+windows-x86.vme
+deploy

Propchange: harmony/enhanced/branches/java6/rat.excludes
            ('svn:mergeinfo' removed)



Mime
View raw message