harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1005479 - in /harmony/enhanced/java/branches/java6: ./ build.xml classlib/ classlib/depends/libs/ drlvm/ jdktools/
Date Thu, 07 Oct 2010 15:02:07 GMT
Author: hindessm
Date: Thu Oct  7 15:02:07 2010
New Revision: 1005479

URL: http://svn.apache.org/viewvc?rev=1005479&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1005441:

  r1005441 | hindessm | 2010-10-07 14:39:00 +0100 (Thu, 07 Oct 2010) | 3 lines
  
  Change fetch-depends subtasks to give them more sensible names.
  Add descriptions to these tasks.
  

Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/build.xml
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  7 15:02:07 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Modified: harmony/enhanced/java/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/build.xml?rev=1005479&r1=1005478&r2=1005479&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/build.xml (original)
+++ harmony/enhanced/java/branches/java6/build.xml Thu Oct  7 15:02:07 2010
@@ -164,16 +164,16 @@ Usage:
     <!--     fetches external dependencies                              -->
     <!-- ============================================================== -->
     <target name="fetch-depends"
-        description="Fetches dependencies. Note: Some of Harmony dependencies are licensed
under terms other than the Apache License v2."
-        depends="fetch-classlib-libs,
-                 fetch-vm-libs,
-                 fetch-jdktools-libs"/>
+        description="Fetches dependencies for all components. Note: Some of Harmony dependencies
are licensed under terms other than the Apache License v2."
+        depends="fetch-depends-classlib,
+                 fetch-depends-vm,
+                 fetch-depends-jdktools"/>
 
     <target name="check-depends"
-        description="Checks dependencies."
-        depends="check-classlib-libs,
-                 check-vm-libs,
-                 check-jdktools-libs"/>
+        description="Checks dependencies for all components."
+        depends="check-depends-classlib,
+                 check-depends-vm,
+                 check-depends-jdktools"/>
 
     <target name="bundle-hdk-tgz" depends="init" if="is.unix">
 
@@ -464,7 +464,7 @@ Usage:
     
     <target name="build-classlib"
             depends="init,-init-hdk,-build-classlib,assemble-hdk-doc"/>
-    <target name="-build-classlib" depends="auto-fetch-classlib-libs">
+    <target name="-build-classlib" depends="auto-fetch-depends-classlib">
         <ant antfile="classlib/build.xml" target="build" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
@@ -482,15 +482,16 @@ Usage:
         </delete>
     </target>
 
-    <target name="auto-fetch-classlib-libs" if="auto.fetch">
-        <ant target="fetch-classlib-libs">
+    <target name="auto-fetch-depends-classlib" if="auto.fetch">
+        <ant target="fetch-depends-classlib">
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
         </ant>
     </target>
 
-    <target name="fetch-classlib-libs">
+    <target name="fetch-depends-classlib"
+            description="Fetches dependencies for classlib. Note: Some of Harmony dependencies
are licensed under terms other than the Apache License v2.">
         <ant antfile="classlib/build.xml" target="fetch-depends"
              inheritall="false" >
             <propertyset refid="required.props" />
@@ -499,7 +500,8 @@ Usage:
         </ant>
     </target>
 
-    <target name="check-classlib-libs">
+    <target name="check-depends-classlib"
+            description="Checks dependencies for classlib.">
         <ant antfile="classlib/build.xml" target="check-depends"
              inheritall="false" >
             <propertyset refid="required.props" />
@@ -537,7 +539,7 @@ Usage:
     <!-- ============================================================== -->
     <!-- ensures that dependencies are up to date and then builds a vm  -->
     <!-- ============================================================== -->
-    <target name="build-vm" depends="init,auto-fetch-vm-libs">
+    <target name="build-vm" depends="init,auto-fetch-depends-vm">
         <ant antfile="${vm.dir.loc}/build.xml"
              target="build" inheritAll="false" >
             <propertyset refid="required.props" />
@@ -549,15 +551,16 @@ Usage:
         </ant>
     </target>
 
-    <target name="auto-fetch-vm-libs" if="auto.fetch">
-        <ant target="fetch-vm-libs">
+    <target name="auto-fetch-depends-vm" if="auto.fetch">
+        <ant target="fetch-depends-vm">
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
         </ant>
     </target>
 
-    <target name="fetch-vm-libs">
+    <target name="fetch-depends-vm"
+            description="Fetches dependencies for the vm. Note: Some of Harmony dependencies
are licensed under terms other than the Apache License v2.">
         <ant antfile="${vm.dir.loc}/build.xml"
              target="fetch-depends" inheritall="false" >
             <propertyset refid="required.props" />
@@ -566,7 +569,8 @@ Usage:
         </ant>
     </target>
 
-    <target name="check-vm-libs">
+    <target name="check-depends-vm"
+            description="Checks dependencies for the vm.">
         <ant antfile="${vm.dir.loc}/build.xml"
              target="check-depends" inheritall="false" >
             <propertyset refid="required.props" />
@@ -591,7 +595,7 @@ Usage:
     <!-- ensures dependencies are up to date, then builds jdktools      -->
     <!-- ============================================================== -->
     <target name="build-jdktools"
-            depends="init,-init-hdk,auto-fetch-jdktools-libs">
+            depends="init,-init-hdk,auto-fetch-depends-jdktools">
         <ant antfile="jdktools/build.xml" target="build" inheritall="false" >
             <propertyset refid="required.props" />
             <property name="common.resources" location="common_resources" />
@@ -600,14 +604,15 @@ Usage:
         </ant>
     </target>
 
-    <target name="auto-fetch-jdktools-libs" if="auto.fetch">
-        <ant target="fetch-jdktools-libs" inheritall="false" >
+    <target name="auto-fetch-depends-jdktools" if="auto.fetch">
+        <ant target="fetch-depends-jdktools" inheritall="false" >
             <propertyset refid="required.props" />
             <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
-    <target name="fetch-jdktools-libs">
+    <target name="fetch-depends-jdktools"
+            description="Fetches dependencies for jdktools. Note: Some of Harmony dependencies
are licensed under terms other than the Apache License v2.">
         <ant antfile="jdktools/build.xml" target="fetch-depends"
              inheritall="false" >
             <propertyset refid="required.props" />
@@ -615,7 +620,8 @@ Usage:
         </ant>
     </target>
 
-    <target name="check-jdktools-libs">
+    <target name="check-depends-jdktools"
+            description="Checks dependencies for jdktools">
         <ant antfile="jdktools/build.xml" target="check-depends"
              inheritall="false" >
             <propertyset refid="required.props" />

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  7 15:02:07 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  7 15:02:07 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  7 15:02:07 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  7 15:02:07 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message