harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r922675 - in /harmony/enhanced/branches/java6: ./ build.xml classlib/ common_resources/ debian/patches/01-ignore.suffix.on.samsa.tools.diff debian/rules drlvm/ jdktools/ rat.excludes
Date Sat, 13 Mar 2010 20:46:00 GMT
Author: hindessm
Date: Sat Mar 13 20:46:00 2010
New Revision: 922675

URL: http://svn.apache.org/viewvc?rev=922675&view=rev
Log:
Merging trunk@922670.

Added:
    harmony/enhanced/branches/java6/classlib/
      - copied from r922670, harmony/enhanced/trunk/classlib/
    harmony/enhanced/branches/java6/drlvm/
      - copied from r922670, harmony/enhanced/trunk/drlvm/
    harmony/enhanced/branches/java6/jdktools/
      - copied from r922670, harmony/enhanced/trunk/jdktools/
Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/build.xml
    harmony/enhanced/branches/java6/common_resources/   (props changed)
    harmony/enhanced/branches/java6/debian/patches/01-ignore.suffix.on.samsa.tools.diff
    harmony/enhanced/branches/java6/debian/rules
    harmony/enhanced/branches/java6/rat.excludes

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 20:46:00 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-921808
+/harmony/enhanced/trunk:810871-922670

Modified: harmony/enhanced/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/build.xml?rev=922675&r1=922674&r2=922675&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/build.xml (original)
+++ harmony/enhanced/branches/java6/build.xml Sat Mar 13 20:46:00 2010
@@ -20,6 +20,46 @@
 
 <project name="build-harmony" default="build" basedir=".">
 
