harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Hindess <mark.hind...@googlemail.com>
Subject Re: [java6] Approval for patch to LICENSE
Date Thu, 17 Dec 2009 09:42:48 GMT

In message <4B29F72F.50202@gmail.com>, Tim Ellison writes:
> On 17/Dec/2009 08:58, Mark Hindess wrote:
> > -1.  This change wasn't missed from a merge as a merge
> > hasn't happened.  Applying this patch wont fix the other
> > missing changes and it wont update mergeinfo property.  The
> > correct fix is to merge /repos/asf/harmony/enhanced/trunk to
> > /repos/asf/harmony/enhanced/branches/java6.  I'd like permission to do
> > this instead?  Any committers approve please?
> That would bring in lots of changes that have been added since the 5.0
> stream was unfrozen, so I don't think this is a good idea.

Lots of changes?  I think you are reading:


but I wrote:


I've appended the full diff below.  The only commits being merged are:

  r834381 | hindessm | 2009-11-10 08:15:42 +0000 (Tue, 10 Nov 2009) | 2 lines

  Fixing Bouncy Castle license version and copyright.

  r818225 | hindessm | 2009-09-23 20:46:48 +0100 (Wed, 23 Sep 2009) | 9 lines

  Update make macro in common_resources to match classlib.
  For everything using the classlib rules.{mk,mak} files:
    1) Create .pdb or gnu debug files in jdk/lib.
    2) build directly to appropriate location so no copying is needed.
  Remove the copying and svn:ignore properties that aren't needed anymore.
  Replace some jdktools antcalls with depends targets.
  Added a couple of TODO items to remind me of outstanding things to be

There was a third commit (r824047) but that was a horrible conflicting
merge in the debian packaging and I've already done that manually.

> I don't see a problem with applying a targeted patch to 6.0 (rather
> than doing the merge) to bring specific things like this up to date. A
> later merge will auto-merge the file anyway.
> However, it sounds like you are disputing Nathan's claim that we
> actually use BouncyCastle 1.44 in Java 6.  I need to check.

I think we need the .pdb copying fixes to get the build artifacts
correct too.  So I'd like to do the complete merge please.


Property changes on: .
Added: svn:mergeinfo
   Merged /harmony/enhanced/trunk:r810871-891586

Property changes on: debian/patches
Added: svn:mergeinfo

--- LICENSE	(revision 891586)
+++ LICENSE	(working copy)
@@ -372,10 +372,10 @@
-License Notice for Bouncy Castle version 1.41
+License Notice for Bouncy Castle version 1.44
-Copyright (c) 2000 - 2008 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+Copyright (c) 2000 - 2009 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
Index: build.xml
--- build.xml	(revision 891586)
+++ build.xml	(working copy)
@@ -326,12 +326,16 @@
         <!-- 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. -->
         <copy todir="${target.dir}/hdk">
             <fileset dir="working_classlib/deploy">
                 <exclude name="**/jre/**/*" />
-                <exclude name="**/jdk/lib/*" />
                 <exclude name="**/jdk/include/*" />
-                <exclude name="**/*.pdb" unless="copy.progdb" />
@@ -339,15 +343,14 @@
         <!-- set overwrite flag to take hythr from VM -->
         <copy todir="${target.dir}/hdk" overwrite="true">
             <fileset dir="working_vm/deploy">
+                <!-- TODO: where should these .pdb files go? -->
                 <exclude name="**/*.pdb" unless="copy.progdb" />
         <!-- now copy the working_jdktools/deploy/jdk -->
         <copy todir="${target.dir}/hdk/jdk/">
-            <fileset dir="working_jdktools/deploy/jdk">
-                <exclude name="**/*.pdb" unless="copy.progdb" />
-            </fileset>
+            <fileset dir="working_jdktools/deploy/jdk" />

View raw message