changeset in /hg/icedtea6: The outputted documentation should be...

[Andrew John Hughes]

changeset c38d90386c71 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c38d90386c71
description:
	The outputted documentation should be licensed under the GPL
	but for some reason this only occurs when FCS is not set.  This
	fixes the issue.

	2009-02-03  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		Add new patch.
		* patches/icedtea-doc-headers.patch:
		Fix licensing of documentation.

diffstat:

3 files changed, 56 insertions(+), 1 deletion(-)
ChangeLog                         |    7 +++++
Makefile.am                       |    3 +-
patches/icedtea-doc-headers.patch |   47 +++++++++++++++++++++++++++++++++++++

diffs (78 lines):

diff -r 12c4111a284c -r c38d90386c71 ChangeLog
--- a/ChangeLog	Tue Feb 03 12:08:26 2009 +0000
+++ b/ChangeLog	Tue Feb 03 15:41:58 2009 +0000
@@ -1,3 +1,10 @@ 2009-01-30  Andrew John Hughes  <ahughes
+2009-02-03  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add new patch.
+	* patches/icedtea-doc-headers.patch:
+	Fix licensing of documentation.
+	
 2009-01-30  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-nio2.patch:
diff -r 12c4111a284c -r c38d90386c71 Makefile.am
--- a/Makefile.am	Tue Feb 03 12:08:26 2009 +0000
+++ b/Makefile.am	Tue Feb 03 15:41:58 2009 +0000
@@ -615,7 +615,8 @@ ICEDTEA_PATCHES += \
 	$(DISTRIBUTION_PATCHES) \
 	patches/icedtea-demo-swingapplet.patch \
 	patches/icedtea-awt-window-size.patch \
-	patches/icedtea-java2d-dasher.patch
+	patches/icedtea-java2d-dasher.patch \
+	patches/icedtea-doc-headers.patch
 
 stamps/extract.stamp: stamps/download.stamp
 if OPENJDK_SRC_DIR_FOUND
diff -r 12c4111a284c -r c38d90386c71 patches/icedtea-doc-headers.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-doc-headers.patch	Tue Feb 03 15:41:58 2009 +0000
@@ -0,0 +1,47 @@
+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+--- openjdk.orig/jdk/make/docs/Makefile	2009-02-03 13:34:38.000000000 +0000
++++ openjdk/jdk/make/docs/Makefile	2009-02-03 13:37:17.000000000 +0000
+@@ -99,36 +99,20 @@
+ 
+ TAGS = $(IGNORED_TAGS:%=-tag %:X) $(TAG_JLS3)
+ 
+-ifeq ($(MILESTONE), fcs)
+-    DOCTITLE_SWITCH = $(JAVADOCTITLE)
+-    WINDOWTITLE_SWITCH = $(JAVADOCWINDOWTITLE)
+-    HEADER_SWITCH = $(JAVADOCHEADER)
+-    TOPOPTION=
+-    JAVADOCBOTTOM_SWITCH= $(JAVADOCBOTTOM)
+-    OVERVIEW_OPTION = -overview $(JAVADOCOVERVIEW)
+-else
+-    DOCTITLE_SWITCH = $(JAVADOCTITLE_EARLYACCESS)$(DRAFT)
+-    WINDOWTITLE_SWITCH = $(JAVADOCWINDOWTITLE)" $(BUILD_NUMBER)"
+-    HEADER_SWITCH = $(JAVADOCHEADER)$(DRAFT)
+-    JAVADOCBOTTOM_SWITCH= $(JAVADOCBOTTOM_EARLYACCESS)
+-    TOPOPTION= -top $(JAVADOCTOP_EARLYACCESS)
+-    OVERVIEW_OPTION =
+-endif
++DOCTITLE_SWITCH = $(JAVADOCTITLE)
++WINDOWTITLE_SWITCH = $(JAVADOCWINDOWTITLE)" $(BUILD_NUMBER)"
++HEADER_SWITCH = $(JAVADOCHEADER)
++TOPOPTION=
++JAVADOCBOTTOM_SWITCH= $(JAVADOCBOTTOM)
++OVERVIEW_OPTION = -overview $(JAVADOCOVERVIEW)
+ 
+ JAVADOCTITLE  = 'Java$(TRADEMARK) Platform, Standard Edition $(JDK_MINOR_VERSION)<br>API Specification'
+ JAVADOCWINDOWTITLE  = 'Java Platform SE $(JDK_MINOR_VERSION)'
+ JAVADOCHEADER = '<b>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</b>'
+-JAVADOCBOTTOM = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Submit a bug or feature</a><br>For further API reference and developer documentation, see <a href="{@docroot}/../../webnotes/devdocs-vs-specs.html">Java SE Developer Documentation</a>. That documentation contains more detailed, developer-targeted descriptions, with conceptual overviews, definitions of terms, workarounds, and working code examples. <p>Copyright $(THIS_YEAR) Sun Microsystems, Inc. All rights reserved. Use is subject to <a href="{@docroot}/../legal/license.html">license terms</a>. Also see the <a href="http://java.sun.com/docs/redist.html">documentation redistribution policy</a>.</font>'
++JAVADOCBOTTOM = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Submit a bug or feature</a> <p>Copyright $(THIS_YEAR) Sun Microsystems, Inc. All rights reserved. Use is subject to the terms of the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</font>'
+ JAVADOCOVERVIEW = $(SHARE_SRC)/classes/overview-core.html
+ 
+ #
+-# Early access top and bottom text (for snapshots, beta and rc)
+-#
+-JAVADOCTOP_EARLYACCESS = '<div style="background-color: \#EEEEEE"> <div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; margin-left: 6px; margin-right: 6px; text-align: justify; font-size: 80%; font-family: Helvetica, Arial, sans-serif; font-weight: normal;"> Please note that this documentation is not final and is subject to change. </div> </div>'
+-JAVADOCBOTTOM_EARLYACCESS = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Submit a bug or feature</a> <p>Copyright $(THIS_YEAR) Sun Microsystems, Inc. All rights reserved. Use is subject to the terms of the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</font>'
+-JAVADOCTITLE_EARLYACCESS = $(subst Specification,Documentation,$(JAVADOCTITLE))
+-
+-#
+ # Variables used by domapidocs target
+ #
+