+    <!-- temporary warning -->
+    <fail>
+        <condition>
+            <or>
+                <available file="working_classlib/build.xml" />
+                <available file="working_vm/build.xml" />
+                <available file="working_jdktools/build.xml" />
+            </or>
+        </condition>
+The following directories have been renamed:
+
+  working_classlib => classlib
+  working_jdktools => jdktools
+  working_vm       => drlvm
+
+If these trees have uncommitted changes and/or you don't wish to lose
+downloaded dependency files, etc., then you might want to do:
+
+  rm -rf classlib/.svn
+  mv working_classlib/.svn working_classlib/* classlib/
+  rmdir working_classlib
+
+  rm -rf jdktools/.svn
+  mv working_jdktools/.svn working_jdktools/* jdktools/
+  rmdir working_jdktools
+
+  rm -rf drlvm/.svn
+  mv working_vm/.svn working_vm/* drlvm/
+  rmdir working_vm
+
+  svn up
+
+If you don't care about the contents then just delete them and run:
+
+  svn up
+  ant populate-src
+
+to fix your workspace.
+    </fail>
+
     <!-- name of the target directory to use for building and final assembly -->
     <property name="target.dir" value="target" />
 
@@ -33,7 +73,7 @@
          federated build -->
     <property name="is.federated.build" value="true" />
 
-    <property name="vm.dir" value="working_vm" />
+    <property name="vm.dir" value="drlvm" />
     <property name="vm.dir.loc" location="${vm.dir}" />
     <condition property="is.svn.vm" value="true">
         <available file="${vm.dir.loc}/.svn" type="dir" />
@@ -134,8 +174,8 @@ Usage:
     </target>
 
     <!-- ============================================================== -->
-    <!--     populates the source directories, working_classlib,
-             working_vm, working_jdktools, and common_resources         -->
+    <!--     populates the source directories, classlib,
+             drlvm, and jdktools                                        -->
     <!-- ============================================================== -->
     <target name="populate-src" 
         description="checkout the class library and VM source trees"
@@ -354,7 +394,7 @@ Usage:
         <!-- copy the classlib/deploy tree as the hdk
              filtering out specific files overriden by the VM -->
         <copy todir="${target.dir}/hdk">
-            <fileset dir="working_classlib/deploy">
+            <fileset dir="classlib/deploy">
                 <excludesfile
                      name="${vm.dir.loc}/make/classlib.override.file.patterns"
                      />
@@ -375,9 +415,9 @@ Usage:
                 includesfile="${vm.dir.loc}/make/classlib.override.file.patterns" />
         </copy>
 
-        <!-- now copy the working_jdktools/deploy/jdk -->
+        <!-- now copy the jdktools/deploy/jdk -->
         <copy todir="${target.dir}/hdk/jdk/">
-            <fileset dir="working_jdktools/deploy/jdk" />
+            <fileset dir="jdktools/deploy/jdk" />
         </copy>
     </target>
 
@@ -439,7 +479,7 @@ Usage:
     </propertyset>
     
     <target name="build-classlib" depends="auto-fetch-classlib-libs">
-        <ant antfile="working_classlib/build.xml" target="build" inheritAll="false" >
+        <ant antfile="classlib/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}"/>
@@ -448,7 +488,7 @@ Usage:
         <!-- hack to make sure the vm doesn't use the classlib
              LICENSE/NOTICE files as they don't cover ICU4C
           -->
-        <copy todir="working_classlib/deploy" overwrite="true">
+        <copy todir="classlib/deploy" overwrite="true">
             <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -465,7 +505,7 @@ Usage:
     </target>
 
     <target name="fetch-classlib-libs">
-        <ant antfile="working_classlib/build.xml" target="fetch-depends" inheritall="false"
>
+        <ant antfile="classlib/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}"/>
@@ -473,7 +513,7 @@ Usage:
     </target>
 
     <target name="clean-classlib">
-        <ant antfile="working_classlib/build.xml" target="clean" inheritAll="false" >
+        <ant antfile="classlib/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}"/>
@@ -482,7 +522,7 @@ Usage:
     </target>
 
     <target name="init-classlib-hdk">
-        <ant antfile="working_classlib/build.xml"
+        <ant antfile="classlib/build.xml"
                 target="-init-hdk" inheritAll="false" >
             <property name="hy.cfg" value="${hy.cfg}"/>
             <property name="svn.info" value="${harmony.long.version}"/>
@@ -556,7 +596,7 @@ Usage:
     <!-- ensures dependencies are up to date, then builds jdktools      -->
     <!-- ============================================================== -->
     <target name="build-jdktools" depends="auto-fetch-jdktools-libs">
-        <ant antfile="working_jdktools/build.xml" target="build" inheritall="false" >
+        <ant antfile="jdktools/build.xml" target="build" inheritall="false" >
             <property name="hy.cfg" value="${hy.cfg}"/>
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -570,13 +610,13 @@ Usage:
     </target>
 
     <target name="fetch-jdktools-libs">
-        <ant antfile="working_jdktools/build.xml" target="fetch-depends" inheritall="false"
>
+        <ant antfile="jdktools/build.xml" target="fetch-depends" inheritall="false" >
             <property name="hy.cfg" value="${hy.cfg}"/>
         </ant>
     </target>
 
     <target name="clean-jdktools">
-        <ant antfile="working_jdktools/build.xml" target="clean" inheritall="false" >
+        <ant antfile="jdktools/build.xml" target="clean" inheritall="false" >
             <property name="hy.cfg" value="${hy.cfg}"/>
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -600,7 +640,7 @@ Usage:
         depends="clean,reset-vm">
 
         <!-- delete the working directories -->
-        <delete dir="working_classlib"/>
+        <delete dir="classlib"/>
 
         <!-- do an svn update to reset them -->
         <exec executable="svn" dir="." failonerror="true">
@@ -634,10 +674,10 @@ Usage:
     </target>
 
     <!-- ============================================================== -->
-    <!-- switches the working_classlib directory to classlib            -->
+    <!-- switches the classlib directory to classlib            -->
     <!-- ============================================================== -->
     <target name="switch-svn-classlib" depends="init" if="is.svn">
-        <exec executable="svn" dir="working_classlib" failonerror="true">
+        <exec executable="svn" dir="classlib" failonerror="true">
             <arg line="-r${svn.revision}"/>
             <arg line="switch" />
             <arg line="${classlib.svn.url}" />
@@ -645,10 +685,10 @@ Usage:
     </target>
 
     <!-- ============================================================== -->
-    <!-- switches the working_jdktools directory to jdktools            -->
+    <!-- switches the jdktools directory to jdktools            -->
     <!-- ============================================================== -->
     <target name="switch-svn-jdktools" depends="init" if="is.svn">
-        <exec executable="svn" dir="working_jdktools" failonerror="true">
+        <exec executable="svn" dir="jdktools" failonerror="true">
             <arg line="-r${svn.revision}"/>
             <arg line="switch" />
             <arg line="${jdktools.svn.url}" />
@@ -908,7 +948,7 @@ harmony.java.version=${harmony.java.vers
     </target>
 
     <target name="test-classlib" depends="clean-tests">
-        <ant antfile="working_classlib/make/build-test.xml"
+        <ant antfile="classlib/make/build-test.xml"
              target="test-modules" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
@@ -920,7 +960,7 @@ harmony.java.version=${harmony.java.vers
     </target>
 
     <target name="test-jdktools" depends="clean-tests">
-        <ant antfile="working_jdktools/make/build-test.xml"
+        <ant antfile="jdktools/make/build-test.xml"
              target="test-modules" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
@@ -932,7 +972,7 @@ harmony.java.version=${harmony.java.vers
     </target>
 
     <target name="process-test-output">
-        <ant antfile="working_classlib/make/build-test.xml"
+        <ant antfile="classlib/make/build-test.xml"
              target="process-test-output" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>

Propchange: harmony/enhanced/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 20:46:00 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/trunk/common_resources:476396-920147,921783-921808
+/harmony/enhanced/trunk/common_resources:476396-920147,921783-922670
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Modified: harmony/enhanced/branches/java6/debian/patches/01-ignore.suffix.on.samsa.tools.diff
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/debian/patches/01-ignore.suffix.on.samsa.tools.diff?rev=922675&r1=922674&r2=922675&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/debian/patches/01-ignore.suffix.on.samsa.tools.diff (original)
+++ harmony/enhanced/branches/java6/debian/patches/01-ignore.suffix.on.samsa.tools.diff Sat
Mar 13 20:46:00 2010
@@ -1,7 +1,7 @@
-Index: working_jdktools/modules/samsa/src/main/native/samsa/samsa.c
+Index: jdktools/modules/samsa/src/main/native/samsa/samsa.c
 ===================================================================
---- working_jdktools/modules/samsa/src/main/native/samsa/samsa.c	(revision 808406)
-+++ working_jdktools/modules/samsa/src/main/native/samsa/samsa.c	(working copy)
+--- jdktools/modules/samsa/src/main/native/samsa/samsa.c	(revision 808406)
++++ jdktools/modules/samsa/src/main/native/samsa/samsa.c	(working copy)
 @@ -149,6 +149,10 @@
          return 1;
      }

Modified: harmony/enhanced/branches/java6/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/debian/rules?rev=922675&r1=922674&r2=922675&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/debian/rules (original)
+++ harmony/enhanced/branches/java6/debian/rules Sat Mar 13 20:46:00 2010
@@ -69,13 +69,13 @@ clean:
 	# Add here commands to clean up after the build process.
 	ant $(ANT_FLAGS) clean
 
-	dh_clean  --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig
--exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude
./working_classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig --exclude
./working_classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
+	dh_clean  --exclude ./classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig --exclude
./classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude ./classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig
--exclude ./classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
 
 install: install-indep install-arch
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i  --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig
--exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude
./working_classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig --exclude
./working_classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
+	dh_clean -k -i  --exclude ./classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig
--exclude ./classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude ./classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig
--exclude ./classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
 	dh_installdirs -i
 
 	# Add here commands to install the indep part of the package into
@@ -87,7 +87,7 @@ install-indep:
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s  --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig
--exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude
./working_classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig --exclude
./working_classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
+	dh_clean -k -s  --exclude ./classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig
--exclude ./classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude ./classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig
--exclude ./classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
 	dh_installdirs -s
 
 	mkdir -p $(VMDIR)/usr/lib/harmony-6.0/jdk/jre/bin

Modified: harmony/enhanced/branches/java6/rat.excludes
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/rat.excludes?rev=922675&r1=922674&r2=922675&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/rat.excludes (original)
+++ harmony/enhanced/branches/java6/rat.excludes Sat Mar 13 20:46:00 2010
@@ -27,18 +27,18 @@
 **/x/swing/text/rtf/*.java
 rat.excludes
 release.properties
-working_classlib/modules/archive/src/main/native/zlib/windows/hyzlib.def
-working_classlib/modules/archive/src/main/native/zlib/windows/hyzlib.rc
-working_classlib/modules/concurrent/src/main/java/java/util/concurrent/**
-working_classlib/modules/concurrent/src/test/java/**
-working_classlib/modules/luni/src/main/native/fdlibm/shared/s_lib_version.c
-working_classlib/modules/luni/src/main/native/include/fdlibm.h
-working_classlib/modules/nio/META-INF/services/java.nio.channels.spi.SelectorProvider
-working_classlib/modules/nio_char/make/excludesfile
-working_classlib/modules/portlib/src/test/native/hymmap/shared/emptyFile
-working_classlib/modules/portlib/src/test/native/hymmap/shared/testFile
-working_jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/RedefineByteCode_Debuggee001
-working_vm/vm/gc_gen/src/mark_sweep/sspace_compact.cpp
-working_vm/vm/gc_gen/src/mark_sweep/sspace_mark_concurrent.cpp
-working_vm/vm/include/jit_import.h
-working_vm/vm/include/jit_intf.h
+classlib/modules/archive/src/main/native/zlib/windows/hyzlib.def
+classlib/modules/archive/src/main/native/zlib/windows/hyzlib.rc
+classlib/modules/concurrent/src/main/java/java/util/concurrent/**
+classlib/modules/concurrent/src/test/java/**
+classlib/modules/luni/src/main/native/fdlibm/shared/s_lib_version.c
+classlib/modules/luni/src/main/native/include/fdlibm.h
+classlib/modules/nio/META-INF/services/java.nio.channels.spi.SelectorProvider
+classlib/modules/nio_char/make/excludesfile
+classlib/modules/portlib/src/test/native/hymmap/shared/emptyFile
+classlib/modules/portlib/src/test/native/hymmap/shared/testFile
+jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/RedefineByteCode_Debuggee001
+drlvm/vm/gc_gen/src/mark_sweep/sspace_compact.cpp
+drlvm/vm/gc_gen/src/mark_sweep/sspace_mark_concurrent.cpp
+drlvm/vm/include/jit_import.h
+drlvm/vm/include/jit_intf.h



Mime
View raw message