/hg/icedtea6-hg: 3 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Sat Jun 12 17:41:21 PDT 2010


changeset be0a17ddbdb8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=be0a17ddbdb8
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 11 14:45:52 2010 +0100

	Drop old dependencies of rt.stamp that are no longer needed.

	2010-06-11 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (rt.stamp): Drop old dependencies no
	longer needed.


changeset 183783e975ca in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=183783e975ca
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Jun 13 01:39:55 2010 +0100

	Add generated Nimbus files so we can build SynthUI during bootstrap.

	2010-06-13 Andrew John Hughes <ahughes at redhat.com>

	 *
	generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.jav
	a,
		* generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditable
	State.java,
		* generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.
	java,
		* generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java,
		* generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.ja
	va,
		* generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.j
	ava,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneClose
	ButtonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneClose
	ButtonWindowNotFocusedState.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconi
	fyButtonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconi
	fyButtonWindowNotFocusedState.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim
	izeButtonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim
	izeButtonWindowMaximizedState.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim
	izeButtonWindowNotFocusedState.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuB
	uttonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuB
	uttonWindowNotFocusedState.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePaint
	er.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindo
	wFocusedState.java,
		* generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedS
	tate.java,
		* generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java,
		* generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOption
	PaneLabelPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainte
	r.java,
		* generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.j
	ava,
		* generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.ja
	va,
		* generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateSta
	te.java,
		* generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.
	java,
		* generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java
	,
		* generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java,
		* generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.
	java,
		* generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.
	java,
		* generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.ja
	va,
		* generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormatte
	dTextFieldPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainte
	r.java,
		* generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.jav
	a,
		* generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalSta
	te.java,
		* generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java
	,
		* generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.ja
	va,
		* generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.
	java,
		* generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedSt
	ate.java,
		* generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneStat
	e.java,
		* generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java,
		* generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java,
		* generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java,
		* generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.
	java,
		* generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java,
		* generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java,
		* generated/com/sun/java/swing/plaf/nimbus/TreePainter.java:
	Add generated Nimbus files so SynthUI can be compiled during
	bootstrap.


changeset f7f32c0c87c1 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f7f32c0c87c1
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Jun 13 01:41:08 2010 +0100

	Merge


diffstat:

112 files changed, 40319 insertions(+), 15618 deletions(-)
ChangeLog                                                                                               |  199 
Makefile.am                                                                                             |   76 
generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java                                        |  119 
generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java                                             |  653 
generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java                                   |  163 
generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java                                           |  636 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java                          |   42 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java                                |  477 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java                                     |   42 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java                                           |  734 
generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java                                  |  255 
generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java                                        |  160 
generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java                                        |  351 
generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java                                         |  125 
generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java                                        | 2249 
generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java                                 |  382 
generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java                                      |  403 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java                  |  464 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java    |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java                |  607 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java  |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java               | 1046 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java  |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java                   |  518 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java     |   51 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java                             |   89 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java                  |   41 
generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java                           |   41 
generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java                                        |  108 
generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java                                            |  153 
generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java                                           |  108 
generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java                                               |  158 
generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java                                            | 1773 
generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java               |  106 
generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java                              |   89 
generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java                                         |  584 
generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java                                      |  382 
generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java                                          |  164 
generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java                                 |  106 
generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java                                  |   43 
generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java                             |   43 
generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java                                        |  613 
generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java                                |  172 
generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java                                        |  705 
generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java                                    |  381 
generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java                                          |   88 
generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java                                     |  380 
generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java                                     |  276 
generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java                                         |  179 
generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java                                          |  106 
generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java                                     |   40 
generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java                                             |   88 
generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java                                |   40 
generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java                                        |  655 
generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java                                |   40 
generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java                                        |  230 
generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java                                  |  583 
generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java                                            |   89 
generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java              |  321 
generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java                              |  505 
generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java                                   |  290 
generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java                             |   41 
generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java                                          |   89 
generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java                                    |   41 
generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java                                         |   93 
generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java                                  |  221 
generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java                                      |  678 
generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java                                        |  135 
generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java                                        |  141 
generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java                                |  381 
generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java                            |   42 
generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java                              |   41 
generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java                                           |  412 
generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java                                          |  382 
generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java                                           |  125 
generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java                                       |  706 
generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java                                      |  289 
generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java                                          |   43 
generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java                                         |   43 
generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java                                            |  212 
generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java                                         |   43 
generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java                                |  536 
generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java                                          |   43 
generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java                                            |  151 
generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java                                     |  144 
generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java                                           |  146 
generated/com/sun/java/swing/plaf/nimbus/TreePainter.java                                               |  653 
hotspot.map                                                                                             |    1 
patches/ecj/icedtea.patch                                                                               |  134 
patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch                                             |   42 
patches/hotspot/hs17/params-cast-size_t.patch                                                           |  252 
patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch                                               |   14 
patches/hotspot/hs17/systemtap.patch                                                                    |  157 
patches/hotspot/original/params-cast-size_t.patch                                                       |  252 
patches/hotspot/original/shark_do_nothing_on_stub_frame.patch                                           |   15 
patches/hotspot/original/systemtap.patch                                                                |  182 
patches/icedtea-alpha-fixes.patch                                                                       |   24 
patches/icedtea-clean-crypto.patch                                                                      |   91 
patches/icedtea-doc-headers.patch                                                                       |  181 
patches/icedtea-java2d-dasher.patch                                                                     |   11 
patches/icedtea-jtreg-jrunscript.patch                                                                  |   26 
patches/icedtea-nio2.patch                                                                              |  269 
patches/icedtea-nomotif-6706121.patch                                                                   |26836 +++++-----
patches/icedtea-sh4-support.patch                                                                       |  212 
patches/openjdk/6616792-focus-tests-fix.patch                                                           | 1117 
patches/openjdk/6798572-iso-8859-15-fix.patch                                                           |   10 
patches/openjdk/6896472-missing_libjsig.patch                                                           |   20 
patches/params-cast-size_t.patch                                                                        |  252 
patches/shark_do_nothing_on_stub_frame.patch                                                            |   14 
patches/systemtap.patch                                                                                 |  157 
patches/xrender/icedtea-000.patch                                                                       |  112 

