Mercurial > hg > release > icedtea-1.10

changeset 1826:27a1779cfd51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 22 May 2009 17:47:18 +0100
parents 9e6600d4fef2 (diff) c1469020162e (current diff)
children 8070d13626fa
files ChangeLog Makefile.am overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 22 17:16:39 2009 +0200
+++ b/ChangeLog	Fri May 22 17:47:18 2009 +0100
@@ -1,3 +1,10 @@
+2009-05-22  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Copy over Nimbus source files manually
+	rather than using generated as GENSRC
+	to avoid conflicts with IcedTea6.
+
 2009-05-22  Mark Wielaard  <mark@klomp.org>
 
 	* Makefile.am(ICEDTEA_PATCHES): patches/icedtea-samejvm-safe.patch
--- a/Makefile.am	Fri May 22 17:16:39 2009 +0200
+++ b/Makefile.am	Fri May 22 17:47:18 2009 +0100
@@ -1581,11 +1581,6 @@
 	"ALT_JAR_CMD=$(ALT_JAR_CMD)"
 endif
 
-if !ENABLE_NIMBUS_GENERATION
-ICEDTEA_ENV += \
-	"GENSRCDIR=$(abs_top_builddir)/generated"
-endif
-
 env:
 	@echo 'unset JAVA_HOME'
 	@echo 'export $(ICEDTEA_ENV)'
@@ -3141,6 +3136,10 @@
 	ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR)
 	ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR)
 	ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR)
+else
+	mkdir -p $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf
+	cp -a $(abs_topbuilddir)/generated/javax/swing/plaf/nimbus \
+	  $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf
 endif
 endif
 	mkdir -p stamps