changeset in /hg/icedtea: Avoid invoking the generator in the Ni...

[Andrew John Hughes]

changeset a9c10241b227 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a9c10241b227
description:
	Avoid invoking the generator in the Nimbus makefile.

	2009-05-21  Andrew John Hughes  <ahughes at redhat.com>

		* patches/icedtea-pregenerated-nimbus.patch:
		Also patch the Nimbus Makefile to not set
		CLASSES_INIT and thus avoid invoking the
		generator.

diffstat:

2 files changed, 19 insertions(+)
ChangeLog                                 |    7 +++++++
patches/icedtea-pregenerated-nimbus.patch |   12 ++++++++++++

diffs (33 lines):

diff -r 5adda0d4b9f5 -r a9c10241b227 ChangeLog
--- a/ChangeLog	Thu May 21 17:09:13 2009 +0100
+++ b/ChangeLog	Thu May 21 17:14:27 2009 +0100
@@ -1,3 +1,10 @@ 2009-05-21  Andrew John Hughes  <ahughes
+2009-05-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-pregenerated-nimbus.patch:
+	Also patch the Nimbus Makefile to not set
+	CLASSES_INIT and thus avoid invoking the
+	generator.
+
 2009-05-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/ecj/icedtea-pr39408.patch:
diff -r 5adda0d4b9f5 -r a9c10241b227 patches/icedtea-pregenerated-nimbus.patch
--- a/patches/icedtea-pregenerated-nimbus.patch	Thu May 21 17:09:13 2009 +0100
+++ b/patches/icedtea-pregenerated-nimbus.patch	Thu May 21 17:14:27 2009 +0100
@@ -12,3 +12,15 @@ diff -Nru openjdk.orig/jdk/make/javax/sw
  
  # Nimbus is handled in its own directory
  AUTO_JAVA_PRUNE = nimbus
+diff -Nru openjdk.orig/jdk/make/javax/swing/plaf/nimbus/Makefile openjdk/jdk/make/javax/swing/plaf/nimbus/Makefile
+--- openjdk.orig/jdk/make/javax/swing/plaf/nimbus/Makefile	2009-05-08 16:10:44.000000000 +0100
++++ openjdk/jdk/make/javax/swing/plaf/nimbus/Makefile	2009-05-21 17:12:39.000000000 +0100
+@@ -44,8 +44,6 @@
+ #
+ # Rules
+ #
+-CLASSES_INIT = $(NIMBUS_GENSRC_DIR)
+-
+ include $(BUILDDIR)/common/Classes.gmk
+ 
+ $(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR)