Mercurial > hg > release > icedtea7-forest-2.5
changeset 907:9fcc8e9fc653
Merge
author | Goetz |
---|---|
date | Mon, 03 Jun 2013 15:36:52 +0200 |
parents | 7bdb960330d8 (current diff) f89fd7e2800c (diff) |
children | 01d6688803f4 |
files | .hgtags make/hotspot-rules.gmk |
diffstat | 7 files changed, 123 insertions(+), 70 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Mar 12 10:09:11 2013 +0100 +++ b/.hgtags Mon Jun 03 15:36:52 2013 +0200 @@ -216,6 +216,8 @@ dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02 3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04 d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05 +81f8b620894e275012a1b447f13319b7d2148b28 jdk7u9-b31 +d247cdeb828f4463b55ea53c4b2d6346f7706c3c jdk7u9-b32 d934ce27cddbc9ba7236791f177872491204a41e jdk7u10-b10 5a5ee5b70d563d5817b6ec023d275e9b17256459 jdk7u10-b11 48b58c2d665c9a1d3598b981e46f87f9bcdd5b46 jdk7u10-b12 @@ -226,8 +228,11 @@ 494e838439db7f0f4e36f7dcfeba06d2bef78c8d jdk7u10-b17 dce9058d2151e6b5c84898c13cfd1521a627a296 jdk7u10-b18 b5fb925394331313dbe3859fdc408bfd37193476 jdk7u10-b30 +337ce65c8c356766212812b78f49f5632995987d jdk7u10-b31 c2d5141baeda6c9b5bbc83c21eff9c3940fefae4 jdk7u11-b20 168aa0f1417b3651a955ae66068dc148b660f829 jdk7u11-b21 +7c0710ed65b097d415f772ff4fb58c4822890aa3 jdk7u11-b32 +61cee7a518a4ae05439490ec388c3ab1d1d899f2 jdk7u11-b33 c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u11-b03 0b418e2ccf9093718609144689d1a8b316ad951f jdk7u11-b04 e127e6c94b56f7348df67d9672c16a7dc9c5ec5e jdk7u11-b05 @@ -235,6 +240,8 @@ 80a3d0bcd3d4c9e83b75416178bdd60a2d23ebbc jdk7u11-b07 e7c55def6796d3c426631b5717084ef122908847 jdk7u11-b08 2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u13-b09 +3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10 +527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30 3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20 1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01 d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02 @@ -260,3 +267,39 @@ ae5c1b29297dae0375277a0b6428c266d8d77c71 jdk7u14-b13 bb97ad0c9e5a0566e82b3b4bc43eabe680b89d97 jdk7u14-b14 a20ac67cdbc245d1c14fec3061703232501f8334 ppc-aix-port-b04 +b534282bd377e3886b9d0d4760f6fdaa1804bdd3 jdk7u14-b15 +0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01 +0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02 +25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30 +5c1b2900a65b5ebe9d2a5c9b48903081c8196b04 jdk7u15-b31 +e7adbfbcd837ad4e9f88db45612e5704b7a249fd jdk7u15-b33 +f37a75bd39595ba38bdc53ee957c63bbb3cbb12d jdk7u15-b03 +2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32 +0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01 +8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02 +933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30 +790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31 +527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01 +bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02 +20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03 +d2b1fdd8ee0affe640c7493ab3ae04fcc1961446 jdk7u21-b04 +2d6657f92359d1d46b355fd0c99b8aa5f34832e4 jdk7u21-b05 +14522481739dc6981beb5cc55d543dcc62cda067 jdk7u21-b06 +0df382e8c17bf817d55fc8759c7f5c9e9d0337f0 jdk7u21-b07 +1aff32a21aba64c3767e9a72ebf1b8ba490e99ec jdk7u21-b08 +a2e0099b4cf70be026a7a0ba7918fcd71d57fdce jdk7u21-b09 +602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10 +fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11 +450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30 +170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12 +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
--- a/Makefile Tue Mar 12 10:09:11 2013 +0100 +++ b/Makefile Mon Jun 03 15:36:52 2013 +0200 @@ -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 Tue Mar 12 10:09:11 2013 +0100 +++ b/make/deploy-rules.gmk Mon Jun 03 15:36:52 2013 +0200 @@ -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 Tue Mar 12 10:09:11 2013 +0100 +++ b/make/hotspot-rules.gmk Mon Jun 03 15:36:52 2013 +0200 @@ -119,6 +119,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 Tue Mar 12 10:09:11 2013 +0100 +++ b/make/install-rules.gmk Mon Jun 03 15:36:52 2013 +0200 @@ -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 Tue Mar 12 10:09:11 2013 +0100 +++ b/make/jprt.gmk Mon Jun 03 15:36:52 2013 +0200 @@ -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/scripts/webrev.ksh Tue Mar 12 10:09:11 2013 +0100 +++ b/make/scripts/webrev.ksh Mon Jun 03 15:36:52 2013 +0200 @@ -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" -