From 36fcb57832b032104112de1cab08fa08db57e145 Mon Sep 17 00:00:00 2001 From: Mick Jordan <mick.jordan@oracle.com> Date: Thu, 12 Mar 2015 11:19:00 -0700 Subject: [PATCH] copyright fixes --- com.oracle.truffle.r.native/Makefile | 1 - com.oracle.truffle.r.native/run/R.sh | 2 +- com.oracle.truffle.r.native/run/Rscript.sh | 2 +- mx.fastr/copyrights/gnu_r.copyright.hash.regex | 2 +- mx.fastr/copyrights/gnu_r.copyright.star.regex | 2 +- mx.fastr/copyrights/overrides | 2 ++ 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/com.oracle.truffle.r.native/Makefile b/com.oracle.truffle.r.native/Makefile index 68ffc952e2..46f3d0bcd5 100644 --- a/com.oracle.truffle.r.native/Makefile +++ b/com.oracle.truffle.r.native/Makefile @@ -36,4 +36,3 @@ clean: $(MAKE) -C fficall clean $(MAKE) -C library clean $(MAKE) -C run clean - \ No newline at end of file diff --git a/com.oracle.truffle.r.native/run/R.sh b/com.oracle.truffle.r.native/run/R.sh index 330eb49b3a..af88a96c74 100644 --- a/com.oracle.truffle.r.native/run/R.sh +++ b/com.oracle.truffle.r.native/run/R.sh @@ -3,7 +3,7 @@ # Version 2. You may review the terms of this license at # http://www.gnu.org/licenses/gpl-2.0.html # -# Copyright (c) 1995-2012, The R Core Team +# Copyright (c) 1995-2015, The R Core Team # Copyright (c) 2003, The R Foundation # Copyright (c) 2015, Oracle and/or its affiliates # diff --git a/com.oracle.truffle.r.native/run/Rscript.sh b/com.oracle.truffle.r.native/run/Rscript.sh index 75da099b81..22968bece2 100755 --- a/com.oracle.truffle.r.native/run/Rscript.sh +++ b/com.oracle.truffle.r.native/run/Rscript.sh @@ -3,7 +3,7 @@ # Version 2. You may review the terms of this license at # http://www.gnu.org/licenses/gpl-2.0.html # -# Copyright (c) 1995-2012, The R Core Team +# Copyright (c) 1995-2015, The R Core Team # Copyright (c) 2003, The R Foundation # Copyright (c) 2015, Oracle and/or its affiliates # diff --git a/mx.fastr/copyrights/gnu_r.copyright.hash.regex b/mx.fastr/copyrights/gnu_r.copyright.hash.regex index fd58863d63..01dde6bc9b 100644 --- a/mx.fastr/copyrights/gnu_r.copyright.hash.regex +++ b/mx.fastr/copyrights/gnu_r.copyright.hash.regex @@ -1 +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-2012, The R Core Team\n# Copyright \(c\) 2003, The R Foundation\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.* +#\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-201[0-9], The R Core Team\n# Copyright \(c\) 2003, The R Foundation\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/gnu_r.copyright.star.regex b/mx.fastr/copyrights/gnu_r.copyright.star.regex index e5813ab98a..799a90754e 100644 --- a/mx.fastr/copyrights/gnu_r.copyright.star.regex +++ b/mx.fastr/copyrights/gnu_r.copyright.star.regex @@ -1 +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-2012, The R Core Team\n \* Copyright \(c\) 2003, The R Foundation\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.* \ No newline at end of file +/\*\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-201[0-9], The R Core Team\n \* Copyright \(c\) 2003, The R Foundation\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.* \ No newline at end of file diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides index 9744420b42..84b4a8607c 100644 --- a/mx.fastr/copyrights/overrides +++ b/mx.fastr/copyrights/overrides @@ -44,6 +44,8 @@ com.oracle.truffle.r.native/library/tools/src/tools.h,no.copyright com.oracle.truffle.r.native/library/tools/src/init.c,no.copyright com.oracle.truffle.r.native/library/utils/src/utils.h,no.copyright com.oracle.truffle.r.native/library/utils/src/init.c,no.copyright +com.oracle.truffle.r.native/run/R.sh,gnu_r.copyright +com.oracle.truffle.r.native/run/Rscript.sh,gnu_r.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/BinaryOpsGroupDispatchNode.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/DispatchNode.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/DispatchedCallNode.java,purdue.copyright -- GitLab