diffs (truncated from 58082 to 500 lines):

diff -r fa0ad887008c -r f7f32c0c87c1 ChangeLog
--- a/ChangeLog	Mon Jun 07 19:43:40 2010 +0100
+++ b/ChangeLog	Sun Jun 13 01:41:08 2010 +0100
@@ -1,3 +1,139 @@ 2010-06-07 Andrew John Hughes  <ahughes@
+2010-06-13 Andrew John Hughes  <ahughes at redhat.com>
+
+	* generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java,
+	* generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java,
+	* generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java,
+	* generated/com/sun/java/swing/plaf/nimbus/TreePainter.java:
+	Add generated Nimbus files so SynthUI can be compiled during
+	bootstrap.
+
+2010-06-11 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(rt.stamp): Drop old dependencies no
+	longer needed.
+
+2010-06-10 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-doc-headers.patch:
+	Dropped, upstream file has completely changed.
+	May need to be recreated, may not.
+	* patches/icedtea-java2d-dasher.patch:
+	Upstreamed by Omair as 6793344.  Now in OpenJDK6.
+	* Makefile.am:
+	Remove above patches.
+	(JAXWS_DROP_URL): Updated.
+	(JAXWS_DROP_ZIP): Likewise.
+	(JAXWS_DROP_SHA256SUM): Likewise.
+	(JAF_DROP_URL): Added.
+	(JAF_DROP_ZIP): Updated.
+	(JAF_DROP_SHA256SUM): Likewise.
+	(JAXP_DROP_URL): Updated.
+	(JAXP_DROP_ZIP): Likewise.
+	(JAXP_DROP_SHA256SUM): Likewise.
+	(download-jaf-drop): Use specific JAF_DROP_URL,
+	not JAXWS_DROP_URL.
+	* patches/icedtea-nio2.patch: Converted to use
+	new doc generation makefile.
+
+2010-06-08 Andrew John Hughes  <ahughes at redhat.com>
+
+	Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ
+	made obsolete by previous merge.  Use --reflink=auto instead
+	of -l to avoid cross-device issues.
+	* Makefile.am:
+	(ICEDTEA_ENV): Fix use of ICEDTEA_BUILD_DIR.
+	(ICEDTEA_ENV_ECJ): Fix use of ICEDTEA_BUILD_DIR_ECJ.
+	(distclean-local): Fix use of ICEDTEA_BUILD_DIR
+	and ICEDTEA_BUILD_DIR_ECJ.
+	(extract-openjdk.stamp): Use --reflink=auto instead
+	of -l.
+	(liveconnect-dist.stamp): Likewise.
+	(netx-dist.stamp): Likewise.
+	(plugin-tests.stamp): Likewise.
+
 2010-06-07 Andrew John Hughes  <ahughes at redhat.com>
 
 	Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR
@@ -32,6 +168,13 @@ 2010-06-07 Jon VanAlten  <jon.vanalten at r
 	* Makefile.am
 	(stamps/icedtea.stamp): Use full path when adding PulseAudio sources to src.zip
 
+2010-06-06  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-alpha-fixes.patch:
+	Remove upstreamed JDK portion.
+	* patches/icedtea-sh4-support.patch:
+	Recreated against upstreamed alpha patch.
+
 2010-06-04 Jon VanAlten  <jon.vanalten at redhat.com>
 
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java:
@@ -43,11 +186,21 @@ 2010-06-01  Xerxes RÃ¥nby  <xerxes at zafen
 2010-06-01  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* Makefile.am:
-	(extra-lib/about.jar): Remove redundant 
+	(extra-lib/about.jar): Remove redundant
 	conditional that we don't need any more.
 	(rewrite-rhino.stamp): Use full path to
 	jar application to avoid relying on the one
 	on the path.
+
+2010-05-26  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/ecj/icedtea.patch,
+	* patches/icedtea-clean-crypto.patch,
+	* patches/icedtea-jtreg-jrunscript.patch,
+	* patches/icedtea-nio2.patch,
+	* patches/icedtea-nomotif-6706121.patch,
+	* patches/xrender/icedtea-000.patch:
+	Update after changes to licensing headers.
 
 2010-05-28 Andrew John Hughes  <ahughes at redhat.com>
 
@@ -74,6 +227,30 @@ 2010-05-24  Andrew John Hughes  <ahughes
 	over any --with-openjdk-src-zip/dir options.
 	Using a live Mercurial checkout only makes
 	sense in this context.
+
+2010-05-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	Remove hs17 build option as this is now the default.
+	* patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch:
+	Dropped; applied upstream.
+	* patches/hotspot/hs17/params-cast-size_t.patch,
+	* patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch,
+	* patches/hotspot/hs17/systemtap.patch:
+	Moved to top-level.
+	* patches/hotspot/original/params-cast-size_t.patch,
+	* patches/hotspot/original/shark_do_nothing_on_stub_frame.patch,
+	* patches/hotspot/original/systemtap.patch:
+	Dropped; hs16 is dead.
+	* patches/openjdk/6896472-missing_libjsig.patch:
+	Dropped; applied upstream.
+	* Makefile.am:
+	Remove differentation between original and hs17 build patches
+	as only build is now the hs17 one in the OpenJDK repository.
+	* hotspot.map: Drop hs17.
+	* patches/params-cast-size_t.patch,
+	* patches/shark_do_nothing_on_stub_frame.patch,
+	* patches/systemtap.patch:
+	Moved from hs17 to top-level.
 
 2010-05-20  Gary Benson  <gbenson at redhat.com>
 
