changeset in /hg/icedtea6: 2008-06-29 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 97e8ffe85b04 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=97e8ffe85b04
description:
	2008-06-29  Matthias Klose  <doko at ubuntu.com>

	        * patches/icedtea-jdk-docs-target.patch: New.
	        * Makefile.am: Apply patch.
	        * Makefile.in: Regenerate.

diffstat:

5 files changed, 26 insertions(+), 1 deletion(-)
ChangeLog                             |    6 ++++++
HACKING                               |    1 +
Makefile.am                           |    1 +
Makefile.in                           |    3 ++-
patches/icedtea-jdk-docs-target.patch |   16 ++++++++++++++++

diffs (68 lines):

diff -r d331a425f6cd -r 97e8ffe85b04 ChangeLog
--- a/ChangeLog	Fri Jun 27 12:29:58 2008 -0400
+++ b/ChangeLog	Sun Jun 29 17:39:28 2008 +0200
@@ -1,3 +1,9 @@ 2008-06-27  Joshua Sumali  <jsumali at redh
+2008-06-29  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-jdk-docs-target.patch: New.
+	* Makefile.am: Apply patch.
+	* Makefile.in: Regenerate.
+	
 2008-06-27  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/net/sourceforge/jnlp/services/XPersistenceService.java: Throw a
diff -r d331a425f6cd -r 97e8ffe85b04 HACKING
--- a/HACKING	Fri Jun 27 12:29:58 2008 -0400
+++ b/HACKING	Sun Jun 29 17:39:28 2008 +0200
@@ -64,6 +64,7 @@ The following patches are only applied t
 * icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
 * icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
 * icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
+* icedtea-jdk-docs-target.patch: Always set DOCS_TARGET.
 
 The following patches are only applied to OpenJDK in IcedTea:
 
diff -r d331a425f6cd -r 97e8ffe85b04 Makefile.am
--- a/Makefile.am	Fri Jun 27 12:29:58 2008 -0400
+++ b/Makefile.am	Sun Jun 29 17:39:28 2008 +0200
@@ -380,6 +380,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-idl.patch \
 	patches/icedtea-shark-build.patch \
 	patches/icedtea-toolkit.patch \
+	patches/icedtea-jdk-docs-target.patch \
 	$(SHARK_PATCH) \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
diff -r d331a425f6cd -r 97e8ffe85b04 Makefile.in
--- a/Makefile.in	Fri Jun 27 12:29:58 2008 -0400
+++ b/Makefile.in	Sun Jun 29 17:39:28 2008 +0200
@@ -463,7 +463,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-dnd-updatecursor.patch \
 	patches/icedtea-component.patch patches/icedtea-idl.patch \
 	patches/icedtea-shark-build.patch \
-	patches/icedtea-toolkit.patch $(SHARK_PATCH) $(GCC_PATCH) \
+	patches/icedtea-toolkit.patch \
+	patches/icedtea-jdk-docs-target.patch $(SHARK_PATCH) $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7) $(am__append_8)
 
 # Patch OpenJDK for plug replacements and ecj.
diff -r d331a425f6cd -r 97e8ffe85b04 patches/icedtea-jdk-docs-target.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-jdk-docs-target.patch	Sun Jun 29 17:39:28 2008 +0200
@@ -0,0 +1,16 @@
+--- openjdk/control/make/make/jdk-rules.gmk	2008-06-29 10:09:47.002591764 +0000
++++ openjdk/control/make/make/jdk-rules.gmk	2008-06-29 15:04:01.228901751 +0000
+@@ -36,12 +36,7 @@
+   IMAGES_TARGET = images
+ endif
+ 
+-# No DOCS build when JDK_UPDATE_VERSION set
+-ifdef JDK_UPDATE_VERSION
+-  DOCS_TARGET =
+-else
+-  DOCS_TARGET = docs
+-endif
++DOCS_TARGET = docs
+ 
+ # NO_DOCS may be set in conjunction with DEV_ONLY
+ ifdef NO_DOCS