Mercurial > hg > openjdk > jigsaw

changeset 694:b70196e01c53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Thu, 21 Feb 2013 17:39:58 -0800
parents c641268c4532 (diff) fd1a5574cf68 (current diff)
children 5b0b6ef58dbf
files
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk	Mon Feb 18 15:35:05 2013 -0500
+++ b/common/makefiles/javadoc/NON_CORE_PKGS.gmk	Thu Feb 21 17:39:58 2013 -0800
@@ -80,7 +80,8 @@
 
 TREEAPI_PKGS 	 = com.sun.source.doctree \
 		   com.sun.source.tree \
-		   com.sun.source.util
+		   com.sun.source.util \
+		   jdk
 
 SMARTCARDIO_PKGS = javax.smartcardio
 
@@ -93,6 +94,8 @@
                    com.apple.eio
 endif
 
+JDK_PKGS     = jdk
+
 # non-core packages in rt.jar
 NON_CORE_PKGS    = $(DOMAPI_PKGS) \
                    $(MGMT_PKGS) \
@@ -103,5 +106,5 @@
                    $(HTTPSERVER_PKGS) \
                    $(SMARTCARDIO_PKGS) \
                    $(SCTPAPI_PKGS) \
-                   $(APPLE_EXT_PKGS)
-
+                   $(APPLE_EXT_PKGS) \
+                   $(JDK_PKGS)
--- a/make/scripts/webrev.ksh	Mon Feb 18 15:35:05 2013 -0500
+++ b/make/scripts/webrev.ksh	Thu Feb 21 17:39:58 2013 -0800
@@ -3023,7 +3023,7 @@
             cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|'
         fi
         if [[ -n $WGET ]]; then
-            msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup"`
+            msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup" | html_quote`
         fi
         if [[ -z $msg ]]; then
             msg="${id}"