Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Thu, 10 Oct 2013 08:49:10 -0700
- author
- lana
- date
- Thu, 10 Oct 2013 08:49:10 -0700
- changeset 843
- 4d23143c676a
- parent 817
- 6b8f5030e5ad
- parent 814
- d086227bfc45
- child 844
- fd3b32cc4b6e
Merge
1.1 --- a/.hgtags Fri Oct 04 15:26:37 2013 -0700 1.2 +++ b/.hgtags Thu Oct 10 08:49:10 2013 -0700 1.3 @@ -231,3 +231,4 @@ 1.4 0874bb4707b723d5bb108d379c557cf41529d1a7 jdk8-b107 1.5 9286a6e61291246d88af713f1ef79adeea30fe2e jdk8-b108 1.6 91f47e8da5c60de58ed195e9b57f3bf192a18f83 jdk8-b109 1.7 +4faa09c7fe555de086dd9048d3c5cc92317d6f45 jdk8-b110
2.1 --- a/NewMakefile.gmk Fri Oct 04 15:26:37 2013 -0700 2.2 +++ b/NewMakefile.gmk Thu Oct 10 08:49:10 2013 -0700 2.3 @@ -66,7 +66,7 @@ 2.4 else 2.5 # We are building multiple configurations. 2.6 # First, find out the valid targets 2.7 - # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find 2.8 + # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find 2.9 # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. 2.10 all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \ 2.11 $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
3.1 --- a/common/autoconf/generated-configure.sh Fri Oct 04 15:26:37 2013 -0700 3.2 +++ b/common/autoconf/generated-configure.sh Thu Oct 10 08:49:10 2013 -0700 3.3 @@ -1016,8 +1016,8 @@ 3.4 enable_unlimited_crypto 3.5 with_milestone 3.6 with_update_version 3.7 +with_user_release_suffix 3.8 with_build_number 3.9 -with_user_release_suffix 3.10 with_boot_jdk 3.11 with_boot_jdk_jvmargs 3.12 with_add_source_root 3.13 @@ -1755,10 +1755,10 @@ 3.14 --with-cacerts-file specify alternative cacerts file 3.15 --with-milestone Set milestone value for build [internal] 3.16 --with-update-version Set update version value for build [b00] 3.17 - --with-build-number Set build number value for build [b00] 3.18 --with-user-release-suffix 3.19 Add a custom string to the version string if build 3.20 number isn't set.[username_builddateb00] 3.21 + --with-build-number Set build number value for build [b00] 3.22 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] 3.23 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all 3.24 invocations of the Boot JDK, overriding the default 3.25 @@ -3818,7 +3818,7 @@ 3.26 #CUSTOM_AUTOCONF_INCLUDE 3.27 3.28 # Do not change or remove the following line, it is needed for consistency checks: 3.29 -DATE_WHEN_GENERATED=1379504921 3.30 +DATE_WHEN_GENERATED=1381162713 3.31 3.32 ############################################################################### 3.33 # 3.34 @@ -10935,7 +10935,7 @@ 3.35 3.36 if test "x$SUPPORT_HEADFUL" = xyes; then 3.37 # We are building both headful and headless. 3.38 - headful_msg="inlude support for both headful and headless" 3.39 + headful_msg="include support for both headful and headless" 3.40 fi 3.41 3.42 if test "x$SUPPORT_HEADFUL" = xno; then 3.43 @@ -11048,6 +11048,18 @@ 3.44 fi 3.45 3.46 3.47 +# Check whether --with-user-release-suffix was given. 3.48 +if test "${with_user_release_suffix+set}" = set; then : 3.49 + withval=$with_user_release_suffix; 3.50 +fi 3.51 + 3.52 +if test "x$with_user_release_suffix" = xyes; then 3.53 + as_fn_error $? "Release suffix must have a value" "$LINENO" 5 3.54 +elif test "x$with_user_release_suffix" != x; then 3.55 + USER_RELEASE_SUFFIX="$with_user_release_suffix" 3.56 +fi 3.57 + 3.58 + 3.59 # Check whether --with-build-number was given. 3.60 if test "${with_build_number+set}" = set; then : 3.61 withval=$with_build_number; 3.62 @@ -11058,27 +11070,16 @@ 3.63 elif test "x$with_build_number" != x; then 3.64 JDK_BUILD_NUMBER="$with_build_number" 3.65 fi 3.66 +# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set 3.67 if test "x$JDK_BUILD_NUMBER" = x; then 3.68 JDK_BUILD_NUMBER=b00 3.69 -fi 3.70 - 3.71 - 3.72 -# Check whether --with-user-release-suffix was given. 3.73 -if test "${with_user_release_suffix+set}" = set; then : 3.74 - withval=$with_user_release_suffix; 3.75 -fi 3.76 - 3.77 -if test "x$with_user_release_suffix" = xyes; then 3.78 - as_fn_error $? "Release suffix must have a value" "$LINENO" 5 3.79 -elif test "x$with_user_release_suffix" != x; then 3.80 - USER_RELEASE_SUFFIX="$with_user_release_suffix" 3.81 -else 3.82 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 3.83 - # Avoid [:alnum:] since it depends on the locale. 3.84 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` 3.85 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.86 -fi 3.87 - 3.88 + if test "x$USER_RELEASE_SUFFIX" = x; then 3.89 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 3.90 + # Avoid [:alnum:] since it depends on the locale. 3.91 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` 3.92 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.93 + fi 3.94 +fi 3.95 3.96 # Now set the JDK version, milestone, build number etc. 3.97 3.98 @@ -11095,6 +11096,7 @@ 3.99 3.100 3.101 3.102 + 3.103 COPYRIGHT_YEAR=`date +'%Y'` 3.104 3.105
4.1 --- a/common/autoconf/jdk-options.m4 Fri Oct 04 15:26:37 2013 -0700 4.2 +++ b/common/autoconf/jdk-options.m4 Thu Oct 10 08:49:10 2013 -0700 4.3 @@ -316,7 +316,7 @@ 4.4 4.5 if test "x$SUPPORT_HEADFUL" = xyes; then 4.6 # We are building both headful and headless. 4.7 - headful_msg="inlude support for both headful and headless" 4.8 + headful_msg="include support for both headful and headless" 4.9 fi 4.10 4.11 if test "x$SUPPORT_HEADFUL" = xno; then 4.12 @@ -426,6 +426,14 @@ 4.13 JDK_UPDATE_VERSION="$with_update_version" 4.14 fi 4.15 4.16 +AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], 4.17 + [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])]) 4.18 +if test "x$with_user_release_suffix" = xyes; then 4.19 + AC_MSG_ERROR([Release suffix must have a value]) 4.20 +elif test "x$with_user_release_suffix" != x; then 4.21 + USER_RELEASE_SUFFIX="$with_user_release_suffix" 4.22 +fi 4.23 + 4.24 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 4.25 [Set build number value for build @<:@b00@:>@])]) 4.26 if test "x$with_build_number" = xyes; then 4.27 @@ -433,25 +441,19 @@ 4.28 elif test "x$with_build_number" != x; then 4.29 JDK_BUILD_NUMBER="$with_build_number" 4.30 fi 4.31 +# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set 4.32 if test "x$JDK_BUILD_NUMBER" = x; then 4.33 JDK_BUILD_NUMBER=b00 4.34 + if test "x$USER_RELEASE_SUFFIX" = x; then 4.35 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 4.36 + # Avoid [:alnum:] since it depends on the locale. 4.37 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` 4.38 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 4.39 + fi 4.40 fi 4.41 4.42 -AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], 4.43 - [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])]) 4.44 -if test "x$with_user_release_suffix" = xyes; then 4.45 - AC_MSG_ERROR([Release suffix must have a value]) 4.46 -elif test "x$with_user_release_suffix" != x; then 4.47 - USER_RELEASE_SUFFIX="$with_user_release_suffix" 4.48 -else 4.49 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 4.50 - # Avoid [:alnum:] since it depends on the locale. 4.51 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` 4.52 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 4.53 -fi 4.54 +# Now set the JDK version, milestone, build number etc. 4.55 AC_SUBST(USER_RELEASE_SUFFIX) 4.56 - 4.57 -# Now set the JDK version, milestone, build number etc. 4.58 AC_SUBST(JDK_MAJOR_VERSION) 4.59 AC_SUBST(JDK_MINOR_VERSION) 4.60 AC_SUBST(JDK_MICRO_VERSION)
5.1 --- a/common/autoconf/spec.gmk.in Fri Oct 04 15:26:37 2013 -0700 5.2 +++ b/common/autoconf/spec.gmk.in Thu Oct 10 08:49:10 2013 -0700 5.3 @@ -161,6 +161,7 @@ 5.4 COMPANY_NAME:=@COMPANY_NAME@ 5.5 MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ 5.6 MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ 5.7 +USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ 5.8 5.9 # Different version strings generated from the above information. 5.10 JDK_VERSION:=@JDK_VERSION@ 5.11 @@ -173,8 +174,8 @@ 5.12 else 5.13 RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE) 5.14 endif 5.15 -ifeq ($(JDK_BUILD_NUMBER),b00) 5.16 - USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ 5.17 + 5.18 +ifneq ($(USER_RELEASE_SUFFIX),) 5.19 FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER) 5.20 else 5.21 FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER)
6.1 --- a/common/bin/compare.sh Fri Oct 04 15:26:37 2013 -0700 6.2 +++ b/common/bin/compare.sh Thu Oct 10 08:49:10 2013 -0700 6.3 @@ -76,13 +76,13 @@ 6.4 TMP=1 6.5 6.6 if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then 6.7 - TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \ 6.8 + TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ 6.9 $GREP '^[<>]' | \ 6.10 $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \ 6.11 -e '/[<>] Created-By: .* (Oracle Corporation).*/d') 6.12 fi 6.13 if test "x$SUFFIX" = "xjava"; then 6.14 - TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \ 6.15 + TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ 6.16 $GREP '^[<>]' | \ 6.17 $SED -e '/[<>] \* from.*\.idl/d' \ 6.18 -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ 6.19 @@ -121,8 +121,8 @@ 6.20 # | $SED -e '/^#/d' -e '/^$/d' \ 6.21 # -e :a -e '/\\$/N; s/\\\n//; ta' \ 6.22 # -e 's/^[ \t]*//;s/[ \t]*$//' \ 6.23 -# -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned 6.24 - TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE) 6.25 +# -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned 6.26 + TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE) 6.27 fi 6.28 if test -n "$TMP"; then 6.29 echo Files $OTHER_FILE and $THIS_FILE differ 6.30 @@ -410,11 +410,11 @@ 6.31 CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff 6.32 # On solaris, there is no -q option. 6.33 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 6.34 - LANG=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \ 6.35 + LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \ 6.36 | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \ 6.37 > $CONTENTS_DIFF_FILE 6.38 else 6.39 - LANG=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE 6.40 + LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE 6.41 fi 6.42 6.43 ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE) 6.44 @@ -459,11 +459,11 @@ 6.45 if [ -n "$SHOW_DIFFS" ]; then 6.46 for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do 6.47 if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then 6.48 - LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap 6.49 + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap 6.50 elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then 6.51 - LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i 6.52 + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i 6.53 else 6.54 - LANG=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i 6.55 + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i 6.56 fi 6.57 done 6.58 fi 6.59 @@ -703,7 +703,7 @@ 6.60 $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this 6.61 fi 6.62 6.63 - LANG=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff 6.64 + LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff 6.65 if [ -s $WORK_FILE_BASE.symbols.diff ]; then 6.66 SYM_MSG=" diff " 6.67 if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then 6.68 @@ -732,8 +732,8 @@ 6.69 (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME 2</dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq) 6.70 (cd $FILE_WORK_DIR && $RM -f $NAME) 6.71 6.72 - LANG=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff 6.73 - LANG=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq 6.74 + LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff 6.75 + LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq 6.76 6.77 if [ -s $WORK_FILE_BASE.deps.diff ]; then 6.78 if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then 6.79 @@ -768,7 +768,7 @@ 6.80 if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then 6.81 $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1 6.82 $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1 6.83 - LANG=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff 6.84 + LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff 6.85 6.86 if [ -s $WORK_FILE_BASE.fulldump.diff ]; then 6.87 ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}') 6.88 @@ -802,7 +802,7 @@ 6.89 $DIS_CMD $OTHER_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.other 2>&1 6.90 $DIS_CMD $THIS_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.this 2>&1 6.91 6.92 - LANG=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff 6.93 + LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff 6.94 6.95 if [ -s $WORK_FILE_BASE.dis.diff ]; then 6.96 DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
7.1 --- a/common/makefiles/JavaCompilation.gmk Fri Oct 04 15:26:37 2013 -0700 7.2 +++ b/common/makefiles/JavaCompilation.gmk Thu Oct 10 08:49:10 2013 -0700 7.3 @@ -159,7 +159,7 @@ 7.4 endif 7.5 endif 7.6 7.7 - # Utility macros, to make the shell script receipt somewhat easier to dechipher. 7.8 + # Utility macros, to make the shell script receipt somewhat easier to decipher. 7.9 7.10 # The capture contents macro finds all files (matching the patterns, typically 7.11 # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar. 7.12 @@ -520,7 +520,7 @@ 7.13 # Using plain javac to batch compile everything. 7.14 $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.batch 7.15 7.16 - # When buliding in batch, put headers in a temp dir to filter out those that actually 7.17 + # When building in batch, put headers in a temp dir to filter out those that actually 7.18 # changed before copying them to the real header dir. 7.19 ifneq (,$$($1_HEADERS)) 7.20 $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
8.1 --- a/common/makefiles/Jprt.gmk Fri Oct 04 15:26:37 2013 -0700 8.2 +++ b/common/makefiles/Jprt.gmk Thu Oct 10 08:49:10 2013 -0700 8.3 @@ -1,5 +1,5 @@ 8.4 # 8.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 8.6 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 8.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.8 # 8.9 # This code is free software; you can redistribute it and/or modify it 8.10 @@ -200,13 +200,8 @@ 8.11 $(RM) $@ 8.12 $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@ 8.13 8.14 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 8.15 - SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR) 8.16 - SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR) 8.17 -else 8.18 - SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) 8.19 - SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) 8.20 -endif 8.21 +SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) 8.22 +SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) 8.23 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) 8.24 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) 8.25 8.26 @@ -215,10 +210,10 @@ 8.27 bundles-only: start-make 8.28 @$(call TargetEnter) 8.29 $(MKDIR) -p $(BUILD_OUTPUT)/bundles 8.30 - $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . 8.31 - $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . 8.32 + $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . 8.33 + $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . 8.34 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ 8.35 - $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ 8.36 + $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ 8.37 fi 8.38 @$(call TargetExit) 8.39
9.1 --- a/common/makefiles/Main.gmk Fri Oct 04 15:26:37 2013 -0700 9.2 +++ b/common/makefiles/Main.gmk Thu Oct 10 08:49:10 2013 -0700 9.3 @@ -1,5 +1,5 @@ 9.4 # 9.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 9.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 9.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.8 # 9.9 # This code is free software; you can redistribute it and/or modify it 9.10 @@ -68,10 +68,6 @@ 9.11 all: images docs 9.12 @$(call CheckIfMakeAtEnd) 9.13 9.14 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 9.15 - all: overlay-images 9.16 -endif 9.17 - 9.18 # Setup a rule for SPEC file that fails if executed. This check makes sure the configuration 9.19 # is up to date after changes to configure 9.20 $(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
10.1 --- a/make/scripts/webrev.ksh Fri Oct 04 15:26:37 2013 -0700 10.2 +++ b/make/scripts/webrev.ksh Thu Oct 10 08:49:10 2013 -0700 10.3 @@ -2704,11 +2704,11 @@ 10.4 rm -f $WDIR/$DIR/$F.html 10.5 10.6 its_a_jar= 10.7 - if expr $F : '.*\.jar' >/dev/null; then 10.8 + if expr $F : '.*\.jar' \| $F : '.*\.zip' >/dev/null; then 10.9 its_a_jar=1 10.10 - # It's a JAR file, let's do it differntly 10.11 + # It's a JAR or ZIP file, let's do it differently 10.12 if [[ -z $JAR ]]; then 10.13 - print "No access to jar, so can't produce diffs for jar files" 10.14 + print "No access to jar, so can't produce diffs for jar or zip files" 10.15 else 10.16 if [ -f $ofile ]; then 10.17 $JAR -tvf $ofile >"$ofile".lst
