Mercurial > hg > release > icedtea7-forest-2.5
changeset 368:fc47c97bbbd9 jdk7-b138
Merge
author | ohair |
---|---|
date | Tue, 12 Apr 2011 18:35:57 -0700 |
parents | 574b71659cb1 (current diff) 7e13dbf7e8af (diff) |
children | 7ed6d0b9aaa1 |
files | test/Makefile |
diffstat | 13 files changed, 30 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Apr 10 10:17:36 2011 -0700 +++ b/Makefile Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/Defs-internal.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/corba-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/deploy-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/hotspot-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/install-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/jaxp-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/jaxws-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/jdk-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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/langtools-rules.gmk Sun Apr 10 10:17:36 2011 -0700 +++ b/make/langtools-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/scripts/update_copyright_year.sh Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/make/sponsors-rules.gmk Tue Apr 12 18:35:57 2011 -0700 @@ -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 Sun Apr 10 10:17:36 2011 -0700 +++ b/test/Makefile Tue Apr 12 18:35:57 2011 -0700 @@ -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