Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 17:40:07 +0200
changeset 8935 f0b42e9d449e
parent 8934 dff699fcdf23 (current diff)
parent 8918 b4b1b3e184ee (diff)
child 9051 148604881f57
Merge
--- a/.hgtags-top-repo	Fri Apr 08 16:18:48 2011 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 17:40:07 2017 +0200
@@ -111,3 +111,4 @@
 ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135
 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136
+7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
--- a/Makefile	Fri Apr 08 16:18:48 2011 -0700
+++ b/Makefile	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2011, 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
--- a/make/Defs-internal.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/Defs-internal.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2011, 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
--- a/make/corba-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/corba-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
--- a/make/deploy-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/deploy-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2011, 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
--- a/make/hotspot-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/hotspot-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
--- a/make/install-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/install-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2011, 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
--- a/make/jaxp-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/jaxp-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
--- a/make/jaxws-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/jaxws-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
--- a/make/jdk-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/jdk-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
--- a/make/jprt.properties	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/jprt.properties	Wed Jul 05 17:40:07 2017 +0200
@@ -323,6 +323,21 @@
     ${jprt.my.windows.i586}-product-c1-jdk_tools2, 		\
     windows_x64_5.2-product-c2-jdk_tools2
 
+# JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
+jprt.my.jck.test.target.set=					\
+    solaris_sparc_5.10-product-c1-JCK7TESTRULE, 		\
+    solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, 		\
+    solaris_i586_5.10-product-c1-JCK7TESTRULE, 			\
+    solaris_x64_5.10-product-c2-JCK7TESTRULE, 			\
+    linux_i586_2.6-product-c1-JCK7TESTRULE, 			\
+    linux_x64_2.6-product-c2-JCK7TESTRULE
+
+# JCK testset targets (e.g. jprt submit -testset jck ... )
+jprt.make.rule.jck.test.targets=				\
+    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools},   \
+    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime},    \
+    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler}
+
 # 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} 
@@ -333,4 +348,3 @@
 # Directories to be excluded from the source bundles
 jprt.bundle.exclude.src.dirs=build dist webrev
 
-
--- a/make/langtools-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/langtools-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, 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
--- a/make/scripts/update_copyright_year.sh	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/scripts/update_copyright_year.sh	Wed Jul 05 17:40:07 2017 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
@@ -152,14 +152,24 @@
     echo "------------------------------------------------"
     hg log --rev ${changeset} --template '{desc}\n' > ${desc}
     printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
-    if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
-      printf "  EXCLUDED tag changeset.\n"
-    elif cat ${desc} | fgrep -i rebrand > /dev/null ; then
-      printf "  EXCLUDED rebrand changeset.\n"
-    elif cat ${desc} | fgrep -i copyright > /dev/null ; then
-      printf "  EXCLUDED copyright changeset.\n"
+    if [ "${year}" = "2010" ] ; then
+      if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
+        printf "  EXCLUDED tag changeset.\n"
+      elif cat ${desc} | fgrep -i rebrand > /dev/null ; then
+        printf "  EXCLUDED rebrand changeset.\n"
+      elif cat ${desc} | fgrep -i copyright > /dev/null ; then
+        printf "  EXCLUDED copyright changeset.\n"
+      else
+        updateChangesetFiles ${changeset}
+      fi
     else
-      updateChangesetFiles ${changeset}
+      if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
+        printf "  EXCLUDED tag changeset.\n"
+      elif cat ${desc} | fgrep -i "copyright year" > /dev/null ; then
+        printf "  EXCLUDED copyright year changeset.\n"
+      else
+        updateChangesetFiles ${changeset}
+      fi
     fi
     rm -f ${desc}
   done
--- a/make/sponsors-rules.gmk	Fri Apr 08 16:18:48 2011 -0700
+++ b/make/sponsors-rules.gmk	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, 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
--- a/test/Makefile	Fri Apr 08 16:18:48 2011 -0700
+++ b/test/Makefile	Wed Jul 05 17:40:07 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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
@@ -73,13 +73,16 @@
 	jdk_rmi \
 	jdk_swing
 
+# These are the current jck test targets in the jdk repository
+JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
+
 # Default test target (everything)
 all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
 
 # Test targets
 $(LANGTOOLS_TEST_LIST):
 	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
-$(JDK_TEST_LIST) $(JDK_TEST_LIST2):
+$(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST):
 	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
 
 clean:
@@ -87,7 +90,9 @@
 ################################################################
 
 # Phony targets (e.g. these are not filenames)
-.PHONY: all clean $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
+.PHONY: all clean \
+        $(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST) \
+        $(LANGTOOLS_TEST_LIST)
 
 ################################################################
jdk-sandbox