[Truffle] Update and fix copyrights.

jruby · Jun 28, 2015 · d9ab72f · d9ab72f
1 parent d3e567e
commit d9ab72f
Showing 15 changed files with 58 additions and 13 deletions.
diff --git a/tool/update_truffle_copyright.rb b/tool/update_truffle_copyright.rb
@@ -11,7 +11,8 @@
 COPYRIGHT = /Copyright \(c\) (?<year1>\d{4})(?:, (?<year2>\d{4}))? Oracle\b/
 
 OTHER_COPYRIGHTS = [
-  /Copyright \(c\) \d{4}(?:-\d{4})?, Evan Phoenix/
+  /Copyright \(c\) \d{4} Software Architecture Group, Hasso Plattner Institute/,
+  /Copyright \(c\) \d{4}(?:-\d{4})?,? Evan Phoenix/
 ]
 
 EXTENSIONS = %w[.java .rb]

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyb (c) 2013, 2015 Oracle and/or its affiliates. All bs reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedForeignDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedForeignDispatchNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedForeignGlobalDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedForeignGlobalDispatchNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/instrument/RubyDefaultASTProber.java b/truffle/src/main/java/org/jruby/truffle/nodes/instrument/RubyDefaultASTProber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/interop/IndexLabelToRubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/interop/IndexLabelToRubyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/interop/InteropNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/interop/InteropNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/interop/RubyToIndexLabelNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/interop/RubyToIndexLabelNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/interop/TargetableRubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/interop/TargetableRubyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/ArrayForeignAccessFactory.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/ArrayForeignAccessFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/BasicForeignAccessFactory.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/BasicForeignAccessFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/HashForeignAccessFactory.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/HashForeignAccessFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/StringForeignAccessFactory.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/StringForeignAccessFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/TrufflePOSIXHandler.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/TrufflePOSIXHandler.java
@@ -1,3 +1,12 @@
+/*
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
 package org.jruby.truffle.runtime.subsystems;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;

diff --git a/truffle/src/main/ruby/core/rubinius/api/shims/encoding.rb b/truffle/src/main/ruby/core/rubinius/api/shims/encoding.rb
@@ -1,3 +1,38 @@
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Rubinius nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modifications are subject to:
+# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
 class Encoding
   # There's a fun bootstrapping issue here.  Encoding::Converter.transcoding_map needs access to the Encoding::Transcoding
   # class. However, this shim runs before Encoding::Transcoding is defined.  Since the class body is short, we reproduce