diff options
author | ohair <none@none> | 2011-04-12 18:35:57 -0700 |
---|---|---|
committer | ohair <none@none> | 2011-04-12 18:35:57 -0700 |
commit | 7cd2f8605df4b0c66ddd7b478a27e7c3c7c2cefb (patch) | |
tree | 0ff1d9f3f27c76f8b35d3a25e59a1fca3f3a8de7 | |
parent | f9b05e051116bfcdbff6b0c0850dfbbad5c75f4f (diff) | |
parent | 9b50ba056dcb94a15b0410f8c16982548182453b (diff) |
Mergejdk7-b138
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | make/Defs-internal.gmk | 2 | ||||
-rw-r--r-- | make/corba-rules.gmk | 2 | ||||
-rw-r--r-- | make/deploy-rules.gmk | 2 | ||||
-rw-r--r-- | make/hotspot-rules.gmk | 2 | ||||
-rw-r--r-- | make/install-rules.gmk | 2 | ||||
-rw-r--r-- | make/jaxp-rules.gmk | 2 | ||||
-rw-r--r-- | make/jaxws-rules.gmk | 2 | ||||
-rw-r--r-- | make/jdk-rules.gmk | 2 | ||||
-rw-r--r-- | make/langtools-rules.gmk | 2 | ||||
-rw-r--r-- | make/scripts/update_copyright_year.sh | 26 | ||||
-rw-r--r-- | make/sponsors-rules.gmk | 2 | ||||
-rw-r--r-- | test/Makefile | 2 |
13 files changed, 30 insertions, 20 deletions
@@ -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 diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index c55675f..89ca1c1 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -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 diff --git a/make/corba-rules.gmk b/make/corba-rules.gmk index 13671ee..7bfedde 100644 --- a/make/corba-rules.gmk +++ b/make/corba-rules.gmk @@ -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 diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 003698c..fede83a 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -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 diff --git a/make/hotspot-rules.gmk b/make/hotspot-rules.gmk index 8bc6e75..437f05d 100644 --- a/make/hotspot-rules.gmk +++ b/make/hotspot-rules.gmk @@ -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 diff --git a/make/install-rules.gmk b/make/install-rules.gmk index 932985e..609cc2a 100644 --- a/make/install-rules.gmk +++ b/make/install-rules.gmk @@ -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 diff --git a/make/jaxp-rules.gmk b/make/jaxp-rules.gmk index 625b2ec..8f542fa 100644 --- a/make/jaxp-rules.gmk +++ b/make/jaxp-rules.gmk @@ -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 diff --git a/make/jaxws-rules.gmk b/make/jaxws-rules.gmk index 4956a98..59e33f3 100644 --- a/make/jaxws-rules.gmk +++ b/make/jaxws-rules.gmk @@ -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 diff --git a/make/jdk-rules.gmk b/make/jdk-rules.gmk index cfc56ed..35d7890 100644 --- a/make/jdk-rules.gmk +++ b/make/jdk-rules.gmk @@ -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 diff --git a/make/langtools-rules.gmk b/make/langtools-rules.gmk index a0b2649..ea96295 100644 --- a/make/langtools-rules.gmk +++ b/make/langtools-rules.gmk @@ -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 diff --git a/make/scripts/update_copyright_year.sh b/make/scripts/update_copyright_year.sh index cd8b0a0..a3df5d0 100644 --- a/make/scripts/update_copyright_year.sh +++ b/make/scripts/update_copyright_year.sh @@ -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 @@ if [ -s ${all_changesets} ] ; then 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 diff --git a/make/sponsors-rules.gmk b/make/sponsors-rules.gmk index 4fd60ea..a3813b5 100644 --- a/make/sponsors-rules.gmk +++ b/make/sponsors-rules.gmk @@ -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 diff --git a/test/Makefile b/test/Makefile index 95c6946..5ff5254 100644 --- a/test/Makefile +++ b/test/Makefile @@ -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 |