Mercurial > hg > openjdk > icedtea > jdk7
changeset 224:574b68a31202
Merge
| author | andrew |
|---|---|
| date | Thu, 29 Jul 2010 18:07:14 +0100 |
| parents | 525d1fc6ec1b (current diff) a136a51f5113 (diff) |
| children | 3356683be7ef |
| files | .hgtags make/Defs-internal.gmk make/hotspot-rules.gmk |
| diffstat | 19 files changed, 246 insertions(+), 188 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jul 29 03:13:09 2010 +0100 +++ b/.hgtags Thu Jul 29 18:07:14 2010 +0100 @@ -65,3 +65,16 @@ 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13 +7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 +425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 +97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 +5f5c33d417f3a14706b09a4a95e65fa7b6fa54d6 jdk7-b92 +5fc102ff48f0e787ce9cc77249841d5ff0941b75 jdk7-b93 +d7f35c61afa092b6357c2c4bce3f298f16620f71 jdk7-b94 +fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95 +cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96 +5e197c942c6ebd8b92f324a31049c5f1d26d40ef jdk7-b97 +6cea9984d73d74de0cd01f30d07ac0a1ed196117 jdk7-b98 +e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99 +b218a53ec7d3d42be61d31d6917a6c5c037b6f56 jdk7-b100 +4193eaf5f1b82794c6a0fb1a8d11af43d1b1d611 jdk7-b101
--- a/Makefile Thu Jul 29 03:13:09 2010 +0100 +++ b/Makefile Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 1995-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 1995, 2010, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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. # BUILD_PARENT_DIRECTORY=. @@ -29,10 +29,6 @@ TOPDIR:=. endif -ifndef CONTROL_TOPDIR - CONTROL_TOPDIR=$(TOPDIR) -endif - # Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true) OPENJDK_SOURCETREE=$(TOPDIR)/openjdk OPENJDK_BUILDDIR:=$(shell \ @@ -120,7 +116,7 @@ all_product_build:: @$(FINISH_ECHO) -# Generis build of basic repo series +# Generic build of basic repo series generic_build_repo_series:: $(MKDIR) -p $(OUTPUTDIR) $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image @@ -179,11 +175,15 @@ # The install process needs to know what the DEBUG_NAME is, so # look for INSTALL_DEBUG_NAME in the install rules. # +# NOTE: On windows, do not use $(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME). +# Due to the use of short paths in $(ABS_OUTPUTDIR), this may +# not be the same location. +# # Location of fresh bootdir output ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image -FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image +FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME)/j2sdk-image create_fresh_product_bootdir: FRC @$(START_ECHO) @@ -248,10 +248,14 @@ generic_build_repo_series @$(FINISH_ECHO) +# NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME). +# Due to the use of short paths in $(ABS_OUTPUTDIR), this may +# not be the same location. + generic_debug_build: @$(START_ECHO) $(MAKE) \ - ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ + ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME) \ DEBUG_NAME=$(DEBUG_NAME) \ GENERATE_DOCS=false \ $(BOOT_CYCLE_DEBUG_SETTINGS) \ @@ -348,8 +352,8 @@ clobber:: $(RM) -r $(OUTPUTDIR)/* - $(RM) -r $(OUTPUTDIR)-debug/* - $(RM) -r $(OUTPUTDIR)-fastdebug/* + $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/* + $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/* -($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE)) clean: clobber @@ -551,6 +555,56 @@ endif ################################################################ +# rule to test +################################################################ + +.NOTPARALLEL: test + +test: test_clean test_start test_summary + +test_start: + @$(ECHO) "Tests started at `$(DATE)`" + +test_clean: + $(RM) $(OUTPUTDIR)/test_failures.txt $(OUTPUTDIR)/test_log.txt + +test_summary: $(OUTPUTDIR)/test_failures.txt + @$(ECHO) "#################################################" + @$(ECHO) "Tests completed at `$(DATE)`" + @( $(EGREP) '^TEST STATS:' $(OUTPUTDIR)/test_log.txt \ + || $(ECHO) "No TEST STATS seen in log" ) + @$(ECHO) "For complete details see: $(OUTPUTDIR)/test_log.txt" + @$(ECHO) "#################################################" + @if [ -s $< ] ; then \ + $(ECHO) "ERROR: Test failure count: `$(CAT) $< | $(WC) -l`"; \ + $(CAT) $<; \ + exit 1; \ + else \ + $(ECHO) "Success! No failures detected"; \ + fi + +# Get failure list from log +$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt + @$(RM) $@ + @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@ + +# Get log file of all tests run +JDK_TO_TEST := $(shell \ + if [ -d "$(ABS_OUTPUTDIR)/j2sdk-image" ] ; then \ + $(ECHO) "$(ABS_OUTPUTDIR)/j2sdk-image"; \ + elif [ -d "$(ABS_OUTPUTDIR)/bin" ] ; then \ + $(ECHO) "$(ABS_OUTPUTDIR)"; \ + elif [ "$(PRODUCT_HOME)" != "" -a -d "$(PRODUCT_HOME)/bin" ] ; then \ + $(ECHO) "$(PRODUCT_HOME)"; \ + fi \ +) +$(OUTPUTDIR)/test_log.txt: + $(RM) $@ + ( $(CD) test && \ + $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \ + ) | tee $@ + +################################################################ # JPRT rule to build ################################################################ @@ -560,7 +614,7 @@ # PHONY ################################################################ -.PHONY: all \ +.PHONY: all test test_start test_summary test_clean \ generic_build_repo_series \ what clobber insane \ dev dev-build dev-sanity dev-clobber \
--- a/README-builds.html Thu Jul 29 03:13:09 2010 +0100 +++ b/README-builds.html Thu Jul 29 18:07:14 2010 +0100 @@ -65,8 +65,9 @@ <li><a href="#cacerts">Certificate Authority File (cacert)</a> </li> <li><a href="#compilers">Compilers</a> <ul> - <li><a href="#msvc">Microsoft Visual Studio</a> </li> - <li><a href="#mssdk">Microsoft Platform SDK</a> </li> + <li><a href="#msvc32">Microsoft Visual Studio Professional/Express for 32 bit</a> </li> + <li><a href="#msvc64">Microsoft Visual Studio Professional for 64 bit</a> </li> + <li><a href="#mssdk64">Microsoft Windows SDK for 64 bit</a> </li> <li><a href="#gcc">Linux gcc/binutils</a> </li> <li><a href="#studio">Sun Studio</a> </li> </ul> @@ -183,13 +184,13 @@ <tr> <td>Windows X86 (32-bit)</td> <td>Windows XP</td> - <td>Microsoft Visual Studio C++ 2008 Standard Edition</td> + <td>Microsoft Visual Studio C++ 2010 Professional Edition</td> <td>JDK 6u14 FCS </td> </tr> <tr> <td>Windows X64 (64-bit)</td> <td>Windows Server 2003 - Enterprise x64 Edition</td> - <td>Microsoft Platform SDK - April 2005</td> + <td>Microsoft Visual Studio C++ 2010 Professional Edition</td> <td>JDK 6u14 FCS </td> </tr> </tbody> @@ -789,15 +790,11 @@ </li> <li> Install the - <a href="#msvc">Microsoft Visual Studio Compilers</a> (32-bit). - </li> - <li> - Install the - <a href="#mssdk">Microsoft Platform SDK</a>. + <a href="#msvc32">Microsoft Visual Studio Compilers</a>). </li> <li> Setup all environment variables for compilers - (see <a href="#msvc">compilers</a>). + (see <a href="#msvc32">compilers</a>). </li> <li> Install @@ -962,15 +959,29 @@ are also an option, although these compilers have not been extensively used yet. </blockquote> - <strong><a name="msvc">Windows i586: Microsoft Visual Studio Compilers</a></strong> + <strong><a name="msvc32">Windows i586: Microsoft Visual Studio 2010 Compilers</a></strong> <blockquote> +<p> +<b>BEGIN WARNING</b>: At this time (Spring/Summer 2010) JDK 7 is starting a transition to +use the newest VS2010 Microsoft compilers. These build instructions are updated +to show where we are going. We have a QA process to go through before +official builds actually use VS2010. So for now, official builds are +still using VS2003. No other compilers are known to build the entire JDK, +including non-open portions. +So for now you should be able to build with either VS2003 or VS2010. +We do not guarantee that VS2008 will work, although there is sufficient +makefile support to make at least basic JDK builds plausible. +Visual Studio 2010 Express compilers are now able to build all the +open source repositories, but this is 32 bit only. To build 64 bit +Windows binaries use the the 7.1 Windows SDK.<b>END WARNING.</b> +<p> The 32-bit OpenJDK Windows build requires - Microsoft Visual Studio C++ 2008 (VS2008) Standard - Edition compiler. + Microsoft Visual Studio C++ 2010 (VS2010) Professional + Edition or Express compiler. The compiler and other tools are expected to reside in the location defined by the variable - <tt>VS90COMNTOOLS</tt> which + <tt>VS100COMNTOOLS</tt> which is set by the Microsoft Visual Studio installer. <p> Once the compiler is installed, @@ -982,37 +993,41 @@ prior to building the OpenJDK. The above environment variables <b>MUST</b> be set. + This compiler also contains the Windows SDK v 7.0a, + which is an update to the Windows 7 SDK. <p> <b>WARNING:</b> Make sure you check out the <a href="#cygwin">CYGWIN link.exe WARNING</a>. The path <tt>/usr/bin</tt> must be after the path to the Visual Studio product. </blockquote> - <strong><a name="mssdk">Windows: Microsoft Platform SDK</a></strong> + <strong><a name="msvc64">Windows x64: Microsoft Visual Studio 2010 Professional Compiler</a></strong> <blockquote> - On <b>X64</b>, the Microsoft Platform Software - Development Kit (SDK), April 2005 Edition compiler, - is required for building the OpenJDK - because it contains the C/C++ compiler. - You will need to minimally install the Core SDK and - the MDAC SDK features of this compiler. - <p> - Once the Platform SDK is installed, - it is recommended that you run <tt>SetEnv.Cmd /X64</tt> - to set the compiler environment variables - <tt>MSSDK</tt>, - <tt>MSTOOLS</tt>, - <tt>INCLUDE</tt>, - <tt>LIB</tt>, and - <tt>PATH</tt> - prior to building the - OpenJDK. - The above environment variables <b>MUST</b> be set. - <p> - This Platform SDK compiler is only used on X64 builds - but other parts of the Platform SDK may be used - for the X86 builds. + For <b>X64</b>, builds, when using the VS2010 Professional + compiler, the 64 bit build set up is much the same as 32 bit + except that you run <tt>amd64\VCVARS64.BAT</tt> + to set the compiler environment variables. + Previously 64 bit builds had used the 64 bit compiler in + an unbundled Windows SDK but this is no longer necessary if + you have VS2010 Professional. </blockquote> + <strong><a name="mssdk64">Windows x64: Microsoft Windows 7.1 SDK 64 bit compilers.</a></strong> + For a free alternative for 64 bit builds, use the 7.1 SDK. + Microsoft say that to set up your paths for this run +<pre> + c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd /x64. +</pre> + What was tested is just directly setting up LIB, INCLUDE, + PATH and based on the installation directories using the + DOS short name appropriate for the system, (you will + need to set them for yours, not just blindly copy this) eg : +<pre> + set VSINSTALLDIR=c:\PROGRA~2\MICROS~1.0 + set WindowsSdkDir=c:\PROGRA~1\MICROS~1\Windows\v7.1 + set PATH=%VSINSTALLDIR%\vc\bin\amd64;%VSINSTALLDIR%\Common7\IDE;%WindowsSdkDir%\bin;%PATH% + set INCLUDE=%VSINSTALLDIR%\vc\include;%WindowsSdkDir%\include + set LIB=%VSINSTALLDIR%\vc\lib\amd64;%WindowsSdkDir%\lib\x64 +</pre> </blockquote> <!-- ------------------------------------------------------ --> <h4><a name="zip">Zip and Unzip</a></h4> @@ -1314,40 +1329,16 @@ but it's normally found via the DirectX environment variable <tt>DXSDK_DIR</tt>. </blockquote> - <strong><a name="msvcrt"><tt>MSVCRT.DLL</tt></a></strong> + <strong><a name="msvcrt"><tt>MSVCR100.DLL</tt></a></strong> <blockquote> - <strong>i586 only:</strong> - The OpenJDK 32-bit build requires access to a redistributable - <tt>MSVCRT.DLL</tt>. - If the <tt>MSVCRT.DLL</tt> is not installed in - the system32 directory set the + The OpenJDK build requires access to a redistributable + <tt>MSVCR100.DLL</tt>. + This is usually picked up automatically from the redist + directories of Visual Studio 2010. + If this cannot be found set the <a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a> variable to the location of this file. <p> - <strong>X64 only:</strong> - The OpenJDK 64-bit build requires access to a redistributable - <tt>MSVCRT.DLL</tt>, which is - usually supplied by the - <a href="#mssdk">Platform SDK</a>. - If it is not available from the Platform SDK, - set the - <a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a> - variable to the location of this file. - </blockquote> - <strong><tt><a name="msvcr90">MSVCR90.DLL</a></tt></strong> - <blockquote> - <strong>i586 only:</strong> - The - OpenJDK - build requires access to a redistributable - <tt>MSVCR90.DLL</tt> which should be - supplied by the - <a href="#msvc">Visual Studio product</a>. - If the <tt>MSVCR90.DLL</tt> is not available from the - Visual Studio product - set the - <a href="#ALT_MSVCR90_DLL_PATH"><tt>ALT_MSVCR90_DLL_PATH</tt></a> - variable to the location of this file. </blockquote> </blockquote> <!-- ------------------------------------------------------ --> @@ -1623,11 +1614,10 @@ The location of the <a href="#msvcrt"><tt>MSVCRT.DLL</tt></a>. </dd> - <dt><tt><a name="ALT_MSVCR90_DLL_PATH">ALT_MSVCR90_DLL_PATH</a></tt> </dt> + <dt><tt><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></tt> </dt> <dd> - <strong>i586 only:</strong> The location of the - <a href="#msvcr90"><tt>MSVCR90.DLL</tt></a>. + <a href="#msvcrt"><tt>MSVCR100.DLL</tt></a>. </dd> </dl> </dd>
--- a/make/Defs-internal.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/Defs-internal.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 1995-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 1995, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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. # # @@ -52,7 +52,6 @@ endif # Define absolute paths to TOPDIRs -ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)") ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)") ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)")
--- a/make/corba-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/corba-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2001, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/deploy-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/deploy-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2002, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/hotspot-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/hotspot-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2001, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/install-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/install-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2002, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/jaxp-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/jaxp-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2001, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/jaxws-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/jaxws-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2001, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/jdk-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/jdk-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2001, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/jprt.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/jprt.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2006, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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. # ################################################################ @@ -45,11 +45,11 @@ endif jprt_build_fastdebug: fastdebug_build - ( $(CD) $(OUTPUTDIR)-fastdebug/j2sdk-image && \ + ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) jprt_build_debug: debug_build - ( $(CD) $(OUTPUTDIR)-debug/j2sdk-image && \ + ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) ################################################################
--- a/make/jprt.properties Thu Jul 29 03:13:09 2010 +0100 +++ b/make/jprt.properties Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2006-2010 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2006, 2010, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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. # # Properties for jprt
--- a/make/langtools-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/langtools-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2001, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/sanity-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/sanity-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2001, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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. # ################################################################ @@ -281,7 +281,6 @@ @$(ECHO) "Build Directory Structure:" >> $(MESSAGE_FILE) @$(ECHO) " CWD = `$(PWD)`" >> $(MESSAGE_FILE) @$(ECHO) " TOPDIR = $(TOPDIR)" >> $(MESSAGE_FILE) - @$(ECHO) " CONTROL_TOPDIR = $(CONTROL_TOPDIR)" >> $(MESSAGE_FILE) ifeq ($(LANGTOOLS_SRC_AVAILABLE), true) @$(ECHO) " LANGTOOLS_TOPDIR = $(LANGTOOLS_TOPDIR)" >> $(MESSAGE_FILE) endif
--- a/make/sponsors-rules.gmk Thu Jul 29 03:13:09 2010 +0100 +++ b/make/sponsors-rules.gmk Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2006, 2009, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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/bsd-header Thu Jul 29 03:13:09 2010 +0100 +++ b/make/templates/bsd-header Thu Jul 29 18:07:14 2010 +0100 @@ -11,7 +11,7 @@ notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - - Neither the name of Sun Microsystems nor the names of its + - Neither the name of Oracle nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
--- a/make/templates/gpl-cp-header Thu Jul 29 03:13:09 2010 +0100 +++ b/make/templates/gpl-cp-header Thu Jul 29 18:07:14 2010 +0100 @@ -3,9 +3,9 @@ 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. Sun designates this +published by the Free Software Foundation. Oracle designates this particular file as subject to the "Classpath" exception as provided -by Sun in the LICENSE file that accompanied this code. +by Oracle in the LICENSE file that accompanied this code. This code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--- a/test/Makefile Thu Jul 29 03:13:09 2010 +0100 +++ b/test/Makefile Thu Jul 29 18:07:14 2010 +0100 @@ -1,12 +1,12 @@ # -# Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 2010, 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. Sun designates this +# published by the Free Software Foundation. Oracle designates this # particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. +# by Oracle in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18,9 +18,9 @@ # 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. # # @@ -54,30 +54,33 @@ # Test target list for jdk repository JDK_TEST_LIST = \ - jdk_awt \ - jdk_beans jdk_beans1 jdk_beans2 jdk_beans3 \ + jdk_beans1 jdk_beans2 jdk_beans3 \ jdk_io \ jdk_lang \ - jdk_management jdk_management1 jdk_management2 \ + jdk_management1 jdk_management2 \ jdk_math \ jdk_misc \ jdk_net \ - jdk_nio jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_security1 jdk_security2 jdk_security3 \ + jdk_text \ + jdk_tools1 jdk_tools2 \ + jdk_util + +# These tests need a DISPLAY and can create window interaction complications +JDK_TEST_LIST2 = \ + jdk_awt \ jdk_rmi \ - jdk_security jdk_security1 jdk_security2 jdk_security3 \ - jdk_swing \ - jdk_text \ - jdk_tools jdk_tools1 jdk_tools2 \ - jdk_util + jdk_swing # Default test target (everything) all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST) # Test targets $(LANGTOOLS_TEST_LIST): - @$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) $(JDK_TEST_LIST): - @$(call SUBDIR_TEST, $(JDK_DIR), $@) + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) clean: