Mercurial > hg > openjdk > jdk7u > jdk
changeset 733:faabf9b83511
Merge
author | asaha |
---|---|
date | Thu, 20 Jun 2013 21:50:01 -0700 |
parents | faa42104c90a (current diff) 1c141e6fde91 (diff) |
children | 9e21dad986e5 |
files | .hgtags |
diffstat | 11 files changed, 343 insertions(+), 85 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 14 18:10:14 2013 -0700 +++ b/.hgtags Thu Jun 20 21:50:01 2013 -0700 @@ -240,6 +240,30 @@ 3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10 527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30 3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20 +1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01 +d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02 +e7c504c99ab60e3b21cdc9460afaa3926d53cff1 jdk7u8-b03 +996e3145029120fd6ef2cacb3d03cb1f20862247 jdk7u8-b04 +891689cc39ff9d67bc4fe43bcb91ecdabda1f9f8 jdk7u8-b05 +f16343fe14acb4118f0a3f78fd735a4a6133c76a jdk7u10-b06 +1fa71ffbbd596086dbade86505d2d7e1c436de76 jdk7u10-b07 +e7014c55a9e55c10fe4f91ca092eb01029c36c75 jdk7u10-b08 +aaf495a24a9bb996b3955e52edff8d93ff62dc5f jdk7u10-b09 +3eddc50eb3574bf4cff4081310fd763e958ed073 jdk7u12-b01 +207c000ac697d052f84cde6e782865b209e60239 jdk7u12-b02 +a3917db5d568d9805b3c46ce67c39c475cf10e0e jdk7u12-b03 +52945b197d7c93d215067034a45e5e9452c67f78 jdk7u12-b04 +eae53fe51e79e04ca28b5790a6ae25d39a06b0ab jdk7u12-b05 +a008905ce525b88e5bdc80fe6ad7570f6f6a19ac jdk7u12-b06 +c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07 +1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08 +87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09 +745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10 +2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11 +594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12 +ae5c1b29297dae0375277a0b6428c266d8d77c71 jdk7u14-b13 +bb97ad0c9e5a0566e82b3b4bc43eabe680b89d97 jdk7u14-b14 +b534282bd377e3886b9d0d4760f6fdaa1804bdd3 jdk7u14-b15 0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01 0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02 25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30 @@ -274,6 +298,22 @@ 84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09 aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10 039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11 +210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16 +f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17 +9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18 +d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19 +d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19 +b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19 +f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20 +41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21 +3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22 +8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23 +5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24 +f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25 +4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26 +75167199239375d05b68668023c885c2776fd548 jdk7u40-b27 +ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28 +dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29 2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12 37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13 9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
--- a/Makefile Fri Jun 14 18:10:14 2013 -0700 +++ b/Makefile Thu Jun 20 21:50:01 2013 -0700 @@ -164,16 +164,23 @@ clobber:: deploy-clobber endif +ifeq ($(BUILD_INSTALL_BUNDLES), true) + generic_build_repo_series:: install-binaries-jdk-debug + clobber:: install-binaries-jdk-debug-clobber +endif + generic_build_repo_series:: @$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build)) # The debug build, fastdebug or debug. Needs special handling. -# Note that debug builds do NOT do INSTALL steps, but must be done -# after the product build and before the INSTALL step of the product build. +# +# Note that debug builds do NOT do INSTALL steps aside from the +# install-binaries-jdk-debug or install-binaries-jdk-debug-clobber targets. # # DEBUG_NAME is fastdebug or debug # ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix # The resulting image directory (j2sdk-image) is used by the install makefiles +# (only if debug files are present when install checks for them) # to create a debug install bundle jdk-*-debug-** bundle (tar or zip) # which will install in the debug or fastdebug subdirectory of the # normal product install area. @@ -189,7 +196,7 @@ ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR) - + create_fresh_product_bootdir: FRC $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ GENERATE_DOCS=false \ @@ -218,7 +225,7 @@ ifeq ($(DO_BOOT_CYCLE),true) - + # Create the bootdir to use in the build product_build:: create_fresh_product_bootdir debug_build:: create_fresh_debug_bootdir @@ -256,6 +263,8 @@ ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \ DEBUG_NAME=$(DEBUG_NAME) \ GENERATE_DOCS=false \ + BUILD_INSTALL_BUNDLES=true \ + CREATE_DEBUGINFO_BUNDLES=false \ $(BOOT_CYCLE_DEBUG_SETTINGS) \ generic_build_repo_series @@ -540,8 +549,8 @@ ################################################################ .PHONY: all test test_run test_start test_summary test_clean \ - generic_build_repo_series \ - what clobber insane \ + generic_build_repo_series \ + what clobber insane \ dev dev-build dev-sanity dev-clobber \ product_build \ fastdebug_build \ @@ -556,4 +565,3 @@ # Force target FRC: -
--- a/make/deploy-rules.gmk Fri Jun 14 18:10:14 2013 -0700 +++ b/make/deploy-rules.gmk Thu Jun 20 21:50:01 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -42,20 +42,6 @@ endif DEPLOY_BUILD_TARGETS = sanity deploy -# Only build 7-Zip LZMA file compression if it is available -# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available -ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), windows) - EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(EC_TMP), true) - DEPLOY_BUILD_TARGETS += extra-comp-all - endif - endif -endif ifneq ($(JQS), off) ifeq ($(ARCH_DATA_MODEL), 32) @@ -65,22 +51,6 @@ endif endif -ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), windows) - # Only set up to use UPX compression if it is available - UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(UP_TMP), true) - DEPLOY_BUILD_TARGETS += cmd-comp-all - endif - endif -endif - - - ifndef DEV_ONLY DEPLOY_BUILD_TARGETS += images else
--- a/make/hotspot-rules.gmk Fri Jun 14 18:10:14 2013 -0700 +++ b/make/hotspot-rules.gmk Thu Jun 20 21:50:01 2013 -0700 @@ -105,6 +105,8 @@ HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" endif +-include ${JDK_TOPDIR}/make/closed/common/Defs.gmk + hotspot-build:: $(MKDIR) -p $(HOTSPOT_OUTPUTDIR) $(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
--- a/make/install-rules.gmk Fri Jun 14 18:10:14 2013 -0700 +++ b/make/install-rules.gmk Thu Jun 20 21:50:01 2013 -0700 @@ -97,6 +97,23 @@ @$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'` $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all + +install-binaries-jdk-debug: +ifeq ($(BUILD_INSTALL_BUNDLES), true) + @$(call MakeStart,install,binaries-jdk-debug) + ($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \ + $(MAKE) binaries-jdk-debug $(INSTALL_BUILD_ARGUMENTS)) + @$(call MakeFinish,install,binaries-jdk-debug) +endif + +install-binaries-jdk-debug-clobber: +ifeq ($(BUILD_INSTALL_BUNDLES), true) + @$(call MakeStart,install,binaries-jdk-debug-clobber) + ($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \ + $(MAKE) binaries-jdk-debug-clobber $(INSTALL_BUILD_ARGUMENTS)) + @$(call MakeFinish,install,binaries-jdk-debug-clobber) +endif + install-clobber: ifeq ($(BUILD_INSTALL), true) @$(call MakeStart,install,clobber) @@ -116,4 +133,5 @@ ###################################### .PHONY: install install-build install-clobber install-sanity \ - update-installer update-patchgen installer + update-installer update-patchgen installer \ + install-binaries-jdk-debug install-binaries-jdk-debug-clobber
--- a/make/jprt.gmk Fri Jun 14 18:10:14 2013 -0700 +++ b/make/jprt.gmk Thu Jun 20 21:50:01 2013 -0700 @@ -30,11 +30,9 @@ # To get all the bundles from JPRT, use: # jprt submit -buildenv HAVE_JPRT_SAVE_BUNDLES=true -control "..." ... -DEFAULT_BUILD_FLAVOR=product - # JPRT will define these when it builds -JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip -JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip +JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip +JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-install-bundle.zip ifeq ($(PLATFORM),windows) ZIPFLAGS=-q
--- a/make/jprt.properties Fri Jun 14 18:10:14 2013 -0700 +++ b/make/jprt.properties Thu Jun 20 21:50:01 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -79,20 +79,17 @@ ${jprt.my.test.target.set:TESTNAME=jdk_util}, \ ${jprt.my.test.target.set:TESTNAME=jdk_io}, \ ${jprt.my.test.target.set:TESTNAME=jdk_net}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \ ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_management}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \ ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_misc} + ${jprt.my.test.target.set:TESTNAME=jdk_other} # All vm test targets (testset=all) jprt.vm.all.test.targets= \ @@ -107,6 +104,7 @@ ${jprt.my.test.target.set:TESTNAME=jdk_beans1} \ ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \ ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \ ${jprt.my.test.target.set:TESTNAME=jdk_swing}
--- a/make/scripts/hgforest.sh Fri Jun 14 18:10:14 2013 -0700 +++ b/make/scripts/hgforest.sh Thu Jun 20 21:50:01 2013 -0700 @@ -58,7 +58,7 @@ fi done if [ "${pull_extra_base}" != "" ] ; then - subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs" + subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs" pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'` pull_extra="${pull_extra_base}/${pull_default_tail}" for i in ${subrepos_extra} ; do
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/scripts/normalizer.pl Thu Jun 20 21:50:01 2013 -0700 @@ -0,0 +1,208 @@ +#!/usr/bin/perl + +# +# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# +# Parses java files: +# 1. Removes from the end of lines spaces and TABs +# 2. Replaces TABs by spaces +# 3. Replaces all NewLine separators by Unix NewLine separators +# 4. Makes one and only one empty line at the end of each file + +if ($#ARGV < 0) { + &usage; + + die; +} + +use Cwd 'abs_path'; + +my @extensions = ("java"); + +# Read options +my $dirpos = 0; + +while ($dirpos < $#ARGV) { + if ($ARGV[$dirpos] eq "-e") { + @extensions = split(/,/, $ARGV[$dirpos + 1]); + } else { + last; + } + + $dirpos += 2; +} + +if ($dirpos > $#ARGV) { + &usage; + + die; +} + +use Cwd; +my $currdir = getcwd; + +my $allfiles = 0; + +my $filecount = 0; + +my @tabvalues; + +# Init tabvalues +push (@tabvalues, " "); + +for (my $i = 1; $i < 8; $i++) { + push(@tabvalues, $tabvalues[$i - 1] . " "); +} + +open(FILELIST, ">$currdir/filelist") or die "Failed while open $currdir/filelist: $!\n"; + +while ($dirpos <= $#ARGV) { + use File::Find; + + find(\&parse_file, abs_path($ARGV[$dirpos])); + + $dirpos += 1; +} + +close(FILELIST); + +use Cwd 'chdir'; +chdir $currdir; + +print "Checked $allfiles file(s)\n"; +print "Modified $filecount file(s)\n"; +print "See results in the file $currdir/filelist\n"; + +sub parse_file { + my $filename = $File::Find::name; + + # Skip directories + return if -d; + + # Skip SCCS files + return if ($filename =~ /\/SCCS\//); + + # Skip files with invalid extensions + my $accepted = 0; + foreach my $ext (@extensions) { + if ($_ =~ /\.$ext$/i) { + $accepted = 1; + + last; + } + } + return if ($accepted == 0); + + use File::Basename; + my $dirname = dirname($filename); + + use Cwd 'chdir'; + chdir $dirname; + + open(FILE, $filename) or die "Failed while open $filename: $!\n"; + + # Read file + my @content; + my $line; + my $emptylinescount = 0; + my $modified = 0; + + while ($line = <FILE>) { + my $originalline = $line; + + # Process line + + # Remove from the end of the line spaces and return character + while ($line =~ /\s$/) { + chop($line); + } + + # Replace TABs + for (my $i = 0; $i < length($line); $i++) { + if (substr($line, $i, 1) =~ /\t/) { + $line = substr($line, 0, $i) . $tabvalues[7 - ($i % 8)] . substr($line, $i + 1); + } + } + + if (length($line) == 0) { + $emptylinescount++; + } else { + while ($emptylinescount > 0) { + push(@content, ""); + + $emptylinescount--; + } + + push(@content, $line); + } + + if ($originalline ne ($line . "\n")) { + $modified = 1; + } + + } + + $allfiles++; + + if ($emptylinescount > 0) { + $modified = 1; + } + + close(FILE); + + if ($modified != 0) { + # Write file + open(FILE, ">$filename") or die "Failed while open $filename: $!\n"; + + for (my $i = 0; $i <= $#content; $i++) { + print FILE "$content[$i]\n"; + } + + close(FILE); + + # Print name from current dir + if (index($filename, $currdir) == 0) { + print FILELIST substr($filename, length($currdir) + 1); + } else { + print FILELIST $filename; + } + print FILELIST "\n"; + + $filecount++; + + print "$filename: modified\n"; + } +} + +sub usage { + print "Usage:\n"; + print " normalizer.pl [-options] <dir> [dir2 dir3 ...]\n"; + print " Available options:\n"; + print " -e comma separated files extensions. By default accepts only java files\n"; + print "\n"; + print "Examples:\n"; + print " normalizer.pl -e c,cpp,h,hpp .\n"; +} + +
--- a/make/scripts/webrev.ksh Fri Jun 14 18:10:14 2013 -0700 +++ b/make/scripts/webrev.ksh Thu Jun 20 21:50:01 2013 -0700 @@ -19,7 +19,7 @@ # # CDDL HEADER END # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. # Use is subject to license terms. # # This script takes a file list and a workspace and builds a set of html files @@ -27,7 +27,7 @@ # Documentation is available via 'webrev -h'. # -WEBREV_UPDATED=23.18-hg +WEBREV_UPDATED=23.18-hg+jbs HTML='<?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -146,7 +146,7 @@ # bug2url() { - sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL'&\">&</a>|g' + sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL$IDPREFIX'&\">&</a>|g' } # @@ -230,8 +230,8 @@ # $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \ # new/usr/src/tools/scripts/webrev.sh \ # webrev.sh usr/src/tools/scripts \ -# '<a href="http://monaco.sfbay.sun.com/detail.jsp?cr=1234567"> -# 1234567</a> my bugid' > <file>.html +# '<a href="https://jbs.oracle.com/bugs/browse/JDK-1234567"> +# JDK-1234567</a> my bugid' > <file>.html # # framed_sdiff() is then called which creates $2.frames.html # in the webrev tree. @@ -1160,7 +1160,7 @@ print "$comm" return fi - + print "$comm" | html_quote | bug2url | sac2url ) fi @@ -1418,7 +1418,7 @@ next;} END {for (tree in trees) { rev=revs[trees[tree]]; - if (rev > 0) + if (rev > 0) {printf("%s %d\n",trees[tree],rev-1)} }}' | while read LINE do @@ -1459,7 +1459,7 @@ { TREE=$1 HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT" - + $HGCMD -mdn 2>/dev/null | $FILTER | while read F do echo $TREE/$F @@ -1543,7 +1543,7 @@ if (n == 0) { printf("A %s/%s\n",tree,$2)} else - { printf("A %s\n",$2)}; + { printf("A %s\n",$2)}; next} /^ / {n=index($1,tree); if (n == 0) @@ -1604,7 +1604,7 @@ # We need at least one of default-push or default paths set in .hg/hgrc # If neither are set we don't know who to compare with. -function flist_from_mercurial +function flist_from_mercurial { # if [ "${PWS##ssh://}" != "$PWS" -o \ # "${PWS##http://}" != "$PWS" -o \ @@ -1757,7 +1757,7 @@ elif [[ "$OS" == "Linux" ]]; then DEVTOOLS="/java/devtools/linux/bin" fi - + ppath=$PATH ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin @@ -1844,7 +1844,7 @@ ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'` ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'` fi - + } function build_old_new_mercurial @@ -2096,7 +2096,7 @@ PARENT_REV=$OPTARG;; v) print "$0 version: $WEBREV_UPDATED";; - + ?) usage;; esac @@ -2338,7 +2338,7 @@ # [[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS [[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name` - + if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then print -u2 "$codemgr_ws: no such workspace" exit 1 @@ -2521,10 +2521,16 @@ # Bug IDs will be replaced by a URL. Order of precedence # is: default location, $WEBREV_BUGURL, the -O flag. # -BUGURL='http://monaco.sfbay.sun.com/detail.jsp?cr=' +BUGURL='https://jbs.oracle.com/bugs/browse/' [[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL" -[[ -n "$Oflag" ]] && \ +if [[ -n "$Oflag" ]]; then + CRID=`echo $CRID | sed -e 's/JDK-//'` BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=' + IDPREFIX='' +else + IDPREFIX='JDK-' +fi + # # Likewise, ARC cases will be replaced by a URL. Order of precedence @@ -2561,7 +2567,7 @@ # # Should we ignore changes in white spaces when generating diffs? -# +# if [[ -n $bflag ]]; then DIFFOPTS="-t" else @@ -2748,7 +2754,7 @@ fi fi else - + # # If we have old and new versions of the file then run the # appropriate diffs. This is complicated by a couple of factors: @@ -3000,22 +3006,31 @@ # external URL has a <title> like: # <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title> # while internal URL has <title> like: -# <title>6641309: Wrong Cookie separator used in HttpURLConnection</title> +# <title>[#JDK-6641309] Wrong Cookie separator used in HttpURLConnection</title> # if [[ -n $CRID ]]; then for id in $CRID do + if [[ -z "$Oflag" ]]; then + #add "JDK-" to raw bug id for jbs links. + id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'` + fi print "<tr><th>Bug id:</th><td>" url="${BUGURL}${id}" - if [[ -n $WGET ]]; then - msg=`$WGET -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed 's/Bug ID://'` + if [[ -n "$Oflag" ]]; then + cleanup='s/Bug ID: \([0-9]\{5,\}\) \(.*\)/JDK-\1 : \2/' + else + cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|' fi - if [[ -n $msg ]]; then - print "<a href=\"$url\">$msg</a>" - else - print $id | bug2url + if [[ -n $WGET ]]; then + 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}" + fi + + print "<a href=\"$url\">$msg</a>" + print "</td></tr>" done fi @@ -3179,4 +3194,3 @@ print "Done." print "Output to: $WDIR" -
--- a/test/Makefile Fri Jun 14 18:10:14 2013 -0700 +++ b/test/Makefile Thu Jun 20 21:50:01 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -57,15 +57,17 @@ jdk_beans1 jdk_beans2 jdk_beans3 \ jdk_io \ jdk_lang \ - jdk_management1 jdk_management2 \ + jdk_management \ + jdk_jmx \ jdk_math \ - jdk_misc \ + jdk_other \ jdk_net \ - jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_nio \ jdk_security1 jdk_security2 jdk_security3 \ jdk_sound \ jdk_text \ - jdk_tools1 jdk_tools2 \ + jdk_tools \ + jdk_jdi \ jdk_jfr \ jdk_util