Mercurial > hg > release > icedtea7-forest-2.0
changeset 270:c94d1673451e
Merge
author | andrew |
---|---|
date | Wed, 10 Nov 2010 19:06:57 +0000 |
parents | 8c42187fd46e (current diff) 7220e60b097f (diff) |
children | 9bf0526ea1a0 |
files | .hgtags make/hotspot-rules.gmk |
diffstat | 10 files changed, 401 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Tue Sep 14 11:37:13 2010 +0100 +++ b/.hgignore Wed Nov 10 19:06:57 2010 +0000 @@ -1,3 +1,4 @@ ^build/ ^dist/ /nbproject/private/ +^webrev
--- a/.hgtags Tue Sep 14 11:37:13 2010 +0100 +++ b/.hgtags Wed Nov 10 19:06:57 2010 +0000 @@ -85,3 +85,11 @@ 43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106 7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108 +81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109 +2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110 +9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111 +b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112 +c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113 +27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114 +e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115 +94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116
--- a/Makefile Tue Sep 14 11:37:13 2010 +0100 +++ b/Makefile Wed Nov 10 19:06:57 2010 +0000 @@ -558,9 +558,12 @@ # rule to test ################################################################ -.NOTPARALLEL: test +.NOTPARALLEL: test_run -test: test_clean test_start test_summary +test: + $(MAKE) test_run + +test_run: test_clean test_start test_summary test_start: @$(ECHO) "Tests started at `$(DATE)`" @@ -586,7 +589,7 @@ # Get failure list from log $(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt @$(RM) $@ - @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@ + @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@ # Get log file of all tests run JDK_TO_TEST := $(shell \ @@ -598,10 +601,11 @@ $(ECHO) "$(PRODUCT_HOME)"; \ fi \ ) +TEST_TARGETS=all $(OUTPUTDIR)/test_log.txt: $(RM) $@ - ( $(CD) test && \ - $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \ + ( $(CD) test && \ + $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \ ) | tee $@ ################################################################ @@ -614,7 +618,7 @@ # PHONY ################################################################ -.PHONY: all test test_start test_summary test_clean \ +.PHONY: all test test_run test_start test_summary test_clean \ generic_build_repo_series \ what clobber insane \ dev dev-build dev-sanity dev-clobber \
--- a/README-builds.html Tue Sep 14 11:37:13 2010 +0100 +++ b/README-builds.html Wed Nov 10 19:06:57 2010 +0000 @@ -148,7 +148,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 12</td> + <td>Sun Studio 12 Update 1 + patches</td> <td>JDK 6u14 FCS </td> </tr> <tr> @@ -158,7 +158,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 12</td> + <td>Sun Studio 12 Update 1 + patches</td> <td>JDK 6u14 FCS </td> </tr> <tr> @@ -168,7 +168,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 12</td> + <td>Sun Studio 12 Update 1 + patches</td> <td>JDK 6u14 FCS </td> </tr> <tr> @@ -178,7 +178,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 12</td> + <td>Sun Studio 12 Update 1 + patches</td> <td>JDK 6u14 FCS </td> </tr> <tr> @@ -941,21 +941,78 @@ <strong><a name="studio">Solaris: Sun Studio</a></strong> <blockquote> At a minimum, the - <a href="http://developers.sun.com/sunstudio/index.jsp" target="_blank"> - Sun Studio 12 Compilers</a> - (containing version 5.9 of the C and C++ compilers) is required, - with patches from the - <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/patch-access" target="_blank"> - SunSolve web site</a>. + <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm" target="_blank"> + Sun Studio 12 Update 1 Compilers</a> + (containing version 5.10 of the C and C++ compilers) is required, + including specific patches. + <p> + The Solaris SPARC patch list is: + <ul> + <li> + 118683-05: SunOS 5.10: Patch for profiling libraries and assembler + </li> + <li> + 119963-21: SunOS 5.10: Shared library patch for C++ + </li> + <li> + 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch + </li> + <li> + 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler + </li> + <li> + 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 + </li> + <li> + 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler + </li> + <li> + 142371-01: Sun Studio 12.1 Update 1: Patch for dbx + </li> + <li> + 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling + </li> + <li> + 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 + </li> + <li> + 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools + </li> + </ul> + <p> + The Solaris X86 patch list is: + <ul> + <li> + 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler + </li> + <li> + 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86 + </li> + <li> + 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch + </li> + <li> + 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend + </li> + <li> + 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler + </li> + <li> + 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler + </li> + <li> + 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools + </li> + </ul> <p> Set <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a> to point to the location of the compiler binaries, and place this location in the <tt>PATH</tt>. <p> - The Sun Studio Express compilers at: + The Oracle Solaris Studio Express compilers at: <a href="http://developers.sun.com/sunstudio/downloads/express.jsp" target="_blank"> - Sun Studio Express Download site</a> + Oracle Solaris Studio Express Download site</a> are also an option, although these compilers have not been extensively used yet. </blockquote>
--- a/make/deploy-rules.gmk Tue Sep 14 11:37:13 2010 +0100 +++ b/make/deploy-rules.gmk Wed Nov 10 19:06:57 2010 +0000 @@ -41,7 +41,7 @@ IMAGES_TARGET = images endif -DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all +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) @@ -79,7 +79,6 @@ ifeq ($(UP_TMP), true) DEPLOY_BUILD_TARGETS += cmd-comp-all endif - DEPLOY_BUILD_TARGETS += kernel-all endif endif endif
--- a/make/hotspot-rules.gmk Tue Sep 14 11:37:13 2010 +0100 +++ b/make/hotspot-rules.gmk Wed Nov 10 19:06:57 2010 +0000 @@ -73,7 +73,11 @@ endif ifeq ($(ZERO_BUILD), true) - HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero + ifeq ($(SHARK_BUILD), true) + HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark + else + HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero + endif endif HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
--- a/make/install-rules.gmk Tue Sep 14 11:37:13 2010 +0100 +++ b/make/install-rules.gmk Wed Nov 10 19:06:57 2010 +0000 @@ -93,6 +93,10 @@ fi endif +combo_build: + @$(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-clobber: ifeq ($(BUILD_INSTALL), true) @$(call MakeStart, install, clobber)
--- a/make/jprt.properties Tue Sep 14 11:37:13 2010 +0100 +++ b/make/jprt.properties Wed Nov 10 19:06:57 2010 +0000 @@ -25,49 +25,310 @@ # Properties for jprt -# Use whatever release that the submitted job requests +# At submit time, the release supplied will be in jprt.submit.release +# and will be one of the official release names defined in jprt. +# jprt supports property value expansion using ${property.name} syntax. + +# This tells jprt what default release we want to build jprt.tools.default.release=${jprt.submit.release} # The different build flavors we want, we override here so we just get these 2 jprt.build.flavors=product,fastdebug -# Shortened list of vm tests -jprt.test.targets= \ - *-product-*-jvm98, \ - *-product-*-scimark, \ - *-product-*-runThese, \ - *-product-*-GCBasher_default, \ - *-product-*-GCOld_default, \ - *-product-*-jbb_default +# Define the Windows we want (temporary) +jprt.my.windows.i586.jdk7b107=windows_i586_5.0 +jprt.my.windows.i586.jdk7temp=windows_i586_5.0 +jprt.my.windows.i586.jdk7=windows_i586_5.1 +jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} + +# Standard list of jprt build targets for this source tree +jprt.build.targets= \ + solaris_sparc_5.10-{product|fastdebug}, \ + solaris_sparcv9_5.10-{product|fastdebug}, \ + solaris_i586_5.10-{product|fastdebug}, \ + solaris_x64_5.10-{product|fastdebug}, \ + linux_i586_2.6-{product|fastdebug}, \ + linux_x64_2.6-{product|fastdebug}, \ + ${jprt.my.windows.i586}-{product|fastdebug}, \ + windows_x64_5.2-{product|fastdebug} + +# User can select the test set with jprt submit "-testset name" option +jprt.my.test.set=${jprt.test.set} + +# Default vm test targets (no fastdebug & limited c2 testing) +jprt.vm.default.test.targets= \ + \ + solaris_sparc_5.10-product-c1-jvm98, \ + solaris_sparcv9_5.10-product-c2-jvm98, \ + solaris_i586_5.10-product-c1-jvm98, \ + solaris_x64_5.10-product-c2-jvm98, \ + linux_i586_2.6-product-{c1|c2}-jvm98, \ + linux_x64_2.6-product-c2-jvm98, \ + ${jprt.my.windows.i586}-product-c1-jvm98, \ + windows_x64_5.2-product-c2-jvm98, \ + \ + solaris_sparc_5.10-product-c1-scimark, \ + solaris_sparcv9_5.10-product-c2-scimark, \ + solaris_i586_5.10-product-c1-scimark, \ + solaris_x64_5.10-product-c2-scimark, \ + linux_i586_2.6-product-{c1|c2}-scimark, \ + linux_x64_2.6-product-c2-scimark, \ + ${jprt.my.windows.i586}-product-c1-scimark, \ + windows_x64_5.2-product-c2-scimark -# Test targets in test/Makefile -jprt.make.rule.test.targets= \ - *-product-*-langtools_jtreg, \ - *-product-*-jdk_beans1, \ - *-product-*-jdk_beans2, \ - *-product-*-jdk_beans3, \ - *-product-*-jdk_io, \ - *-product-*-jdk_lang, \ - *-product-*-jdk_management1, \ - *-product-*-jdk_management2, \ - *-product-*-jdk_math, \ - *-product-*-jdk_misc, \ - *-product-*-jdk_net, \ - *-product-*-jdk_nio1, \ - *-product-*-jdk_nio2, \ - *-product-*-jdk_nio3, \ - *-product-*-jdk_security1, \ - *-product-*-jdk_security2, \ - *-product-*-jdk_security3, \ - *-product-*-jdk_text, \ - *-product-*-jdk_tools1, \ - *-product-*-jdk_tools2, \ - *-product-*-jdk_util +# Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing) +jprt.make.rule.default.test.targets= \ + \ + solaris_sparc_5.10-product-c1-langtools_jtreg, \ + solaris_sparcv9_5.10-product-c2-langtools_jtreg, \ + solaris_i586_5.10-product-c1-langtools_jtreg, \ + solaris_x64_5.10-product-c2-langtools_jtreg, \ + linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \ + linux_x64_2.6-product-c2-langtools_jtreg, \ + ${jprt.my.windows.i586}-product-c1-langtools_jtreg, \ + windows_x64_5.2-product-c2-langtools_jtreg, \ + \ + solaris_sparc_5.10-product-c1-jdk_beans1, \ + solaris_sparcv9_5.10-product-c2-jdk_beans1, \ + solaris_i586_5.10-product-c1-jdk_beans1, \ + solaris_x64_5.10-product-c2-jdk_beans1, \ + linux_i586_2.6-product-{c1|c2}-jdk_beans1, \ + linux_x64_2.6-product-c2-jdk_beans1, \ + ${jprt.my.windows.i586}-product-c1-jdk_beans1, \ + windows_x64_5.2-product-c2-jdk_beans1, \ + \ + solaris_sparc_5.10-product-c1-jdk_io, \ + solaris_sparcv9_5.10-product-c2-jdk_io, \ + solaris_i586_5.10-product-c1-jdk_io, \ + solaris_x64_5.10-product-c2-jdk_io, \ + linux_i586_2.6-product-{c1|c2}-jdk_io, \ + linux_x64_2.6-product-c2-jdk_io, \ + ${jprt.my.windows.i586}-product-c1-jdk_io, \ + windows_x64_5.2-product-c2-jdk_io, \ + \ + solaris_sparc_5.10-product-c1-jdk_lang, \ + solaris_sparcv9_5.10-product-c2-jdk_lang, \ + solaris_i586_5.10-product-c1-jdk_lang, \ + solaris_x64_5.10-product-c2-jdk_lang, \ + linux_i586_2.6-product-{c1|c2}-jdk_lang, \ + linux_x64_2.6-product-c2-jdk_lang, \ + ${jprt.my.windows.i586}-product-c1-jdk_lang, \ + windows_x64_5.2-product-c2-jdk_lang, \ + \ + solaris_sparc_5.10-product-c1-jdk_math, \ + solaris_sparcv9_5.10-product-c2-jdk_math, \ + solaris_i586_5.10-product-c1-jdk_math, \ + solaris_x64_5.10-product-c2-jdk_math, \ + linux_i586_2.6-product-{c1|c2}-jdk_math, \ + linux_x64_2.6-product-c2-jdk_math, \ + ${jprt.my.windows.i586}-product-c1-jdk_math, \ + windows_x64_5.2-product-c2-jdk_math, \ + \ + solaris_sparc_5.10-product-c1-jdk_misc, \ + solaris_sparcv9_5.10-product-c2-jdk_misc, \ + solaris_i586_5.10-product-c1-jdk_misc, \ + solaris_x64_5.10-product-c2-jdk_misc, \ + linux_i586_2.6-product-{c1|c2}-jdk_misc, \ + linux_x64_2.6-product-c2-jdk_misc, \ + ${jprt.my.windows.i586}-product-c1-jdk_misc, \ + windows_x64_5.2-product-c2-jdk_misc, \ + \ + solaris_sparc_5.10-product-c1-jdk_net, \ + solaris_sparcv9_5.10-product-c2-jdk_net, \ + solaris_i586_5.10-product-c1-jdk_net, \ + solaris_x64_5.10-product-c2-jdk_net, \ + linux_i586_2.6-product-{c1|c2}-jdk_net, \ + linux_x64_2.6-product-c2-jdk_net, \ + ${jprt.my.windows.i586}-product-c1-jdk_net, \ + windows_x64_5.2-product-c2-jdk_net, \ + \ + solaris_sparc_5.10-product-c1-jdk_nio1, \ + solaris_sparcv9_5.10-product-c2-jdk_nio1, \ + solaris_i586_5.10-product-c1-jdk_nio1, \ + solaris_x64_5.10-product-c2-jdk_nio1, \ + linux_i586_2.6-product-{c1|c2}-jdk_nio1, \ + linux_x64_2.6-product-c2-jdk_nio1, \ + ${jprt.my.windows.i586}-product-c1-jdk_nio1, \ + windows_x64_5.2-product-c2-jdk_nio1, \ + \ + solaris_sparc_5.10-product-c1-jdk_nio2, \ + solaris_sparcv9_5.10-product-c2-jdk_nio2, \ + solaris_i586_5.10-product-c1-jdk_nio2, \ + solaris_x64_5.10-product-c2-jdk_nio2, \ + linux_i586_2.6-product-{c1|c2}-jdk_nio2, \ + linux_x64_2.6-product-c2-jdk_nio2, \ + ${jprt.my.windows.i586}-product-c1-jdk_nio2, \ + windows_x64_5.2-product-c2-jdk_nio2, \ + \ + solaris_sparc_5.10-product-c1-jdk_nio3, \ + solaris_sparcv9_5.10-product-c2-jdk_nio3, \ + solaris_i586_5.10-product-c1-jdk_nio3, \ + solaris_x64_5.10-product-c2-jdk_nio3, \ + linux_i586_2.6-product-{c1|c2}-jdk_nio3, \ + linux_x64_2.6-product-c2-jdk_nio3, \ + ${jprt.my.windows.i586}-product-c1-jdk_nio3, \ + windows_x64_5.2-product-c2-jdk_nio3, \ + \ + solaris_sparc_5.10-product-c1-jdk_security1, \ + solaris_sparcv9_5.10-product-c2-jdk_security1, \ + solaris_i586_5.10-product-c1-jdk_security1, \ + solaris_x64_5.10-product-c2-jdk_security1, \ + linux_i586_2.6-product-{c1|c2}-jdk_security1, \ + linux_x64_2.6-product-c2-jdk_security1, \ + ${jprt.my.windows.i586}-product-c1-jdk_security1, \ + windows_x64_5.2-product-c2-jdk_security1, \ + \ + solaris_sparc_5.10-product-c1-jdk_text, \ + solaris_sparcv9_5.10-product-c2-jdk_text, \ + solaris_i586_5.10-product-c1-jdk_text, \ + solaris_x64_5.10-product-c2-jdk_text, \ + linux_i586_2.6-product-{c1|c2}-jdk_text, \ + linux_x64_2.6-product-c2-jdk_text, \ + ${jprt.my.windows.i586}-product-c1-jdk_text, \ + windows_x64_5.2-product-c2-jdk_text, \ + \ + solaris_sparc_5.10-product-c1-jdk_tools1, \ + solaris_sparcv9_5.10-product-c2-jdk_tools1, \ + solaris_i586_5.10-product-c1-jdk_tools1, \ + solaris_x64_5.10-product-c2-jdk_tools1, \ + linux_i586_2.6-product-{c1|c2}-jdk_tools1, \ + linux_x64_2.6-product-c2-jdk_tools1, \ + ${jprt.my.windows.i586}-product-c1-jdk_tools1, \ + windows_x64_5.2-product-c2-jdk_tools1, \ + \ + solaris_sparc_5.10-product-c1-jdk_util, \ + solaris_sparcv9_5.10-product-c2-jdk_util, \ + solaris_i586_5.10-product-c1-jdk_util, \ + solaris_x64_5.10-product-c2-jdk_util, \ + linux_i586_2.6-product-{c1|c2}-jdk_util, \ + linux_x64_2.6-product-c2-jdk_util, \ + ${jprt.my.windows.i586}-product-c1-jdk_util, \ + windows_x64_5.2-product-c2-jdk_util -# Not Ready Yet: -# *-product-*-jdk_awt -# *-product-*-jdk_rmi -# *-product-*-jdk_swing +# All vm test targets (but still no fastdebug & limited c2 testing) +jprt.vm.all.test.targets= \ + \ + ${jprt.vm.default.test.targets}, \ + \ + solaris_sparc_5.10-product-c1-runThese, \ + solaris_sparcv9_5.10-product-c2-runThese, \ + solaris_i586_5.10-product-c1-runThese, \ + solaris_x64_5.10-product-c2-runThese, \ + linux_i586_2.6-product-{c1|c2}-runThese, \ + linux_x64_2.6-product-c2-runThese, \ + ${jprt.my.windows.i586}-product-c1-runThese, \ + windows_x64_5.2-product-c2-runThese, \ + \ + solaris_sparc_5.10-product-c1-jbb_default, \ + solaris_sparcv9_5.10-product-c2-jbb_default, \ + solaris_i586_5.10-product-c1-jbb_default, \ + solaris_x64_5.10-product-c2-jbb_default, \ + linux_i586_2.6-product-{c1|c2}-jbb_default, \ + linux_x64_2.6-product-c2-jbb_default, \ + ${jprt.my.windows.i586}-product-c1-jbb_default, \ + windows_x64_5.2-product-c2-jbb_default + +# All jdk test targets (but still no fastdebug & limited c2 testing) +jprt.make.rule.all.test.targets= \ + \ + ${jprt.make.rule.default.test.targets}, \ + \ + solaris_sparc_5.10-product-c1-jdk_awt, \ + solaris_sparcv9_5.10-product-c2-jdk_awt, \ + solaris_i586_5.10-product-c1-jdk_awt, \ + solaris_x64_5.10-product-c2-jdk_awt, \ + linux_i586_2.6-product-{c1|c2}-jdk_awt, \ + linux_x64_2.6-product-c2-jdk_awt, \ + ${jprt.my.windows.i586}-product-c1-jdk_awt, \ + windows_x64_5.2-product-c2-jdk_awt, \ + \ + solaris_sparc_5.10-product-c1-jdk_beans2, \ + solaris_sparcv9_5.10-product-c2-jdk_beans2, \ + solaris_i586_5.10-product-c1-jdk_beans2, \ + solaris_x64_5.10-product-c2-jdk_beans2, \ + linux_i586_2.6-product-{c1|c2}-jdk_beans2, \ + linux_x64_2.6-product-c2-jdk_beans2, \ + ${jprt.my.windows.i586}-product-c1-jdk_beans2, \ + windows_x64_5.2-product-c2-jdk_beans2, \ + \ + solaris_sparc_5.10-product-c1-jdk_beans3, \ + solaris_sparcv9_5.10-product-c2-jdk_beans3, \ + solaris_i586_5.10-product-c1-jdk_beans3, \ + solaris_x64_5.10-product-c2-jdk_beans3, \ + linux_i586_2.6-product-{c1|c2}-jdk_beans3, \ + linux_x64_2.6-product-c2-jdk_beans3, \ + ${jprt.my.windows.i586}-product-c1-jdk_beans3, \ + windows_x64_5.2-product-c2-jdk_beans3, \ + \ + solaris_sparc_5.10-product-c1-jdk_management1, \ + solaris_sparcv9_5.10-product-c2-jdk_management1, \ + solaris_i586_5.10-product-c1-jdk_management1, \ + solaris_x64_5.10-product-c2-jdk_management1, \ + linux_i586_2.6-product-{c1|c2}-jdk_management1, \ + linux_x64_2.6-product-c2-jdk_management1, \ + ${jprt.my.windows.i586}-product-c1-jdk_management1, \ + windows_x64_5.2-product-c2-jdk_management1, \ + \ + solaris_sparc_5.10-product-c1-jdk_management2, \ + solaris_sparcv9_5.10-product-c2-jdk_management2, \ + solaris_i586_5.10-product-c1-jdk_management2, \ + solaris_x64_5.10-product-c2-jdk_management2, \ + linux_i586_2.6-product-{c1|c2}-jdk_management2, \ + linux_x64_2.6-product-c2-jdk_management2, \ + ${jprt.my.windows.i586}-product-c1-jdk_management2, \ + windows_x64_5.2-product-c2-jdk_management2, \ + \ + solaris_sparc_5.10-product-c1-jdk_rmi, \ + solaris_sparcv9_5.10-product-c2-jdk_rmi, \ + solaris_i586_5.10-product-c1-jdk_rmi, \ + solaris_x64_5.10-product-c2-jdk_rmi, \ + linux_i586_2.6-product-{c1|c2}-jdk_rmi, \ + linux_x64_2.6-product-c2-jdk_rmi, \ + ${jprt.my.windows.i586}-product-c1-jdk_rmi, \ + windows_x64_5.2-product-c2-jdk_rmi, \ + \ + solaris_sparc_5.10-product-c1-jdk_security2, \ + solaris_sparcv9_5.10-product-c2-jdk_security2, \ + solaris_i586_5.10-product-c1-jdk_security2, \ + solaris_x64_5.10-product-c2-jdk_security2, \ + linux_i586_2.6-product-{c1|c2}-jdk_security2, \ + linux_x64_2.6-product-c2-jdk_security2, \ + ${jprt.my.windows.i586}-product-c1-jdk_security2, \ + windows_x64_5.2-product-c2-jdk_security2, \ + \ + solaris_sparc_5.10-product-c1-jdk_security3, \ + solaris_sparcv9_5.10-product-c2-jdk_security3, \ + solaris_i586_5.10-product-c1-jdk_security3, \ + solaris_x64_5.10-product-c2-jdk_security3, \ + linux_i586_2.6-product-{c1|c2}-jdk_security3, \ + linux_x64_2.6-product-c2-jdk_security3, \ + ${jprt.my.windows.i586}-product-c1-jdk_security3, \ + windows_x64_5.2-product-c2-jdk_security3, \ + \ + solaris_sparc_5.10-product-c1-jdk_swing, \ + solaris_sparcv9_5.10-product-c2-jdk_swing, \ + solaris_i586_5.10-product-c1-jdk_swing, \ + solaris_x64_5.10-product-c2-jdk_swing, \ + linux_i586_2.6-product-{c1|c2}-jdk_swing, \ + linux_x64_2.6-product-c2-jdk_swing, \ + ${jprt.my.windows.i586}-product-c1-jdk_swing, \ + windows_x64_5.2-product-c2-jdk_swing, \ + \ + solaris_sparc_5.10-product-c1-jdk_tools2, \ + solaris_sparcv9_5.10-product-c2-jdk_tools2, \ + solaris_i586_5.10-product-c1-jdk_tools2, \ + solaris_x64_5.10-product-c2-jdk_tools2, \ + linux_i586_2.6-product-{c1|c2}-jdk_tools2, \ + linux_x64_2.6-product-c2-jdk_tools2, \ + ${jprt.my.windows.i586}-product-c1-jdk_tools2, \ + windows_x64_5.2-product-c2-jdk_tools2 + +# Select list to use (allow for testset to be empty too) +jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets} +jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets} +jprt.vm..test.targets=${jprt.vm.default.test.targets} +jprt.vm.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets} +jprt.test.targets=${jprt.vm.test.targets} # Directories to be excluded from the source bundles jprt.bundle.exclude.src.dirs=build dist webrev
--- a/make/templates/gpl-cp-header Tue Sep 14 11:37:13 2010 +0100 +++ b/make/templates/gpl-cp-header Wed Nov 10 19:06:57 2010 +0000 @@ -17,6 +17,6 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -CA 95054 USA or visit www.sun.com if you need additional information or -have any questions. +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.
--- a/make/templates/gpl-header Tue Sep 14 11:37:13 2010 +0100 +++ b/make/templates/gpl-header Wed Nov 10 19:06:57 2010 +0000 @@ -15,6 +15,6 @@ 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -CA 95054 USA or visit www.sun.com if you need additional information or -have any questions. +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.