/hg/icedtea6-hg: Drop upstreamed patches and update to new drop ...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jun 10 17:47:47 PDT 2010
changeset c8a3736ab6de in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c8a3736ab6de
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 11 01:47:22 2010 +0100
Drop upstreamed patches and update to new drop tarballs.
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.
diffstat:
5 files changed, 126 insertions(+), 281 deletions(-)
ChangeLog | 23 ++++
Makefile.am | 21 +---
patches/icedtea-doc-headers.patch | 181 -----------------------------------
patches/icedtea-java2d-dasher.patch | 11 --
patches/icedtea-nio2.patch | 171 +++++++++++++++++----------------
diffs (truncated from 638 to 500 lines):
diff -r f93e99e857af -r c8a3736ab6de ChangeLog
--- a/ChangeLog Tue Jun 08 23:57:58 2010 +0100
+++ b/ChangeLog Fri Jun 11 01:47:22 2010 +0100
@@ -1,3 +1,26 @@ 2010-06-08 Andrew John Hughes <ahughes@
+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
diff -r f93e99e857af -r c8a3736ab6de Makefile.am
--- a/Makefile.am Tue Jun 08 23:57:58 2010 +0100
+++ b/Makefile.am Fri Jun 11 01:47:22 2010 +0100
@@ -18,14 +18,15 @@ 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
@@ -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 \
@@ -642,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; \
diff -r f93e99e857af -r c8a3736ab6de patches/icedtea-doc-headers.patch
--- a/patches/icedtea-doc-headers.patch Tue Jun 08 23:57:58 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-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 16:11:08.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) Platform<br>Standard Ed. $(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://icedtea.classpath.org/bugzilla/">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
- #
-
-@@ -138,12 +122,11 @@
- -doctitle $(DOMAPI_JAVADOCTITLE) \
- -windowtitle $(DOMAPI_JAVADOCWINDOWTITLE) \
- -header $(DOMAPI_JAVADOCHEADER) \
-- -bottom $(DOMAPI_JAVADOCBOTTOM) \
-+ -bottom $(JAVADOCBOTTOM) \
- -group $(DOMAPI_GROUPNAME) $(DOMAPI_REGEXP)
- DOMAPI_JAVADOCTITLE = 'Common DOM API'
- DOMAPI_JAVADOCWINDOWTITLE = 'Common DOM API'
- DOMAPI_JAVADOCHEADER = '<b>Common DOM API</b>'
--DOMAPI_JAVADOCBOTTOM = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Submit a bug or feature</a><br>Java is a trademark or registered trademark of Sun Microsystems, Inc. in the US and other countries.<br>Copyright $(THIS_YEAR) Sun Microsystems, Inc. 4150 Network Circle<br>Santa Clara, California, 95054, U.S.A. All Rights Reserved.</font>'
- DOMAPI_GROUPNAME = "Packages"
- DOMAPI_REGEXP = "com.sun.java.browser.dom:org.w3c.dom*"
- # DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
-@@ -157,13 +140,12 @@
- -doctitle $(MIRROR_JAVADOCTITLE) \
- -windowtitle $(MIRROR_JAVADOCWINDOWTITLE) \
- -header $(MIRROR_JAVADOCHEADER) \
-- -bottom $(MIRROR_JAVADOCBOTTOM) \
-+ -bottom $(JAVADOCBOTTOM) \
- -group $(MIRROR_GROUPNAME) $(MIRROR_REGEXP) \
- -overview $(MIRROR_OVERVIEW)
- MIRROR_JAVADOCTITLE = 'Mirror API'
- MIRROR_JAVADOCWINDOWTITLE = 'Mirror API'
- MIRROR_JAVADOCHEADER = '<b>Mirror API</b>'
--MIRROR_JAVADOCBOTTOM = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Report a bug or request a feature.</a><br>Copyright $(THIS_YEAR) Sun Microsystems, Inc. All Rights Reserved. Use is subject to license terms.</font>'
- MIRROR_GROUPNAME = "Packages"
- MIRROR_OVERVIEW = $(IMPORTSRCDIR)/com/sun/mirror/overview.html
- MIRROR_REGEXP = "com.sun.mirror.*"
-@@ -181,12 +163,11 @@
- -doctitle $(DOCLETAPI_JAVADOCTITLE) \
- -windowtitle $(DOCLETAPI_JAVADOCWINDOWTITLE) \
- -header $(DOCLETAPI_JAVADOCHEADER) \
-- -bottom $(DOCLETAPI_JAVADOCBOTTOM) \
-+ -bottom $(JAVADOCBOTTOM) \
- -group $(DOCLETAPI_GROUPNAME) $(DOCLETAPI_REGEXP)
- DOCLETAPI_JAVADOCTITLE = 'Doclet API'
- DOCLETAPI_JAVADOCWINDOWTITLE = 'Doclet API'
- DOCLETAPI_JAVADOCHEADER = '<b>Doclet API</b>'
--DOCLETAPI_JAVADOCBOTTOM = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Submit a bug or feature</a><br>Java is a trademark or registered trademark of Sun Microsystems, Inc. in the US and other countries.<br>Copyright 1993-$(THIS_YEAR) Sun Microsystems, Inc. 4150 Network Circle<br>Santa Clara, California, 95054, U.S.A. All Rights Reserved.</font>'
- DOCLETAPI_GROUPNAME = "Packages"
- DOCLETAPI_REGEXP = "com.sun.javadoc"
- DOCLETAPI_LINKOPT = -linkoffline ../../../../api $(DOCSDIR)/api/
-@@ -200,8 +181,7 @@
- -encoding ascii \
- -nonavbar \
- -noindex \
-- -bottom $(TAGLETAPI_JAVADOCBOTTOM)
--TAGLETAPI_JAVADOCBOTTOM = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Submit a bug or feature</a><br>Java is a trademark or registered trademark of Sun Microsystems, Inc. in the US and other countries.<br>Copyright 1993-$(THIS_YEAR) Sun Microsystems, Inc. 4150 Network Circle<br>Santa Clara, California, 95054, U.S.A. All Rights Reserved.</font>'
-+ -bottom $(JAVADOCBOTTOM)
- # TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
-
- #
-@@ -218,6 +198,7 @@
- -windowtitle $(JDI_WINDOWTITLE) \
- -doctitle $(JDI_DOCTITLE) \
- -header $(JDI_HEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
- -linkoffline ../../../../api $(DOCSDIR)/api/ \
- -overview $(JPDA_SOURCEPATH)/jdi-overview.html
- JDI_WINDOWTITLE = "Java Debug Interface"
-@@ -242,6 +223,7 @@
- -windowtitle $(JAAS_WINDOWTITLE) \
- -doctitle $(JAAS_DOCTITLE) \
- -header $(JAAS_JAVADOCHEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
- -linkoffline ../../../../../api $(DOCSDIR)/api/ \
- -overview $(TOPDIR)/src/share/classes/com/sun/security/auth/jaas-overview.html
- JAAS_WINDOWTITLE = "Java Authentication and Authorization Service "
-@@ -264,6 +246,7 @@
- -windowtitle $(JGSS_WINDOWTITLE) \
- -doctitle $(JGSS_DOCTITLE) \
- -header $(JGSS_JAVADOCHEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
- -linkoffline ../../../../../api $(DOCSDIR)/api/ \
- -overview $(JGSS_SOURCEPATH)/com/sun/security/jgss/jgss-overview.html
-
-@@ -287,6 +270,7 @@
- -windowtitle $(SMARTCARDIO_WINDOWTITLE) \
- -doctitle $(SMARTCARDIO_DOCTITLE) \
- -header $(SMARTCARDIO_JAVADOCHEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
- -linkoffline ../../../../../api $(DOCSDIR)/api/
-
- SMARTCARDIO_WINDOWTITLE = "Java Smart Card I/O"
-@@ -309,6 +293,7 @@
- -windowtitle $(HTTPSERVER_WINDOWTITLE) \
- -doctitle $(HTTPSERVER_DOCTITLE) \
- -header $(HTTPSERVER_JAVADOCHEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
- -linkoffline ../../../../../api $(DOCSDIR)/api/
-
- HTTPSERVER_WINDOWTITLE = "Java HTTP Server"
-@@ -344,6 +329,7 @@
- -windowtitle $(MGMT_WINDOWTITLE) \
- -doctitle $(MGMT_DOCTITLE) \
- -header $(MGMT_HEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
- -linkoffline ../../../../api $(DOCSDIR)/api/ \
- -overview $(MGMT_SOURCEPATH)/com/sun/management/mgmt-overview.html
- MGMT_WINDOWTITLE = "Monitoring and Management Interface for the Java Platform"
-@@ -365,6 +351,7 @@
- -windowtitle $(ATTACH_WINDOWTITLE) \
- -doctitle $(ATTACH_DOCTITLE) \
- -header $(ATTACH_HEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
- -linkoffline ../../../../api $(DOCSDIR)/api/
- ATTACH_WINDOWTITLE = "Attach API"
- ATTACH_DOCTITLE = "Attach API"
-@@ -385,6 +372,7 @@
- -windowtitle $(JCONSOLE_WINDOWTITLE) \
- -doctitle $(JCONSOLE_DOCTITLE) \
- -header $(JCONSOLE_HEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
- -linkoffline ../../../../api $(DOCSDIR)/api/
- JCONSOLE_WINDOWTITLE = "JConsole API"
- JCONSOLE_DOCTITLE = "JConsole API"
-@@ -400,7 +388,7 @@
- -doctitle $(TREEAPI_JAVADOCTITLE) \
- -windowtitle $(TREEAPI_JAVADOCWINDOWTITLE) \
- -header $(TREEAPI_JAVADOCHEADER) \
-- -bottom $(TREEAPI_JAVADOCBOTTOM) \
-+ -bottom $(JAVADOCBOTTOM) \
- -group $(TREEAPI_GROUPNAME) $(TREEAPI_REGEXP)
- #
- # -overview $(TREEAPI_OVERVIEW)
-@@ -408,7 +396,6 @@
- TREEAPI_JAVADOCTITLE = 'Compiler Tree API'
- TREEAPI_JAVADOCWINDOWTITLE = 'Compiler Tree API'
- TREEAPI_JAVADOCHEADER = '<b>Compiler Tree API</b>'
--TREEAPI_JAVADOCBOTTOM = '<font size="-1"><a href="http://bugs.sun.com/services/bugreport/index.jsp">Report a bug or request a feature.</a><br>Copyright $(THIS_YEAR) Sun Microsystems, Inc. All Rights Reserved. Use is subject to license terms.</font>'
- TREEAPI_GROUPNAME = "Packages"
- TREEAPI_OVERVIEW = $(SHARE_SRC)/classes/com/sun/source/overview.html
- TREEAPI_REGEXP = "com.sun.source.*"
diff -r f93e99e857af -r c8a3736ab6de patches/icedtea-java2d-dasher.patch
--- a/patches/icedtea-java2d-dasher.patch Tue Jun 08 23:57:58 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java.orig 2009-01-13 12:14:53.000000000 -0500
-+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java 2009-01-13 12:15:09.000000000 -0500
-@@ -120,7 +120,7 @@
-
- // Normalize so 0 <= phase < dash[0]
- int idx = 0;
-- dashOn = false;
-+ dashOn = true;
- int d;
- while (phase >= (d = dash[idx])) {
- phase -= d;
diff -r f93e99e857af -r c8a3736ab6de patches/icedtea-nio2.patch
--- a/patches/icedtea-nio2.patch Tue Jun 08 23:57:58 2010 +0100
+++ b/patches/icedtea-nio2.patch Fri Jun 11 01:47:22 2010 +0100
@@ -1,6 +1,17 @@ diff -Nru openjdk.orig/jdk/make/docs/COR
+diff -Nru openjdk.orig/jdk/make/common/shared/Defs-javadoc.gmk openjdk/jdk/make/common/shared/Defs-javadoc.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs-javadoc.gmk 2010-06-10 23:04:50.000000000 +0100
++++ openjdk/jdk/make/common/shared/Defs-javadoc.gmk 2010-06-11 00:44:42.000000000 +0100
+@@ -41,6 +41,7 @@
+ TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
+ JNLP_FIRST_COPYRIGHT_YEAR = 1998
+ PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
++NIO2_FIRST_COPYRIGHT_YEAR = 2007
+
+ # Oracle name
+ COMPANY_NAME = Oracle and/or its affiliates
diff -Nru openjdk.orig/jdk/make/docs/CORE_PKGS.gmk openjdk/jdk/make/docs/CORE_PKGS.gmk
--- openjdk.orig/jdk/make/docs/CORE_PKGS.gmk 2010-05-26 09:32:35.000000000 +0100
-+++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2010-05-26 14:21:37.000000000 +0100
++++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2010-06-11 00:35:39.000000000 +0100
@@ -36,6 +36,7 @@
sunw.* \
com.sun.* \
@@ -10,66 +21,70 @@ diff -Nru openjdk.orig/jdk/make/docs/COR
org.w3c.dom.css \
org.w3c.dom.html \
diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
---- openjdk.orig/jdk/make/docs/Makefile 2010-05-26 14:20:55.000000000 +0100
-+++ openjdk/jdk/make/docs/Makefile 2010-05-26 14:21:37.000000000 +0100
-@@ -405,6 +405,29 @@
- # TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
+--- openjdk.orig/jdk/make/docs/Makefile 2010-06-10 23:04:50.000000000 +0100
++++ openjdk/jdk/make/docs/Makefile 2010-06-11 00:42:38.000000000 +0100
+@@ -1076,6 +1076,58 @@
+ #############################################################
#
-+# Variables used by nio2docs target
++# nio2docs
+#
+
-+NIO2_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \
-+ -encoding ascii \
-+ -d $(NIO2_DOCDIR) \
-+ -sourcepath $(NIO2_SOURCEPATH) \
-+ -splitIndex \
-+ -doctitle $(NIO2_JAVADOCTITLE) \
-+ -windowtitle $(NIO2_JAVADOCWINDOWTITLE) \
-+ -header $(NIO2_JAVADOCHEADER) \
-+ -bottom $(JAVADOCBOTTOM) \
-+ -group $(NIO2_GROUPNAME) $(NIO2_REGEXP)
-+NIO2_JAVADOCTITLE = 'NIO2 API'
-+NIO2_JAVADOCWINDOWTITLE = 'NIO2 API'
-+NIO2_JAVADOCHEADER = '<b>NIO2 API</b>'
-+NIO2_GROUPNAME = "Packages"
-+NIO2_REGEXP = "org.classpath.icedtea.*"
-+NIO2_DOCDIR = $(DOCSDIR)/jre/api/nio2
-+NIO2_SOURCEPATH = $(TOPDIR)/src/share/classes
++ALL_OTHER_TARGETS += nio2docs
++
++NIO2_DOCDIR := $(JRE_API_DOCSDIR)/nio2
++NIO22COREAPI := ../../$(JDKJRE2COREAPI)
++NIO2_DOCTITLE := NIO2 API
++NIO2_WINDOWTITLE := NIO2 API
++NIO2_HEADER := <strong>NIO2 API</strong>
++NIO2_BOTTOM := $(call CommonBottom,$(NIO2_FIRST_COPYRIGHT_YEAR))
++NIO2_GROUPNAME := Packages
++NIO2_REGEXP := org.classpath.icedtea.*
+# NIO2_PKGS is located in NON_CORE_PKGS.gmk
+
++NIO2_INDEX_HTML = $(NIO2_DOCDIR)/index.html
++NIO2_OPTIONS_FILE = $(DOCSTMPDIR)/nio2.options
++NIO2_PACKAGES_FILE = $(DOCSTMPDIR)/nio2.packages
++
++nio2docs: $(NIO2_INDEX_HTML)
++
++# Set relative location to core api document root
++$(NIO2_INDEX_HTML): GET2DOCSDIR=$(NIO22COREAPI)/..
++
++# Run javadoc if the index file is out of date or missing
++$(NIO2_INDEX_HTML): $(NIO2_OPTIONS_FILE) $(NIO2_PACKAGES_FILE)
++ $(prep-javadoc)
++ $(call JavadocSummary,$(NIO2_OPTIONS_FILE),$(NIO2_PACKAGES_FILE))
++ $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
++ @$(NIO2_OPTIONS_FILE) @$(NIO2_PACKAGES_FILE)
++
++# Create file with javadoc options in it
++$(NIO2_OPTIONS_FILE):
++ $(prep-target)
++ @($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
++ $(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
++ $(ECHO) "-encoding ascii" ; \
++ $(ECHO) "-doctitle '$(NIO2_DOCTITLE)'" ; \
++ $(ECHO) "-windowtitle '$(NIO2_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
++ $(ECHO) "-header '$(NIO2_HEADER)$(DRAFT_HEADER)'" ; \
++ $(ECHO) "-bottom '$(NIO2_BOTTOM)$(DRAFT_BOTTOM)'" ; \
++ $(ECHO) "-group $(NIO2_GROUPNAME) $(NIO2_REGEXP)" ; \
++ $(ECHO) "-linkoffline $(NIO22COREAPI) $(COREAPI_DOCSDIR)/" ; \
++ ) >> $@
++
++# Create a file with the package names in it
++$(NIO2_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(NIO2_PKGS))
++ $(prep-target)
++ $(call PackageFilter,$(NIO2_PKGS))
++
++#############################################################
+#
- # Path where javadoc should find source files for release docs
- #
- RELEASEDOCS_SRCPATH = "$(SHARE_SRC)/classes$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/doc/stub$(CLASSPATH_SEPARATOR)$(CLOSED_SRC)/share/classes$(CLASSPATH_SEPARATOR)$(IMPORTSRCDIR)"
-@@ -430,7 +453,8 @@
- httpserverdocs \
- mgmtdocs \
- attachdocs \
-- jconsoledocs
-+ jconsoledocs \
-+ nio2docs
+ # Get a cache of all the directories
- ifdef LANGTOOLS_DIST
- ALL_OTHER_TARGETS += \
-@@ -647,6 +671,14 @@
- $(TREEAPI_LINKOPT) \
- $(TREEAPI_PKGS)
-
-+.PHONY: nio2docs
-+nio2docs:
-+ @# ######## api-nio2 ############################
-+ $(RM) -r $(NIO2_DOCDIR)
-+ $(MKDIR) -p $(NIO2_DOCDIR)
-+ $(JAVADOC_CMD) $(NIO2_JAVADOCFLAGS) \
-+ $(NIO2_PKGS)
-+
- # DEBUG TARGET
- # List the values defined in the makefile hierarchy, to make sure everything
- # is set properly, and to help identify values we can use instead of making new ones.
+ $(DIRECTORY_CACHE): $(ALL_SOURCE_DIRS)
diff -Nru openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk openjdk/jdk/make/docs/NON_CORE_PKGS.gmk
---- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2010-05-26 14:20:57.000000000 +0100
-+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2010-05-26 14:21:37.000000000 +0100
+--- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2010-06-11 00:14:21.000000000 +0100
++++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2010-06-11 00:35:39.000000000 +0100
@@ -65,6 +65,16 @@
HTTPSERVER_PKGS = com.sun.net.httpserver \
com.sun.net.httpserver.spi
@@ -87,7 +102,7 @@ diff -Nru openjdk.orig/jdk/make/docs/NON
DOCLETAPI_PKGS = com.sun.javadoc
TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-@@ -91,6 +101,7 @@
+@@ -93,6 +103,7 @@
$(MGMT_PKGS) \
$(JAAS_PKGS) \
$(JGSS_PKGS) \
@@ -96,8 +111,8 @@ diff -Nru openjdk.orig/jdk/make/docs/NON
$(HTTPSERVER_PKGS) \
$(SMARTCARDIO_PKGS) \
diff -Nru openjdk.orig/jdk/make/java/java/FILES_java.gmk openjdk/jdk/make/java/java/FILES_java.gmk
---- openjdk.orig/jdk/make/java/java/FILES_java.gmk 2010-05-26 14:20:55.000000000 +0100
-+++ openjdk/jdk/make/java/java/FILES_java.gmk 2010-05-26 14:21:37.000000000 +0100
+--- openjdk.orig/jdk/make/java/java/FILES_java.gmk 2010-06-11 00:14:20.000000000 +0100
++++ openjdk/jdk/make/java/java/FILES_java.gmk 2010-06-11 00:35:39.000000000 +0100
@@ -517,6 +517,13 @@
sun/misc/JavaLangAccess.java \
sun/misc/JavaIOAccess.java \
@@ -114,8 +129,8 @@ diff -Nru openjdk.orig/jdk/make/java/jav
FILES_java = $(JAVA_JAVA_java)
diff -Nru openjdk.orig/jdk/make/java/nio/FILES_java.gmk openjdk/jdk/make/java/nio/FILES_java.gmk
---- openjdk.orig/jdk/make/java/nio/FILES_java.gmk 2010-05-26 14:20:55.000000000 +0100
-+++ openjdk/jdk/make/java/nio/FILES_java.gmk 2010-05-26 14:21:37.000000000 +0100
+--- openjdk.orig/jdk/make/java/nio/FILES_java.gmk 2010-06-11 00:14:21.000000000 +0100
++++ openjdk/jdk/make/java/nio/FILES_java.gmk 2010-06-11 00:35:39.000000000 +0100
@@ -75,12 +75,13 @@
sun/nio/ch/DefaultSelectorProvider.java \
sun/nio/ch/DirectBuffer.java \
@@ -315,8 +330,8 @@ diff -Nru openjdk.orig/jdk/make/java/nio
FILES_java = $(FILES_src) $(FILES_gen)
diff -Nru openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
---- openjdk.orig/jdk/make/java/nio/Makefile 2010-05-26 14:20:55.000000000 +0100
-+++ openjdk/jdk/make/java/nio/Makefile 2010-05-26 14:21:37.000000000 +0100
+--- openjdk.orig/jdk/make/java/nio/Makefile 2010-06-11 00:14:21.000000000 +0100
++++ openjdk/jdk/make/java/nio/Makefile 2010-06-11 00:35:39.000000000 +0100
@@ -40,6 +40,11 @@
SNIO_SRC = $(SHARE_SRC)/classes/sun/nio
SNIO_GEN = $(GENSRCDIR)/sun/nio
@@ -664,7 +679,7 @@ diff -Nru openjdk.orig/jdk/make/java/nio
.PHONY: sources
diff -Nru openjdk.orig/jdk/make/java/nio/mapfile-linux openjdk/jdk/make/java/nio/mapfile-linux
--- openjdk.orig/jdk/make/java/nio/mapfile-linux 2010-04-06 17:51:43.000000000 +0100
-+++ openjdk/jdk/make/java/nio/mapfile-linux 2010-05-26 14:21:37.000000000 +0100
++++ openjdk/jdk/make/java/nio/mapfile-linux 2010-06-11 00:35:39.000000000 +0100
@@ -20,6 +20,14 @@
Java_sun_nio_ch_EPollArrayWrapper_interrupt;
Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
@@ -782,7 +797,7 @@ diff -Nru openjdk.orig/jdk/make/java/nio
*;
diff -Nru openjdk.orig/jdk/make/java/nio/mapfile-solaris openjdk/jdk/make/java/nio/mapfile-solaris
--- openjdk.orig/jdk/make/java/nio/mapfile-solaris 2010-04-06 17:51:43.000000000 +0100
-+++ openjdk/jdk/make/java/nio/mapfile-solaris 2010-05-26 14:21:37.000000000 +0100
++++ openjdk/jdk/make/java/nio/mapfile-solaris 2010-06-11 00:35:39.000000000 +0100
@@ -73,6 +73,75 @@
Java_sun_nio_ch_ServerSocketChannelImpl_listen;
Java_sun_nio_ch_SocketChannelImpl_checkConnect;
@@ -861,7 +876,7 @@ diff -Nru openjdk.orig/jdk/make/java/nio
*;
diff -Nru openjdk.orig/jdk/make/mkdemo/Makefile openjdk/jdk/make/mkdemo/Makefile
--- openjdk.orig/jdk/make/mkdemo/Makefile 2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/mkdemo/Makefile 2010-05-26 14:21:37.000000000 +0100
++++ openjdk/jdk/make/mkdemo/Makefile 2010-06-11 00:35:39.000000000 +0100
@@ -31,7 +31,7 @@
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
@@ -873,7 +888,7 @@ diff -Nru openjdk.orig/jdk/make/mkdemo/M
$(SUBDIRS-loop)
diff -Nru openjdk.orig/jdk/make/mksample/nio/Makefile openjdk/jdk/make/mksample/nio/Makefile
--- openjdk.orig/jdk/make/mksample/nio/Makefile 2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/mksample/nio/Makefile 2010-05-26 14:21:37.000000000 +0100
++++ openjdk/jdk/make/mksample/nio/Makefile 2010-06-11 00:35:39.000000000 +0100
More information about the distro-pkg-dev
mailing list