/hg/icedtea: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 1 14:35:10 PDT 2010
changeset eb4fd48b97cf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=eb4fd48b97cf
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Jun 01 17:28:35 2010 +0100
Message protocol overhaul to fix race conditions
- Added unique reference identifiers to Java -> C++ requests so that
the correct responses are serviced (fixes some bad race conditions
when multiple applets are running).
- Fix race conditions that caused some of the set tests to
intermittently fail.
2010-03-09 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc
(consume_message): Handle the new reference field and send it back
when sending proxy and cookie info.
(get_proxy_info): Update response format for proxy information to
make it consistent with new Gecko API.
* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
(newMessageOnBus): Account for the new reference field and send it
back with the response. (sendWindow): Same.
(eval): Same. (call): Same. (sendString): Same.
(setMember): Same. Also, move responding code from _setMember to
setMember for consistency and to solve a rather bad race
condition that affected reliability. (sendMember):
Account for the new reference field and send it back with
the response. (queue_processor): Move array index slots
based on new positions with reference ids.
(_setMember): Move response code back to setMember.
* plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java
(GetMemberPluginCallRequest): Change method signature to receive a
reference identifier. (parse): Update to handle new
reference identifiers. (serviceable): Removed method.
serviceable() is now implemented in the parent class and
uses unique reference identifiers.
* plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java
(GetWindowPluginCallRequest): Change method signature to receive a
reference identifier. (serviceable): Removed method.
serviceable() is now implemented in the parent class and
uses unique reference identifiers.
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Added new
statis private requestIdentityCounter variable that provides unique
reference numbers. (createPanel): Send a dummy (0) reference
number with initialization msg. (getRequestIdentifier): New
method. Returns a unique reference number and then
increments requestIdentityCounter in a thread-safe manner.
(getWindow): Send reference id to getPluginCallRequest.
(getMember): Same. (setMember): Same. (setSlot):
Same. (getSlot): Same. (eval): Same.
(removeMember): Same. (call): Same.
(requestPluginCookieInfo): Same. (requestPluginProxyInfo):
Same. (JavaScriptFinalize): Same.
(javascriptToString): Same.
* plugin/icedteanp/java/sun/applet/PluginCallRequest.java: Track
reference numbers instead of the 'return string' marker.
(serviceable): Change from abstract to implemented method, returns
weather or not the given message is servicable by this
request based on unique reference numbers.
* plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java
(getPluginCallRequest): Pass reference numbers to concrete class
constructors.
* plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java
(PluginCookieInfoRequest): Receive new reference number and pass it
to parent. (parseString): Update to handle new
reference numbers in message. (serviceable): Removed method.
serviceable() is now implemented in the parent class and
uses unique reference identifiers.
* plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java
(PluginProxyInfoRequest): Receive new reference number and pass it
to parent. (parseReturn): Update to handle new
reference numbers in message. Also, parse based on new
format returned by the C++ side. (serviceable): Removed
method. serviceable() is now implemented in the parent class
and uses unique reference identifiers.
* plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
(handleMessage): Pass reference to finishCallRequest().
* plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java
(VoidPluginCallRequest): Update to handle new reference numbers in
message.
* plugin/tests/LiveConnect/common.js (testAll): Check eval
tests checkbox before calling doTest();
changeset 693114a512ea in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=693114a512ea
author: Gary Benson <gbenson at redhat.com>
date: Tue Jun 01 17:44:01 2010 +0100
Whitespace changes
2010-03-11 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp:
Whitespace changes.
changeset 7195e112b39f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7195e112b39f
author: Gary Benson <gbenson at redhat.com>
date: Thu Mar 11 16:35:10 2010 -0500
Fix bugs preventing Shark building itself
2010-03-11 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(SharkCompiler::compile_method): Catch typeflow failures more
generally.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
(SharkTopLevelBlock::scan_for_traps): New trap.
(SharkTopLevelBlock::do_call): Add assertion to check the above.
(SharkTopLevelBlock::static_subtype_check): Deal with unloaded
object_klass.
changeset 53d08a835f60 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=53d08a835f60
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 01 18:04:46 2010 +0100
Synchronise NetX support with IcedTea6.
2010-03-12 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (NETX_EXTRA_DIR): Path to extra NetX
resource files. (ICEDTEA_BOOTSTRAP_CLASSES): Explicitly
compile BasicDirectoryModel due to
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42003
(stamps/icedtea.stamp): Use NETX_RESOURCE_DIR for about.jnlp.
(stamps/icedtea-debug.stamp): Likewise. (stamps/netx.stamp):
Copy the resources to the build directory. (stamps/extra-
class-files.stamp): Use NETX_EXTRA_DIR. (rt-source-
files.txt): Don't search rt directory in build tree. Support
ICEDTEA_BOOTSTRAP_CLASSES. (netx): New alias.
changeset 85e376bde322 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=85e376bde322
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Mar 15 13:35:18 2010 -0400
Liveconnect message processing design changes.
- Redesigned message consumption/processing model to allow arbitrary
number of applets to load without increasing MAX_WORKERS count.
- Implemented priority queuing to allow blocking threads to get
responses first.
- Made message consumption non-blocking and fixed thread-safety
issues therein
2010-03-13 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
(requestPluginCookieInfo): Register cookie info as a priority
message. (requestPluginProxyInfo): Register proxy info as a
priority message.
* plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Re-
designed message consumption to implement priority queuing
and parallel initialization limits so that an arbitrary
number of applets can load without blocking one another, all
in a thread-safe manner. (registerPriorityWait): New method.
Registers a string that is considered a "priority" string,
which gets delegated to dedicated worker threads.
(unRegisterPriorityWait): Unregisters a string so that it is no
longer a priority. (PluginMessageConsumer): Do not
create any workers when starting. (consume): Remove method.
Consumption is now done in a separate dedicated thread to
prevent blocking. (getPriorityStrIfPriority): New
method. If the given message is priority, return why (i.e
the 'priority string'it matched). (isInInit): New method.
Returns if the plugin is currently initializing an applet.
(addToInitWorkers): New method. Adds given worker to list of workers
currently initializting applets. (okayToProcess): New
method. Returns whether or not it is okay to process the
given applet. (notifyWorkerIsFree): New method. Notifies
this class that a worker has just become free.
(queue): Queues the given message for consumption.
(ConsumerThread): New protected inner (thread) class. Responsible
for consuming messages in the queue, and regueuing them if
consumption if not possible. (getFreeWorker):
Changed to be non-blocking, and return either a priority
worker or a normal worker depending on what is requested.
* plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java
(PluginMessageHandlerWorker): Set new priority and consumer
variables. (busy): Make thread-safe by waiting on same
property that free() waits on. (free): Make thread-safe by
waiting on same property that busy() waits on. (isPriority):
New method. Returns of worker is a priority worker.
(isFree): Made thread-safe, and accounts for priority.
* plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
(startProcessing): Call consumer.queue() instead of
consumer.consume(). (postMessage): Remove unused method.
changeset 8a1a5c294219 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8a1a5c294219
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 01 22:35:00 2010 +0100
NetX/plugin build sync (2/3): Synchronise with IcedTea6.
2010-03-15 Andrew John Hughes <ahughes at redhat.com>
NetX/plugin build sync (2/3):
* patches/icedtea-liveconnect-dist.patch,
* patches/icedtea-liveconnect.patch,
* patches/icedtea-netx.patch,
* patches/icedtea-webstart-umask.patch,
* patches/icedtea-webstart.patch: Moved to extensions
subdirectory.
* Makefile.am: (PLUGIN_PATCH): Removed.
(ICEDTEA_PATCHES): Add conditional plugin patches in same
manner as all other conditional patches. Fix paths of NetX
patches and LiveConnect patches. (stamps/plugin-
tests.stamp): Depend on stamps/plugin.stamp, not rt-
closed.jar. Surround by ENABLE_PLUGIN rather than using a
(now broken) test on lib/rt/netscape.
* acinclude.m4: Add missing ;;.
* patches/extensions/liveconnect-dist.patch: Was patches
/icedtea-liveconnect-dist.patch.
* patches/extensions/liveconnect.patch: Was patches/icedtea-
liveconnect.patch.
* patches/extensions/netx-dist.patch: Renamed from patches
/icedtea-netx.patch.
* patches/extensions/netx-umask.patch: Renamed from patches
/icedtea-webstart-umask.patch.
* patches/extensions/netx.patch: Renamed from patches/icedtea-
webstart.patch.
diffstat:
30 files changed, 1261 insertions(+), 892 deletions(-)
ChangeLog | 182 ++++++
Makefile.am | 91 +--
acinclude.m4 | 1
patches/extensions/liveconnect-dist.patch | 76 ++
patches/extensions/liveconnect.patch | 89 +++
patches/extensions/netx-dist.patch | 86 +++
patches/extensions/netx-umask.patch | 169 ++++++
patches/extensions/netx.patch | 130 ++++
patches/icedtea-liveconnect-dist.patch | 76 --
patches/icedtea-liveconnect.patch | 89 ---
patches/icedtea-netx.patch | 86 ---
patches/icedtea-webstart-umask.patch | 169 ------
patches/icedtea-webstart.patch | 130 ----
plugin/icedteanp/IcedTeaNPPlugin.cc | 25
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 86 +--
plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 26
plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java | 18
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 103 ++-
plugin/icedteanp/java/sun/applet/PluginCallRequest.java | 22
plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java | 14
plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java | 20
plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 267 ++++++++--
plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 38 +
plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 22
plugin/icedteanp/java/sun/applet/PluginStreamHandler.java | 31 -
plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java | 19
plugin/tests/LiveConnect/common.js | 3
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 60 +-
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 4
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 21
diffs (truncated from 3069 to 500 lines):
diff -r d9f8a98810eb -r 8a1a5c294219 ChangeLog
--- a/ChangeLog Tue Jun 01 16:12:06 2010 +0100
+++ b/ChangeLog Tue Jun 01 22:35:00 2010 +0100
@@ -1,3 +1,185 @@ 2010-03-08 Andrew John Hughes <ahughes
+2010-03-15 Andrew John Hughes <ahughes at redhat.com>
+
+ NetX/plugin build sync (2/3):
+ * patches/icedtea-liveconnect-dist.patch,
+ * patches/icedtea-liveconnect.patch,
+ * patches/icedtea-netx.patch,
+ * patches/icedtea-webstart-umask.patch,
+ * patches/icedtea-webstart.patch:
+ Moved to extensions subdirectory.
+ * Makefile.am:
+ (PLUGIN_PATCH): Removed.
+ (ICEDTEA_PATCHES): Add conditional plugin patches in
+ same manner as all other conditional patches. Fix
+ paths of NetX patches and LiveConnect patches.
+ (stamps/plugin-tests.stamp): Depend on stamps/plugin.stamp,
+ not rt-closed.jar. Surround by ENABLE_PLUGIN rather than
+ using a (now broken) test on lib/rt/netscape.
+ * acinclude.m4: Add missing ;;.
+ * patches/extensions/liveconnect-dist.patch:
+ Was patches/icedtea-liveconnect-dist.patch.
+ * patches/extensions/liveconnect.patch:
+ Was patches/icedtea-liveconnect.patch.
+ * patches/extensions/netx-dist.patch:
+ Renamed from patches/icedtea-netx.patch.
+ * patches/extensions/netx-umask.patch:
+ Renamed from patches/icedtea-webstart-umask.patch.
+ * patches/extensions/netx.patch:
+ Renamed from patches/icedtea-webstart.patch.
++
+2010-03-13 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (requestPluginCookieInfo): Register cookie info as a priority message.
+ (requestPluginProxyInfo): Register proxy info as a priority message.
+ * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Re-designed
+ message consumption to implement priority queuing and parallel
+ initialization limits so that an arbitrary number of applets can load
+ without blocking one another, all in a thread-safe manner.
+ (registerPriorityWait): New method. Registers a string that is
+ considered a "priority" string, which gets delegated to dedicated worker
+ threads.
+ (unRegisterPriorityWait): Unregisters a string so that it is no longer
+ a priority.
+ (PluginMessageConsumer): Do not create any workers when starting.
+ (consume): Remove method. Consumption is now done in a separate dedicated
+ thread to prevent blocking.
+ (getPriorityStrIfPriority): New method. If the given message is priority,
+ return why (i.e the 'priority string'it matched).
+ (isInInit): New method. Returns if the plugin is currently initializing an
+ applet.
+ (addToInitWorkers): New method. Adds given worker to list of workers
+ currently initializting applets.
+ (okayToProcess): New method. Returns whether or not it is okay to process
+ the given applet.
+ (notifyWorkerIsFree): New method. Notifies this class that a worker has
+ just become free.
+ (queue): Queues the given message for consumption.
+ (ConsumerThread): New protected inner (thread) class. Responsible for
+ consuming messages in the queue, and regueuing them if consumption if not
+ possible.
+ (getFreeWorker): Changed to be non-blocking, and return either a priority
+ worker or a normal worker depending on what is requested.
+ * plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java
+ (PluginMessageHandlerWorker): Set new priority and consumer variables.
+ (busy): Make thread-safe by waiting on same property that free() waits on.
+ (free): Make thread-safe by waiting on same property that busy() waits on.
+ (isPriority): New method. Returns of worker is a priority worker.
+ (isFree): Made thread-safe, and accounts for priority.
+ * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
+ (startProcessing): Call consumer.queue() instead of consumer.consume().
+ (postMessage): Remove unused method.
+
+2010-03-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (NETX_EXTRA_DIR): Path to extra NetX resource files.
+ (ICEDTEA_BOOTSTRAP_CLASSES): Explicitly compile BasicDirectoryModel
+ due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42003
+ (stamps/icedtea.stamp): Use NETX_RESOURCE_DIR for about.jnlp.
+ (stamps/icedtea-debug.stamp): Likewise.
+ (stamps/netx.stamp): Copy the resources to the build directory.
+ (stamps/extra-class-files.stamp): Use NETX_EXTRA_DIR.
+ (rt-source-files.txt): Don't search rt directory in build tree.
+ Support ICEDTEA_BOOTSTRAP_CLASSES.
+ (netx): New alias.
+
+2010-03-11 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+ (SharkCompiler::compile_method): Catch typeflow failures more
+ generally.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+ (SharkTopLevelBlock::scan_for_traps): New trap.
+ (SharkTopLevelBlock::do_call): Add assertion to check the above.
+ (SharkTopLevelBlock::static_subtype_check): Deal with unloaded
+ object_klass.
+
+2010-03-11 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp:
+ Whitespace changes.
+
+2010-03-09 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (consume_message): Handle the new reference field and send it back when
+ sending proxy and cookie info.
+ (get_proxy_info): Update response format for proxy information to make it
+ consistent with new Gecko API.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (newMessageOnBus): Account for the new reference field and send it back
+ with the response.
+ (sendWindow): Same.
+ (eval): Same.
+ (call): Same.
+ (sendString): Same.
+ (setMember): Same. Also, move responding code from _setMember to setMember
+ for consistency and to solve a rather bad race condition that affected
+ reliability.
+ (sendMember): Account for the new reference field and send it back
+ with the response.
+ (queue_processor): Move array index slots based on new positions with
+ reference ids.
+ (_setMember): Move response code back to setMember.
+ * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java
+ (GetMemberPluginCallRequest): Change method signature to receive a
+ reference identifier.
+ (parse): Update to handle new reference identifiers.
+ (serviceable): Removed method. serviceable() is now implemented in the
+ parent class and uses unique reference identifiers.
+ * plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java
+ (GetWindowPluginCallRequest): Change method signature to receive a
+ reference identifier.
+ (serviceable): Removed method. serviceable() is now implemented in the
+ parent class and uses unique reference identifiers.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Added new
+ statis private requestIdentityCounter variable that provides unique
+ reference numbers.
+ (createPanel): Send a dummy (0) reference number with initialization msg.
+ (getRequestIdentifier): New method. Returns a unique reference number
+ and then increments requestIdentityCounter in a thread-safe manner.
+ (getWindow): Send reference id to getPluginCallRequest.
+ (getMember): Same.
+ (setMember): Same.
+ (setSlot): Same.
+ (getSlot): Same.
+ (eval): Same.
+ (removeMember): Same.
+ (call): Same.
+ (requestPluginCookieInfo): Same.
+ (requestPluginProxyInfo): Same.
+ (JavaScriptFinalize): Same.
+ (javascriptToString): Same.
+ * plugin/icedteanp/java/sun/applet/PluginCallRequest.java: Track reference
+ numbers instead of the 'return string' marker.
+ (serviceable): Change from abstract to implemented method, returns weather
+ or not the given message is servicable by this request based on unique
+ reference numbers.
+ * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java
+ (getPluginCallRequest): Pass reference numbers to concrete class
+ constructors.
+ * plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java
+ (PluginCookieInfoRequest): Receive new reference number and pass it to
+ parent.
+ (parseString): Update to handle new reference numbers in message.
+ (serviceable): Removed method. serviceable() is now implemented in the
+ parent class and uses unique reference identifiers.
+ * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java
+ (PluginProxyInfoRequest): Receive new reference number and pass it to
+ parent.
+ (parseReturn): Update to handle new reference numbers in message. Also,
+ parse based on new format returned by the C++ side.
+ (serviceable): Removed method. serviceable() is now implemented in the
+ parent class and uses unique reference identifiers.
+ * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
+ (handleMessage): Pass reference to finishCallRequest().
+ * plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java
+ (VoidPluginCallRequest): Update to handle new reference numbers in
+ message.
+ * plugin/tests/LiveConnect/common.js
+ (testAll): Check eval tests checkbox before calling doTest();
+
2010-03-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r d9f8a98810eb -r 8a1a5c294219 Makefile.am
--- a/Makefile.am Tue Jun 01 16:12:06 2010 +0100
+++ b/Makefile.am Tue Jun 01 22:35:00 2010 +0100
@@ -95,6 +95,7 @@ JAXWS = $(BUILD_OUTPUT_DIR)/jaxws/drop/j
NETX_SRCDIR = $(abs_top_srcdir)/netx
NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
+NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources
if DTDTYPE_QNAME
NEED_JAXWS_SRC = true
@@ -126,7 +127,6 @@ ICEDTEA_BOOTSTRAP_DIRS = \
$(SHARE)/javax/script \
$(SHARE)/javax/security/auth/kerberos \
$(SHARE)/javax/security/sasl \
- $(SHARE)/javax/swing/plaf/basic \
$(SHARE)/sun/awt/ \
$(SHARE)/sun/rmi/rmic \
$(SHARE)/sun/tools/java \
@@ -135,6 +135,9 @@ ICEDTEA_BOOTSTRAP_DIRS = \
ICEDTEA_BOOTSTRAP_RESOURCES = \
$(LANGTOOLS)/com/sun/tools/javac/resources
+
+ICEDTEA_BOOTSTRAP_CLASSES = \
+ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
endif
@@ -181,9 +184,8 @@ if ENABLE_NPPLUGIN
if ENABLE_NPPLUGIN
PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
PLUGIN_BUILD_DIR=$(abs_top_builddir)/plugin.build/icedteanp
-ICEDTEANPPLUGIN_TARGET = stamps/icedtea-npplugin
+ICEDTEANPPLUGIN_TARGET = stamps/icedtea-npplugin.stamp
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
-PLUGIN_PATCH = patches/icedtea-liveconnect.patch
LIVECONNECT_DIR = sun/applet netscape
JNLP_ABOUT_TARGET = extra-lib/about.jar
LIVECONNECT_CLASSES = $(abs_top_builddir)/liveconnect
@@ -195,7 +197,6 @@ PLUGIN_BUILD_DIR=$(abs_top_builddir)/plu
PLUGIN_BUILD_DIR=$(abs_top_builddir)/plugin.build/icedtea
ICEDTEAPLUGIN_TARGET = $(PLUGIN_BUILD_DIR)/IcedTeaPlugin.so
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
-PLUGIN_PATCH = patches/icedtea-liveconnect.patch
LIVECONNECT_DIR = sun/applet netscape
JNLP_ABOUT_TARGET = extra-lib/about.jar
LIVECONNECT_CLASSES = $(abs_top_builddir)/liveconnect
@@ -267,9 +268,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-copy-plugs.patch \
patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
patches/icedtea-ssl.patch \
- $(PLUGIN_PATCH) \
- patches/icedtea-webstart.patch \
- patches/icedtea-webstart-umask.patch \
patches/icedtea-rmi_amd64.patch \
patches/icedtea-tools.patch \
patches/icedtea-demos.patch \
@@ -317,12 +315,14 @@ ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \
patches/icedtea-demo-swingapplet.patch \
patches/icedtea-jvmtiEnv.patch \
- patches/icedtea-netx.patch \
patches/icedtea-disable-intree-ec.patch \
patches/icedtea-sources.patch \
patches/no-precompiled.patch \
patches/parisc.patch \
- patches/sh4-support.patch
+ patches/sh4-support.patch \
+ patches/extensions/netx.patch \
+ patches/extensions/netx-dist.patch \
+ patches/extensions/netx-umask.patch
# Conditional patches
@@ -374,10 +374,12 @@ endif
endif
if ENABLE_PLUGIN
-ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch
+ICEDTEA_PATCHES += patches/extensions/liveconnect.patch \
+ patches/extensions/liveconnect-dist.patch
else
if ENABLE_NPPLUGIN
-ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch
+ICEDTEA_PATCHES += patches/extensions/liveconnect.patch \
+ patches/extensions/liveconnect-dist.patch
endif
endif
@@ -1793,8 +1795,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
stamps/plugin.stamp $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \
- stamps/netx-dist.stamp stamps/liveconnect-dist.stamp $(PULSE_JAVA_TARGET) \
- stamps/rewrite-rhino.stamp
+ stamps/netx-dist.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -1827,11 +1828,9 @@ if ENABLE_PULSE_JAVA
$(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
endif
if JNLP_ABOUT_NEEDED
- cp $(NETX_RESOURCE_DIR)/about.jnlp \
- extra-lib/about.jar \
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib
- cp $(NETX_RESOURCE_DIR)/about.jnlp \
- extra-lib/about.jar \
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
endif
if ZERO_BUILD
@@ -1911,11 +1910,9 @@ if ENABLE_PULSE_JAVA
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
endif
if JNLP_ABOUT_NEEDED
- cp $(NETX_RESOURCE_DIR)/default.jnlp \
- extra-lib/about.jar \
+ cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib
- cp $(NETX_RESOURCE_DIR)/default.jnlp \
- extra-lib/about.jar \
+ cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
endif
if ZERO_BUILD
@@ -2070,8 +2067,8 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
$(MOZILLA_LIBS)\
-shared -o $@
-stamps/icedtea-npplugin: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
- touch stamps/icedtea-npplugin
+stamps/icedtea-npplugin.stamp: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
+ touch stamps/icedtea-npplugin.stamp
clean-IcedTeaNPPlugin:
rm -f $(addprefix $(PLUGIN_BUILD_DIR)/,$(NPPLUGIN_OBJECTS))
@@ -2104,7 +2101,8 @@ clean-IcedTeaPlugin:
rm -f $(PLUGIN_BUILD_DIR)/IcedTeaPlugin.so
endif
-stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET)
+stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
+ stamps/liveconnect-dist.stamp
mkdir -p stamps
touch $@
@@ -2122,7 +2120,7 @@ liveconnect-source-files.txt:
stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp
if test "x${LIVECONNECT_DIR}" != x; then \
- mkdir -p $(LIVECONNECT_CLASSES) ; \
+ mkdir -p $(LIVECONNECT_CLASSES) && \
$(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(LIVECONNECT_CLASSES) \
-classpath $(ICEDTEA_RT):$(NETX_CLASSES) \
@@ -2167,6 +2165,7 @@ stamps/netx.stamp: netx-source-files.txt
-sourcepath $(NETX_SRCDIR):$(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@netx-source-files.txt ;
+ cp -r $(NETX_RESOURCE_DIR) $(NETX_CLASSES)/net/sourceforge/jnlp
mkdir -p stamps
touch $@
@@ -2199,8 +2198,7 @@ stamps/extra-class-files.stamp: extra-so
-sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@extra-source-files.txt
- cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
- extra-lib/net/sourceforge/jnlp/about
+ cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about
find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \
-o -type d -exec chmod 750 '{}' ';'
mkdir -p stamps
@@ -2555,30 +2553,19 @@ clean-add-zero-debug:
# plugin tests
-stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) \
- bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+if ENABLE_PLUGIN
+stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) stamps/plugin.stamp
mkdir -p plugin/tests/LiveConnect
- if test -d lib/rt/netscape ; then \
- set -e ; \
- if ! test -d $(ICEDTEA_BOOT_DIR) ; then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d plugin/tests/LiveConnect \
- -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- -source 1.5 $(PLUGIN_TEST_SRCS) ; \
- $(JAR) cf plugin/tests/LiveConnect/PluginTest.jar \
- plugin/tests/LiveConnect/*.class ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
- -d plugin/tests/LiveConnect \
- -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- -source 1.5 $(PLUGIN_TEST_SRCS) ; \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
- plugin/tests/LiveConnect/*.class ; \
- fi ; \
- cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ; \
- echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ -d plugin/tests/LiveConnect \
+ -classpath $(LIVECONNECT_JAR) $(PLUGIN_TEST_SRCS) ;
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
+ plugin/tests/LiveConnect/*.class ;
+ cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ;
+ echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \
mkdir -p stamps
touch stamps/plugin-tests.stamp
+endif
# jtreg
@@ -2676,11 +2663,13 @@ jtregcheck: jtreg check-hotspot check-la
# Support classes for non-OpenJDK bootstraps
rt-source-files.txt: $(OPENJDK_BOOT_TREE)
- $(FIND) $(abs_top_builddir)/rt -name '*.java' \
- | sort -u > $@
for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
do \
$(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
+ done
+ for files in $(ICEDTEA_BOOTSTRAP_CLASSES) ; \
+ do \
+ echo $$files >> $@ ; \
done
stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
@@ -2799,6 +2788,8 @@ native-ecj: stamps/native-ecj.stamp
nbplatform: stamps/nbplatform.stamp
+netx: stamps/netx.stamp
+
netx-dist: stamps/netx-dist.stamp
overlay: stamps/overlay.stamp
diff -r d9f8a98810eb -r 8a1a5c294219 acinclude.m4
--- a/acinclude.m4 Tue Jun 01 16:12:06 2010 +0100
+++ b/acinclude.m4 Tue Jun 01 22:35:00 2010 +0100
@@ -74,6 +74,7 @@
JRE_ARCH_DIR=s390x
CROSS_TARGET_ARCH=s390x
ARCHFLAG="-m64"
+ ;;
*)
BUILD_ARCH_DIR=`uname -m`
INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
diff -r d9f8a98810eb -r 8a1a5c294219 patches/extensions/liveconnect-dist.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/extensions/liveconnect-dist.patch Tue Jun 01 22:35:00 2010 +0100
@@ -0,0 +1,76 @@
+diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk
+--- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000
+@@ -0,0 +1,28 @@
++#
++# Copyright 2009 Red Hat, Inc. All Rights Reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Red Hat designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Sun in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++
++# The specific packages that come from or go to rt.jar and tools.jar
++IMPORT_RT_PACKAGES += \
++ netscape/javascript \
++ sun/applet
++
++IMPORT_TOOLS_PACKAGES +=
++
+diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk
+--- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000
++++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000
+@@ -49,6 +49,9 @@
+ ifndef NETX_DIST
+ include $(BUILDDIR)/common/internal/Defs-netx.gmk
+ endif
++ifndef LIVECONNECT_DIST
++ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk
++endif
+
+ # Clean up these lists so empty lists are empty
+ IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES))
+@@ -123,6 +126,7 @@
+ $(call import-one-sources,JAXP_DIST,$1)
+ $(call import-one-sources,JAXWS_DIST,$1)
+ $(call import-one-sources,NETX_DIST,$1)
++$(call import-one-sources,LIVECONNECT_DIST,$1)
+ endef
+
+ # Import all component docs into directory $1 (optional)
+@@ -162,6 +166,7 @@
More information about the distro-pkg-dev
mailing list