@@ -265,7 +442,7 @@ 2010-05-10  Gary Benson  <gbenson at redhat
 	for new stack overflow code.
 	(SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise.
 	(SharkStack::CreateAssertLastJavaSPIsNull): New method.
-	
+
 	* ports/hotspot/make/linux/makefiles/zeroshark.make
 	(CFLAGS): Remove -DHOTSPOT_ASM until the ARM interpreter
 	and JIT are updated to use the new frame anchor code.
@@ -397,6 +574,24 @@ 2010-04-28  Andrew John Hughes  <ahughes
 	* patches/systemtap-gcc-4.5.patch:
 	Add cast to NULL (doesn't apply to DTrace due
 	to differences between SystemTap and DTrace macros).
+
+2010-04-26  Andrew John Hughes  <ahughes at redhat.com>
+
+	Use build directories outside the source
+	tree and link instead of copying external
+	source trees where possible.
+	* Makefile.am:
+	(OS_DIR): Removed.
+	(BUILD_OUTPUT_DIR): Set to openjdk.build.
+	(ECJ_BUILD_OUTPUT_DIR): Set to openjdk-ecj.build.
+	(ICEDTEA_ENV): Set output directory.
+	(ICEDTEA_ENV_ECJ): Likewise.
+	(distclean-local): Remove build directories.
+	(extract-openjdk.stamp): Link instead of copying
+	where possible.
+	(liveconnect-dist.stamp): Likewise.
+	(netx-dist.stamp): Likewise.
+	(plugin-tests.stamp): Likewise.
 
 2010-04-24  Matthias Klose  <doko at ubuntu.com>
 
diff -r fa0ad887008c -r f7f32c0c87c1 Makefile.am
--- a/Makefile.am	Mon Jun 07 19:43:40 2010 +0100
+++ b/Makefile.am	Sun Jun 13 01:41:08 2010 +0100
@@ -18,23 +18,23 @@ VISUALVM_URL = https://visualvm.dev.java
 VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/
 VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz
 
-JAXWS_DROP_URL = http://kenai.com/projects/jdk6-drops/downloads/download
-JAXWS_DROP_ZIP = jdk6-jaxws-2009_10_27.zip
-JAXWS_DROP_SHA256SUM = 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2
-JAF_DROP_ZIP = jdk6-jaf-2009_10_27.zip
-JAF_DROP_SHA256SUM = fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147491
-JAXP_DROP_ZIP = jdk6-jaxp-2010_01_15.zip
-JAXP_DROP_SHA256SUM = 181615cfec1c3721a7d8f278fa25b392be4247a496c7774a10cb9df37684f94f
+JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150724
+JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip
+JAXWS_DROP_SHA256SUM = 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
+JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725
+JAF_DROP_ZIP = jdk6-jaf-b20.zip
+JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648
+JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
+JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
 
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
 
 # Build directories
 
-OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR)
+BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk.build
 DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
-ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj/build/$(OS_DIR)
+ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj.build
 ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
 ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
 ICEDTEA_BOOT_DIR= \
@@ -177,11 +177,12 @@ else
   MEMORY_LIMIT =
 endif
 
+ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(ICEDTEA_DEBUG_BUILD_DIR)"
 if WITH_CACAO
   ICEDTEA_BUILD_TARGET=j2se_only
-  ICEDTEA_DEBUG_BUILD_TARGET=j2se_fastdebug_only
+  ICEDTEA_DEBUG_BUILD_TARGET += j2se_fastdebug_only
 else
-  ICEDTEA_DEBUG_BUILD_TARGET=debug_build
+  ICEDTEA_DEBUG_BUILD_TARGET += debug_build
 endif
 
 # FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap
@@ -217,7 +218,7 @@ ICEDTEA_FSG_PATCHES =
 ICEDTEA_FSG_PATCHES =
 
 ICEDTEA_PATCHES = \
-	patches/hotspot/$(HSBUILD)/shark_do_nothing_on_stub_frame.patch \
+	patches/shark_do_nothing_on_stub_frame.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
@@ -253,7 +254,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-alt-jar.patch \
 	patches/icedtea-jdk-use-ssize_t.patch \
 	patches/icedtea-use-idx_t.patch \
-	patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \
+	patches/params-cast-size_t.patch \
 	patches/icedtea-clean-crypto.patch \
 	patches/icedtea-shark.patch \
 	patches/icedtea-arch.patch \
@@ -265,14 +266,12 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-testenv.patch \
 	patches/icedtea-samejvm-safe.patch \
 	patches/icedtea-pr261.patch \
-	patches/icedtea-doc-headers.patch \
 	patches/icedtea-sparc-buildfixes.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-demo-swingapplet.patch \
 	patches/icedtea-awt-window-size.patch \
-	patches/icedtea-java2d-dasher.patch \
 	patches/icedtea-jtreg-6592792.patch \
 	patches/icedtea-s390-noinline.patch \
 	patches/icedtea-jtreg-dnd.patch \
@@ -294,16 +293,7 @@ ICEDTEA_PATCHES = \
 	patches/extensions/netx.patch \
 	patches/extensions/netx-dist.patch \
 	patches/extensions/netx-umask.patch \
-	patches/icedtea-jtreg-httpTest.patch \
-	patches/nss-debug.patch \
-	patches/openjdk/6616792-focus-tests-fix.patch \
-	patches/openjdk/6798572-iso-8859-15-fix.patch
-
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += \
-	patches/openjdk/6896472-missing_libjsig.patch \
-	patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch
-endif
+	patches/icedtea-jtreg-httpTest.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -351,7 +341,7 @@ endif
 endif
 
 if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/systemtap.patch \
+ICEDTEA_PATCHES += patches/systemtap.patch \
 	patches/systemtap-gcc-4.5.patch
 endif
 
