You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/12/17 13:27:50 UTC
svn commit: r891670 - in /harmony/enhanced/branches/java6: ./ LICENSE
build.xml debian/patches/
Author: hindessm
Date: Thu Dec 17 12:27:48 2009
New Revision: 891670
URL: http://svn.apache.org/viewvc?rev=891670&view=rev
Log:
Merging changes from federated trunk@891586 to java6 branch.
Modified:
harmony/enhanced/branches/java6/ (props changed)
harmony/enhanced/branches/java6/LICENSE
harmony/enhanced/branches/java6/build.xml
harmony/enhanced/branches/java6/debian/patches/ (props changed)
Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
svn:mergeinfo = /harmony/enhanced/trunk:810871-891586
Modified: harmony/enhanced/branches/java6/LICENSE
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/LICENSE?rev=891670&r1=891669&r2=891670&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/LICENSE (original)
+++ harmony/enhanced/branches/java6/LICENSE Thu Dec 17 12:27:48 2009
@@ -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
Modified: harmony/enhanced/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/build.xml?rev=891670&r1=891669&r2=891670&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/build.xml (original)
+++ harmony/enhanced/branches/java6/build.xml Thu Dec 17 12:27:48 2009
@@ -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" />
</fileset>
</copy>
@@ -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" />
</fileset>
</copy>
<!-- 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" />
</copy>
</target>
Propchange: harmony/enhanced/branches/java6/debian/patches/
------------------------------------------------------------------------------
svn:mergeinfo =