Mercurial > hg > openjdk > jdk7u > jdk
changeset 510:ca9f7451cb25
Merge
| author | asaha |
|---|---|
| date | Tue, 17 Apr 2012 14:34:12 -0700 |
| parents | 18b62edd0ae7 (current diff) 7e82874bfab8 (diff) |
| children | c1847068ecf3 |
| files | .hgtags |
| diffstat | 7 files changed, 53 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Apr 12 15:48:51 2012 -0700 +++ b/.hgtags Tue Apr 17 14:34:12 2012 -0700 @@ -166,3 +166,8 @@ 21d4722185b95ab571c9e1e07d9ddd5e637cc2c9 jdk7u4-b18 212bad4649eff2fbdfcd397afcb0d1e3d566b41a jdk7u4-b19 1eae71787c3343d7f492c075f94d4010abdd4d5c jdk7u4-b20 +d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u6-b01 +f0b9ae49261df769c37d5afbf074458bd8e4f59c jdk7u6-b02 +b98436f0ff704739d2ada2a755a1b862370523c2 jdk7u6-b03 +559f6e91d3a33c3441a6ed1f81246553b7e59621 jdk7u6-b04 +4562d0be282463a88be5c65a5c1ea137cab1c376 jdk7u6-b05
--- a/make/Defs-internal.gmk Thu Apr 12 15:48:51 2012 -0700 +++ b/make/Defs-internal.gmk Tue Apr 17 14:34:12 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 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 @@ -348,3 +348,12 @@ COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)" endif +# When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES, +# then these can be set here: +#ifdef FULL_DEBUG_SYMBOLS +# COMMON_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +#endif +# +#ifdef ZIP_DEBUGINFO_FILES +# COMMON_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +#endif
--- a/make/hotspot-rules.gmk Thu Apr 12 15:48:51 2012 -0700 +++ b/make/hotspot-rules.gmk Tue Apr 17 14:34:12 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 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 @@ -71,6 +71,7 @@ ifeq ($(DEBUG_NAME), fastdebug) HOTSPOT_TARGET = all_fastdebug endif +BUILD_FLAVOR=$(HOTSPOT_TARGET:all_%=%) ifeq ($(ZERO_BUILD), true) ifeq ($(SHARK_BUILD), true) @@ -83,6 +84,7 @@ HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS) HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH) +HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR) # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=? # Or is there something wrong with hotspot/make/Makefile? @@ -93,6 +95,16 @@ HOTSPOT_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST) endif +# Move to COMMON_BUILD_ARGUMENTS when all repos support +# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES: +ifdef FULL_DEBUG_SYMBOLS + HOTSPOT_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +endif + +ifdef ZIP_DEBUGINFO_FILES + HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +endif + hotspot-build:: $(MKDIR) -p $(HOTSPOT_OUTPUTDIR) $(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
--- a/make/jdk-rules.gmk Thu Apr 12 15:48:51 2012 -0700 +++ b/make/jdk-rules.gmk Tue Apr 17 14:34:12 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 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 @@ -70,6 +70,16 @@ JDK_BUILD_ARGUMENTS += \ BUILD_HOTSPOT=$(BUILD_HOTSPOT) +# Move to COMMON_BUILD_ARGUMENTS when all repos support +# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES: +ifdef FULL_DEBUG_SYMBOLS + JDK_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +endif + +ifdef ZIP_DEBUGINFO_FILES + JDK_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +endif + $(JDK_JAVA_EXE):: jdk-build
--- a/make/jprt.gmk Thu Apr 12 15:48:51 2012 -0700 +++ b/make/jprt.gmk Tue Apr 17 14:34:12 2012 -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 @@ -36,21 +36,28 @@ JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip +ifeq ($(PLATFORM),windows) + ZIPFLAGS=-q +else + # store symbolic links as the link + ZIPFLAGS=-q -y +endif + jprt_build_product: sanity all_product_build ( $(CD) $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) && \ - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) ifdef HAVE_JPRT_SAVE_BUNDLES ( $(CD) $(OUTPUTDIR)/bundles && \ - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ) + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ) endif jprt_build_fastdebug: fastdebug_build ( $(CD) $(OUTPUTDIR)/$(REL_JDK_FASTDEBUG_IMAGE_DIR) && \ - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) jprt_build_debug: debug_build ( $(CD) $(OUTPUTDIR)/$(REL_JDK_DEBUG_IMAGE_DIR) && \ - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) ################################################################ # PHONY
--- a/make/jprt.properties Thu Apr 12 15:48:51 2012 -0700 +++ b/make/jprt.properties Tue Apr 17 14:34:12 2012 -0700 @@ -106,6 +106,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_sound}, \ ${jprt.my.test.target.set:TESTNAME=jdk_swing} # JCK test targets in test/Makefile (no windows)