changeset in /hg/icedtea6: Merge.
Andrew John Hughes
ahughes at redhat.com
Tue Feb 3 04:13:59 PST 2009
changeset 514ec9ce7cae in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=514ec9ce7cae
description:
Merge.
diffstat:
76 files changed, 1371 insertions(+), 896 deletions(-)
.hgtags | 2
ChangeLog | 275 ++++++++++
HACKING | 1
INSTALL | 4
Makefile.am | 211 -------
NEWS | 8
README | 14
acinclude.m4 | 76 --
configure.ac | 35 -
patches/icedtea-awt-window-size.patch | 4
patches/icedtea-cc-interp-jvmti.patch | 12
patches/icedtea-visualvm.patch | 26
plugin/icedtea/sun/applet/AppletSecurityContextManager.java | 38 +
plugin/icedtea/sun/applet/PluginAppletSecurityContext.java | 3
plugin/icedtea/sun/applet/PluginAppletViewer.java | 39 +
plugin/icedtea/sun/applet/PluginCallRequestFactory.java | 38 +
plugin/icedtea/sun/applet/PluginClassLoader.java | 38 +
plugin/icedtea/sun/applet/PluginDebug.java | 38 +
plugin/icedtea/sun/applet/PluginException.java | 38 +
plugin/icedtea/sun/applet/PluginMain.java | 37 +
plugin/icedtea/sun/applet/PluginMessageConsumer.java | 38 +
plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java | 38 +
plugin/icedtea/sun/applet/PluginStreamHandler.java | 38 +
plugin/icedtea/sun/applet/RequestQueue.java | 40 +
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 32 +
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 8
ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 27
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp | 4
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 4
ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 9
ports/hotspot/src/share/vm/includeDB_shark | 2
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 4
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 25
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 24
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 98 +++
ports/hotspot/src/share/vm/shark/sharkBytecodeTracer.cpp | 2
ports/hotspot/src/share/vm/shark/sharkEntry.cpp | 24
ports/hotspot/src/share/vm/shark/sharkEntry.hpp | 20
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 24
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 2
ports/hotspot/src/share/vm/shark/shark_globals.hpp | 3
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 56 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMuteControl.java | 73 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 45 +
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java | 59 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 52 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java | 4
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java | 6
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java | 24
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 17
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 66 --
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c | 10
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c | 14
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 64 ++
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java | 2
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java | 10
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java | 20
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java | 5
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java | 5
rt/net/sourceforge/jnlp/DefaultLaunchHandler.java | 2
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 2
rt/net/sourceforge/jnlp/security/AccessWarningPane.java | 1
rt/net/sourceforge/jnlp/security/AppletWarningPane.java | 1
rt/net/sourceforge/jnlp/security/CertVerifier.java | 92 +++
rt/net/sourceforge/jnlp/security/CertWarningPane.java | 39 -
rt/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 82 ++
rt/net/sourceforge/jnlp/security/MoreInfoPane.java | 1
rt/net/sourceforge/jnlp/security/SecurityDialogUI.java | 1
rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 1
rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 1
rt/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 3
rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 2
rt/net/sourceforge/jnlp/tools/CertVerifier.java | 92 ---
rt/net/sourceforge/jnlp/tools/KeyTool.java | 1
visualvm.desktop | 9
diffs (truncated from 3618 to 500 lines):
diff -r 050b48f42fb3 -r 514ec9ce7cae .hgtags
--- a/.hgtags Mon Jan 26 23:09:32 2009 +0000
+++ b/.hgtags Mon Jan 26 23:12:40 2009 +0000
@@ -10,3 +10,5 @@ 871b70407a139c6bd42c200762ee1d302b31168f
871b70407a139c6bd42c200762ee1d302b31168f icedtea6-1.2
3ef9c9c4e70b8204b73fa9b88243f49f59c2a23f icedtea6-1.3
be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1
+6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre
+2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4
diff -r 050b48f42fb3 -r 514ec9ce7cae ChangeLog
--- a/ChangeLog Mon Jan 26 23:09:32 2009 +0000
+++ b/ChangeLog Mon Jan 26 23:12:40 2009 +0000
@@ -29,6 +29,281 @@ 2009-01-26 Andrew John Hughes <ahughes
(FileChannelImpl): Fix imports.
(Net.c): Patch to new version with new functions.
(nio_util.h): Add RESTARTABLE macro.
+
+2009-01-26 Lillian Angel <langel at redhat.com>
+
+ * configure.ac: Updated to pre-1.5 version.
+
+2009-01-26 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+ (JavaThread::has_special_condition_for_native_trans): New method.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:
+ (CppInterpreter::native_entry): Correctly handle safepoints
+ during post-call thread state transition.
+
+2009-01-22 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:
+ (CppInterpreter::native_entry): Correctly handle asynchronous
+ exceptions during post-call thread state transition.
+
+2009-01-22 Omair Majid <omajid at redhat.com>
+ Ioana Ivan <iivan at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
+ (start): Return silently if already started.
+ (stop): Return silently if already stopped.
+
+2009-01-22 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Use
+ Hashtable to store classloaders, instead of HashMap (values cannot be
+ null in HashTable).
+ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Catch CFE in
+ addition to CNFE.
+
+2009-01-22 Andrew Haley <aph at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp (class
+ ZeroFrame::FrameType): Set ENTRY_FRAME = 0xCAFEBABE.
+
+ * ports/hotspot/src/share/vm/shark/shark_globals.hpp (SHARK_FLAGS):
+ Add SharkPrintAsmOf.
+
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Add comment.
+
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+ (SharkFunction::initialize): Set builder()->sharkEntry.
+ Use fnmatch() instead of strcmp().
+ Generate debugging dumps.
+ * ports/hotspot/src/share/vm/shark/sharkEntry.hpp
+ (SharkEntry::code_start, code_limit): Rewrite.
+ (SharkEntry::setBounds): New.
+
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+ (SharkBuilder::pointer_constant): New function.
+ * ports/hotspot/src/share/vm/shark/sharkBytecodeTracer.cpp
+ (SharkBytecodeTracer::decode_one_word):
+ use SharkBuilder::pointer_constant.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::sharkEntry): New.
+ (SharkBuilder::CreateUnimplemented): use SharkBuilder::pointer_constant.
+ (SharkBuilder::CreateShouldNotReachHere): Likewise.
+ (MyJITMemoryManager::endFunctionBody): New method.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+ (SharkBlock::check_zero): use SharkBuilder::pointer_constant.
+ (SharkBlock::check_bounds): Likewise.
+ (SharkBlock::add_safepoint): Likewise.
+ (SharkBlock::do_new): Likewise.
+ (SharkBlock::do_monitorexit): Don't check for null monitor.
+
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Add
+ llvm/ExecutionEngine/JITMemoryManager.h,
+ llvm/Support/CommandLine.h.
+ * ports/hotspot/src/share/vm/includeDB_shark (sharkBuilder.hpp):
+ add sharkEntry.hpp.
+
+2009-01-22 Lillian Angel <langel at redhat.com>
+
+ * NEWS: Updated for release candidate.
+
+2009-01-22 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp: Updated copyright year.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
+
+2009-01-22 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
+ (print_zero_threads): New debug function.
+
+2009-01-22 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-cc-interp-jvmti.patch: Reenable thread signalling.
+
+2009-01-21 Omair Majid <omajid at redhat.com>
+
+ * patches/icedtea-awt-window-size.patch: Update patch.
+
+2009-01-21 Omair Majid <omajid at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java:
+ Remove unused variables volume and muted.
+ (PulseAudioClip): Remove variable volume.
+ (open): Remove muteControl, volume and muted.
+ (native_setVolume): Rename to native_set_volume.
+ (native_update_volume): New function.
+ (isMuted): Remove.
+ (setMuted): Remove.
+ (setVolume): Rename to setCachedVolume.
+ (getVolume): Rename to getCachedVolume.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMuteControl.java:
+ Remove file. Mute relied on chaning the volume only through the api. That
+ assumption is invalid as the user can change volume through pulseaudio's
+ controls.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java
+ (isMuted): Remove.
+ (setMuted): Remove.
+ (native_setVolume): Rename to native_set_volume.
+ (native_update_volume): New function.
+ (getVolume): Rename to getCachedVolume.
+ (setVolume): Rename to setCachedVolume.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java:
+ Remove muted and muteControl. Rename volume to cachedVolume.
+ (PulseAudioPort): Remove muteControl.
+ (isMuted): Remove function.
+ (setMuted): Remove.
+ (native_setVolume): Rename to native_set_volume.
+ (native_updateVolumeInfo): Rename to native_update_volume.
+ (setVolume): Rename to setCachedVolume.
+ (getVolume): Rename to getCachedVolume.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java:
+ Remove muteControl, muted and volume.
+ (open): Remove muteControl.
+ (native_setVolume): Rename to native_set_volume.
+ (native_update_volume): New function.
+ (isMuted): Remove.
+ (setMuted): Remove.
+ (getVolume): Rename to getCachedVolume.
+ (setVolume): Rename to setCachedVolume.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java
+ (native_setVolume): Rename to native_set_volume.
+ (native_updateVolumeInfo): Rename to native_update_volume.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
+ (native_setVolume): Rename to native_set_volume.
+ (native_updateVolumeInfo): Rename to native_update_volume.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java
+ (setValue): Dont check for mute.
+ (getValue): Query pulseaudio for any change in volume.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java:
+ New variable cachedVolume.
+ (native_setVolume): Rename to native_set_volume.
+ (native_update_volume): New function.
+ (getCachedVolume): New function.
+ (setCachedVolume): New function.
+ (update_channels_and_volume): New function.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
+ (sink_input_volume_change_complete): Remove.
+ (sink_input_change_volume): Remove.
+ (Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1set_1sink_1volume):
+ Remove.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
+ (Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1updateVolumeInfo):
+ Rename to
+ Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1update_1volume.
+ (Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1setVolume):
+ Rename to
+ Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1set_1volume.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
+ (Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1updateVolumeInfo):
+ Rename to
+ Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1update_1volume.
+ (Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1setVolume):
+ Rename to
+ Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1set_1volume.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1setVolume): Rename
+ to Java_org_classpath_icedtea_pulseaudio_Stream_native_1set_1volume.
+ (get_sink_input_volume_callback): New function.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1update_1volume): New
+ function.
+
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
+ (testSupportedControls): Update to not check for MuteControl.
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java
+ (testVolumeAndMute): Rename to testVolume. Remove test for MuteControl.
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java
+ (testVolumeAndMute): Likewise.
+ (testSupportedControls): Update to not check for MuteControl.
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java
+ (testControls): Update to not check for MuteControl.
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java
+ (testControls): Likewise.
+
+2009-01-21 Lillian Angel <langel at redhat.com>
+
+ * plugin/icedtea/sun/applet/AppletSecurityContextManager.java: Added
+ copyright header.
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java: Likewise.
+ * plugin/icedtea/sun/applet/PluginCallRequestFactory.java: Likewise.
+ * plugin/icedtea/sun/applet/PluginClassLoader.java: Likewise.
+ * plugin/icedtea/sun/applet/PluginDebug.java: Likewise.
+ * plugin/icedtea/sun/applet/PluginException.java: Likewise.
+ * plugin/icedtea/sun/applet/PluginMain.java: Likewise.
+ * plugin/icedtea/sun/applet/PluginMessageConsumer.java: Likewise.
+ * plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java: Likewise.
+ * plugin/icedtea/sun/applet/PluginStreamHandler.java: Likewise.
+ * plugin/icedtea/sun/applet/RequestQueue.java: Likewise.
+
+2009-01-21 Lillian Angel <langel at redhat.com>
+
+ * rt/net/sourceforge/jnlp/security/CertVerifier.java: Fixed file name
+ in GPL header.
+ * rt/net/sourceforge/jnlp/security/HttpsCertVerifier.java: Likewise.
+
+2009-01-20 Lillian Angel <langel at redhat.com>
+
+ * rt/net/sourceforge/jnlp/DefaultLaunchHandler.java: Removed debug
+ lines.
+ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Likewise.
+ * rt/net/sourceforge/jnlp/security/AccessWarningPane.java: Updated
+ imports.
+ * rt/net/sourceforge/jnlp/security/AppletWarningPane.java: Updated
+ imports.
+ * rt/net/sourceforge/jnlp/security/CertWarningPane.java: Updated
+ imports, added certVerifier global variable.
+ (CertWarningPane): Initialized certVerifier.
+ (installComponents): Added checks to determine if certificate is for
+ an https site, and set the name/publisher/from variables
+ appropriately. Also, customized warning pane label for https site.
+ * rt/net/sourceforge/jnlp/security/HttpsCertVerifier.java:
+ (getDetails): Implemented.
+ (addToDetails): Likewise.
+ (R): Likewise.
+ (getPublisher): Likewise.
+ (getRoot): Likewise.
+ (getRootInCacerts): Likewise.
+ (hasSigningIssues): Likewise.
+ (noSigningIssues): Likewise.
+ * rt/net/sourceforge/jnlp/security/MoreInfoPane.java: Fixed imports.
+ * rt/net/sourceforge/jnlp/security/SecurityDialogUI.java: Fixed
+ imports.
+ * rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java: Fixed
+ imports.
+ * rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java: Fixed
+ imports.
+ * rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java: Fixed
+ imports.
+ * rt/net/sourceforge/jnlp/tools/KeyTool.java: Removed debug lines.
+ * rt/net/sourceforge/jnlp/security/CertVerifier.java: Moved file
+ below, here.
+ * rt/net/sourceforge/jnlp/tools/CertVerifier.java: Removed.
+ * rt/net/sourceforge/jnlp/security/VariableX509TrustManager.java:
+ Removed debug lines.
+
+2009-01-20 Lillian Angel <langel at redhat.com>
+
+ * HACKING: Removed visualvm patch.
+ * INSTALL: Updated to remove visualvm notes.
+ * Makefile.am: Removed building of netbeans and visualvm.
+ * README: Updated to remove visualvm notes.
+ * acinclude.m4: Removed options for netbeans and visualvm.
+ * configure.ac: Likewise.
+ * patches/icedtea-visualvm.patch: Removed.
+ * visualvm.desktop: Removed.
+
+2009-01-20 Matthias Klose <doko at ubuntu.com>
+ Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.[ch]pp (i486): Rename
+ to x86.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp (fp): Remove PRODUCT
+ conditional, make the not-PRODUCT bit the default.
2009-01-19 Andrew John Hughes <ahughes at redhat.com>
diff -r 050b48f42fb3 -r 514ec9ce7cae HACKING
--- a/HACKING Mon Jan 26 23:09:32 2009 +0000
+++ b/HACKING Mon Jan 26 23:12:40 2009 +0000
@@ -54,7 +54,6 @@ The following patches are currently appl
* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti.
* icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
* icedtea-version.patch: Replace name and bug URL with IcedTea versions.
-* icedtea-visualvm.patch: Patches sources to build with platform8 and profiler3 instead of platform7 and profiler2.
* icedtea-webservices.patch: Add applet support.
* icedtea-zero-build.patch: Add support for the zero assembler build.
* icedtea-shark-build.patch: Add support for building the Shark JIT.
diff -r 050b48f42fb3 -r 514ec9ce7cae INSTALL
--- a/INSTALL Mon Jan 26 23:09:32 2009 +0000
+++ b/INSTALL Mon Jan 26 23:12:40 2009 +0000
@@ -30,10 +30,6 @@ libjpeg-devel = 6b
libjpeg-devel = 6b
zlib-devel
rhino (can be disabled using --without-rhino)
-
-For building VisualVM, you will need:
-netbeans (harness, platform8, apisupport1, java2, ide9)
-jakarta-commons-logging
For building the PulseAudio based mixer, you will need
pulseaudio-libs-devel >= 0.9.11
diff -r 050b48f42fb3 -r 514ec9ce7cae Makefile.am
--- a/Makefile.am Mon Jan 26 23:09:32 2009 +0000
+++ b/Makefile.am Mon Jan 26 23:12:40 2009 +0000
@@ -4,10 +4,6 @@ OPENJDK_VERSION = b14
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
-
-NETBEANS_BASIC_CLUSTER = a7ea855f475fa3a982f094a45c155ab4
-NETBEANS_PROFILER_MD5SUM = ff8e8abc42df6c6749e6b02bcf7bb0a5
-VISUALVM_MD5SUM = 4b55bc623418818793392bb233da2927
if ENABLE_GCJWEBPLUGIN
GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin
@@ -39,12 +35,6 @@ PULSE_JAVA_NATIVE_SRCDIR =
PULSE_JAVA_NATIVE_SRCDIR =
PULSE_JAVA_JAVA_SRCDIR =
PULSE_JAVA_CLASS_DIR =
-endif
-
-if WITH_VISUALVM
-VISUALVM_PATCH = patches/icedtea-visualvm.patch
-else
-VISUALVM_PATCH =
endif
if WITH_ALT_HSBUILD
@@ -78,8 +68,6 @@ endif
endif
endif
rm -rf cacao
- rm -rf visualvm
- rm -rf netbeans
rm -f jni-common.o
install:
@@ -93,13 +81,13 @@ install:
clean-tools-jar clean-shared-objects \
clean-copy clean-hotspot-tools clean-rt $(GCJWEBPLUGIN_CLEAN) \
$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
- clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform
+ clean-jtreg clean-jtreg-reports
EXTRA_DIST = rt generated \
patches/* \
gcjwebplugin.cc tools-copy contrib ports \
extra overlays \
- javaws.png javaws.desktop visualvm.desktop \
+ javaws.png javaws.desktop \
jconsole.desktop policytool.desktop \
test/jtreg \
IcedTeaPlugin.cc \
@@ -316,30 +304,6 @@ else
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
endif
-NETBEANS_BASIC_CLUSTER_URL = http://nbi.netbeans.org/files/documents/210/2056/
-
-if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
- NETBEANS_BASIC_CLUSTER_SRC_ZIP = $(ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP)
-else
- NETBEANS_BASIC_CLUSTER_SRC_ZIP = netbeans-6.1-200805300101-basic_cluster-src.zip
-endif
-
-NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
-
-if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
- NETBEANS_PROFILER_SRC_ZIP = $(ALT_NETBEANS_PROFILER_SRC_ZIP)
-else
- NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_preview2.tar.gz
-endif
-
-VISUALVM_URL = http://icedtea.classpath.org/visualvm/
-
-if USE_ALT_VISUALVM_SRC_ZIP
- VISUALVM_SRC_ZIP = $(ALT_VISUALVM_SRC_ZIP)
-else
- VISUALVM_SRC_ZIP = visualvm-20081031-src.tar.gz
-endif
-
stamps/hgforest.stamp:
if OPENJDK_SRC_DIR_FOUND
else
@@ -417,46 +381,6 @@ endif
endif
endif
endif
-if WITH_VISUALVM
-if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
-else
- if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
- then \
- if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \
- then \
- mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \
- fi ; \
- $(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
- -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
- fi
-endif
-if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
-else
- if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
- then \
- if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
- then \
- mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
- fi ; \
- $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
- -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
- fi
-endif
-if USE_ALT_VISUALVM_SRC_ZIP
-else
- if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
- then \
- if [ $(VISUALVM_SRC_ZIP) ] ; \
- then \
- mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
- fi ; \
- $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \
- fi
-endif
-endif
mkdir -p stamps
touch stamps/download.stamp
@@ -468,11 +392,6 @@ clean-download:
rm -f $(OPENJDK_SRC_ZIP)
if WITH_CACAO
rm -f $(CACAO_SRC_ZIP)
-endif
-if WITH_VISUALVM
- rm -f $(VISUALVM_SRC_ZIP)
- rm -f $(NETBEANS_PROFILER_SRC_ZIP)
- rm -rf $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)
endif
# Link ports sources into tree
@@ -629,7 +548,6 @@ ICEDTEA_PATCHES += \
patches/icedtea-arch.patch \
patches/icedtea-lc_ctype.patch \
patches/icedtea-messageutils.patch \
- $(VISUALVM_PATCH) \
patches/icedtea-javac-debuginfo.patch \
patches/icedtea-xjc.patch \
patches/icedtea-renderer-crossing.patch \
@@ -735,27 +653,6 @@ if !USE_SYSTEM_CACAO
ln -s $$dir cacao/cacao ; \
fi
endif
-endif
-if WITH_VISUALVM
- if ! test -d visualvm ; \
- then \
- $(TAR) xf $(VISUALVM_SRC_ZIP) ; \
- fi
- if ! test -d netbeans ; \
- then \
- mkdir netbeans ; \
- $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
- $(UNZIP) -q $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) nbbuild/* -d netbeans/ ; \
- mv netbeans/profiler/ netbeans/profiler.cvs/ ; \
- $(UNZIP) -q $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
- api.java/* api.progress/* apisupport.harness/* editor.mimelookup/* \
- o.jdesktop.layout/* openide.actions/* openide.awt/* \
- openide.dialogs/* openide.execution/* openide.explorer/* \
- openide.filesystems/* openide.io/* openide.loaders/* \
- openide.modules/* openide.nodes/* openide.text/* openide.util/* \
- openide.windows/* options.api/* projectapi/* queries/* java.platform/* \
- -d netbeans/ ; \
- fi
endif
if [ ! -e $(abs_top_builddir)/generated ]; then \
cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
@@ -1126,7 +1023,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
More information about the distro-pkg-dev
mailing list