@@ -447,7 +437,8 @@ ICEDTEA_ENV = \
 	ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
 	VERBOSE="$(VERBOSE)" \
 	ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
-	ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect"
+	ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \
+	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -488,6 +479,7 @@ endif
 
 # OpenJDK ecj build environment.
 ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
+	ALT_OUTPUTDIR="$(ECJ_BUILD_OUTPUT_DIR)" \
 	JAVA_TOOLS_DIR="$(ICEDTEA_BOOT_DIR)/bin" \
 	ICEDTEA_RT="$(ICEDTEA_RT)" \
 	ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR_ECJ)" \
@@ -542,7 +534,9 @@ distclean-local: clean-copy clean-jtreg 
 	rm -rf lib
 	rm -rf extra-lib
 	rm -rf openjdk-ecj
+	rm -rf $(ECJ_BUILD_OUTPUT_DIR)
 	rm -rf openjdk
+	rm -rf $(BUILD_OUTPUT_DIR)
 	rm -rf visualvm
 	rm -rf netbeans
 
@@ -647,7 +641,7 @@ endif
 	  then \
 	    mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
 	  fi ; \
-	  $(WGET) $(JAXWS_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
+	  $(WGET) $(JAF_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
 	  if ! echo "$(JAF_DROP_SHA256SUM)  drops/$(JAF_DROP_ZIP)" \
 	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of jaf drop zip"; false; \
@@ -809,7 +803,7 @@ clean-extract:
 
 stamps/extract-openjdk.stamp: stamps/download.stamp
 if OPENJDK_SRC_DIR_FOUND
-	cp -a $(OPENJDK_SRC_DIR) openjdk
+	cp -pPR --reflink=auto $(OPENJDK_SRC_DIR) openjdk
 else
 	set -e ; \
 	if ! test -d openjdk ; \
@@ -1542,7 +1536,7 @@ stamps/liveconnect-dist.stamp: stamps/li
 	  (cd $(abs_top_builddir)/liveconnect ; \
 	   mkdir -p lib ; \
 	   $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \
-	   cp -a $(LIVECONNECT_SRCS) src; \
+	   cp -pPR --reflink=auto $(LIVECONNECT_SRCS) src; \
 	   find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
 	   cd src ; \
 	   $(ZIP) -qr $(abs_top_builddir)/liveconnect/lib/src.zip $(LIVECONNECT_DIR) ) ; \
@@ -1578,7 +1572,7 @@ stamps/netx-dist.stamp: stamps/netx.stam
 	(cd $(abs_top_builddir)/netx.build ; \
 	 mkdir -p lib ; \
 	 $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
-	 cp -a $(NETX_SRCDIR) src; \
+	 cp -pPR --reflink=auto $(NETX_SRCDIR) src; \
 	 find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
 	 cd src ; \
 	 $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \
@@ -1868,12 +1862,12 @@ if ADD_ZERO_BUILD
 
 if ZERO_BUILD
 	mkdir -p $(BUILD_JRE_ARCH_DIR)/shark
-	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+	cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_JRE_ARCH_DIR)/shark/
 	printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 else
 	mkdir -p $(BUILD_JRE_ARCH_DIR)/zero
-	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+	cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_JRE_ARCH_DIR)/zero/
 	printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1898,12 +1892,12 @@ if ADD_ZERO_BUILD
 
 if ZERO_BUILD
 	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
-	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+	cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_DEBUG_JRE_ARCH_DIR)/shark/
 	printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 else
 	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
-	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+	cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_DEBUG_JRE_ARCH_DIR)/zero/
 	printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1929,8 +1923,9 @@ stamps/plugin-tests.stamp: $(INITIAL_BOO
 	 $(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\"" ; \
+	cp -pPR --reflink=auto $(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
@@ -2055,8 +2050,7 @@ clean-rt:
 	rm -f rt-source-files.txt
 	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ICEDTEA_RT)
 
-stamps/rt.stamp: stamps/rt-class-files.stamp stamps/bootstrap-directory-ecj.stamp \
- stamps/liveconnect.stamp
+stamps/rt.stamp: stamps/rt-class-files.stamp
 	mkdir -p stamps
 if LACKS_SUN_AWT_TOOLKIT
 	$(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
diff -r fa0ad887008c -r f7f32c0c87c1 generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java	Sun Jun 13 01:41:08 2010 +0100
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2005, 2006, Oracle and/or its affiliates. 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any



More information about the distro-pkg-dev mailing list