changeset in /hg/icedtea6: 2008-12-15 Lillian Angel <langel at re...

[Andrew John Hughes]

2008/12/15 Lillian Angel <langel at redhat.com>:
> Andrew John Hughes wrote:
>>
>> 2008/12/15 Lillian Angel <langel at redhat.com>:
>>
>>>
>>> changeset edaae21dab0b in /hg/icedtea6
>>> details:
>>> http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=edaae21dab0b
>>> description:
>>>       2008-12-15  Lillian Angel  <langel at redhat.com>
>>>
>>>               Fixes #475888
>>>               * patches/icedtea-version.patch: Added patch to set bug
>>> report link to
>>>               icedtea's bugzilla.
>>>
>>> diffstat:
>>>
>>> 2 files changed, 18 insertions(+), 1 deletion(-)
>>> ChangeLog                     |    8 +++++++-
>>> patches/icedtea-version.patch |   11 +++++++++++
>>>
>>> diffs (33 lines):
>>>
>>> diff -r 894d50f03bc4 -r edaae21dab0b ChangeLog
>>> --- a/ChangeLog Thu Dec 11 14:11:45 2008 -0500
>>> +++ b/ChangeLog Mon Dec 15 12:31:08 2008 -0500
>>> @@ -1,4 +1,10 @@ 2008-12-11  Deepak Bhole <dbhole at redhat.
>>> -2008-12-11  Deepak Bhole <dbhole at redhat.com>
>>> +2008-12-15  Lillian Angel  <langel at redhat.com>
>>> +
>>> +       Fixes #475888
>>> +       * patches/icedtea-version.patch: Added patch to set bug report
>>> link to
>>> +       icedtea's bugzilla.
>>> +
>>> +2008-12-11  Deepak Bhole  <dbhole at redhat.com>
>>>
>>>       * IcedTeaPlugin.cc: Clean up output shown in non debug mode.
>>>       * plugin/icedtea/netscape/javascript/JSObject.java: Same.
>>> diff -r 894d50f03bc4 -r edaae21dab0b patches/icedtea-version.patch
>>> --- a/patches/icedtea-version.patch     Thu Dec 11 14:11:45 2008 -0500
>>> +++ b/patches/icedtea-version.patch     Mon Dec 15 12:31:08 2008 -0500
>>> @@ -26,3 +26,14 @@ diff -Nru openjdk.orig/jdk/make/common/s
>>>  endif
>>>
>>>  ifdef BUILD_NUMBER
>>> +--- arguments.cpp      2008-12-15 12:25:14.000000000 -0500
>>> ++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2008-12-15
>>> 12:25:32.000000000 -0500
>>> +@@ -25,7 +25,7 @@
>>> + #include "incls/_precompiled.incl"
>>> + #include "incls/_arguments.cpp.incl"
>>> +
>>> +-#define DEFAULT_VENDOR_URL_BUG
>>> "http://java.sun.com/webapps/bugreport/crash.jsp"
>>> ++#define DEFAULT_VENDOR_URL_BUG "http://icedtea.classpath.org/bugzilla"
>>> + #define DEFAULT_JAVA_LAUNCHER  "generic"
>>> +
>>> + char**  Arguments::_jvm_flags_array             = NULL;
>>>
>>>
>>
>>
>> Hotspot patches should now be in patches/hotspot/${version}.
>
> Hmm, I double checked and the patches/icedtea-version.patch is still getting
> applied. Is there a bit of redundancy? Which of the 3 icedtea-version.patch
> can be eliminated?
>
> Thanks,
> Lillian
>


It is still applied, because icedtea-version still exists for the
common stuff like JDK, while the HotSpot specific bits were split off
into different subdirectories which apply against different versions.
So all 3 are needed and used, assuming people still want to use the
bundled HotSpot - the default is now to delete it and use b14.  In
other words, your change really should have been appended to
patches/hotspot/14.0b08/icedtea-version.patch because I assume it will
break applying against the bundled HotSpot.  Of course no-one has
actually complained about that yet, so it may not or if it does, it
may not matter because no-one is using it... :)
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8