From ed7879c04054319cd4fd642610d3f62965c8f5bd Mon Sep 17 00:00:00 2001 From: Michael Haupt <michael.haupt@oracle.com> Date: Wed, 18 Jun 2014 08:50:41 +0200 Subject: [PATCH] copyright fixes --- .../oracle/truffle/r/nodes/builtin/base/Sample.java | 8 ++++---- mx.fastr/copyrights/gnu_r_sample.copyright.star | 13 +++++++++++++ .../copyrights/gnu_r_sample.copyright.star.regex | 1 + mx.fastr/copyrights/overrides | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 mx.fastr/copyrights/gnu_r_sample.copyright.star create mode 100644 mx.fastr/copyrights/gnu_r_sample.copyright.star.regex diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Sample.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Sample.java index 08222239e0..9c61a2fb47 100644 --- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Sample.java +++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Sample.java @@ -4,10 +4,10 @@ * http://www.gnu.org/licenses/gpl-2.0.html * * Copyright (c) 1995, 1996, Robert Gentleman and Ross Ihaka - * Copyright (c) 1997--2012, The R Core Team - * Copyright (c) 2003--2008, The R Foundation - * Copyright (c) 2012-2013, Purdue University - * Copyright (c) 2013, 2014, Oracle and/or its affiliates + * Copyright (c) 1997-2012, The R Core Team + * Copyright (c) 2003-2008, The R Foundation + * Copyright (c) 2014, Purdue University + * Copyright (c) 2014, Oracle and/or its affiliates * * All rights reserved. */ diff --git a/mx.fastr/copyrights/gnu_r_sample.copyright.star b/mx.fastr/copyrights/gnu_r_sample.copyright.star new file mode 100644 index 0000000000..0651f93088 --- /dev/null +++ b/mx.fastr/copyrights/gnu_r_sample.copyright.star @@ -0,0 +1,13 @@ +/* + * This material is distributed under the GNU General Public License + * Version 2. You may review the terms of this license at + * http://www.gnu.org/licenses/gpl-2.0.html + * + * Copyright (c) 1995, 1996, Robert Gentleman and Ross Ihaka + * Copyright (c) 1997-2012, The R Core Team + * Copyright (c) 2003-2008, The R Foundation + * Copyright (c) 2012-2014, Purdue University + * Copyright (c) 2013, 2014, Oracle and/or its affiliates + * + * All rights reserved. + */ diff --git a/mx.fastr/copyrights/gnu_r_sample.copyright.star.regex b/mx.fastr/copyrights/gnu_r_sample.copyright.star.regex new file mode 100644 index 0000000000..38b61038f1 --- /dev/null +++ b/mx.fastr/copyrights/gnu_r_sample.copyright.star.regex @@ -0,0 +1 @@ +/\*\n \* This material is distributed under the GNU General Public License\n \* Version 2. You may review the terms of this license at\n \* http://www.gnu.org/licenses/gpl-2.0.html\n \*\n \* Copyright \(c\) 1995, 1996, Robert Gentleman and Ross Ihaka\n \* Copyright \(c\) 1997-2012, The R Core Team\n \* Copyright \(c\) 2003-2008, The R Foundation\n \* Copyright \(c\) (?:(20[0-9][0-9]), )?(20[0-9][0-9]), Purdue University\n \* Copyright \(c\) (?:(20[0-9][0-9]), )?(20[0-9][0-9]), Oracle and/or its affiliates\n \*\n \* All rights reserved.\n \*/\n.* diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides index 4233cd65d4..fd7a025fd2 100644 --- a/mx.fastr/copyrights/overrides +++ b/mx.fastr/copyrights/overrides @@ -17,7 +17,7 @@ com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Prod.java com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/RepeatLength.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/S3DispatchNode.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/S3MethodDispatch.java,purdue.copyright -com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Sample.java,purdue.copyright +com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Sample.java,gnu_r_sample.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/UnClass.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/UpdateClass.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/UpdateLevels.java,purdue.copyright -- GitLab