[Truffle] Notes on where exactly where the Rubinius code is from and …

…where it is modified.
jruby · Dec 14, 2014 · f26490b · f26490b
1 parent 8146e06
commit f26490b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/README.md b/core/src/main/ruby/jruby/truffle/core/rubinius/README.md
@@ -0,0 +1,22 @@
+`kernel` contains the Ruby component of the Rubinius kernel (core library)
+implementation, in some cases modified. We have taken files from version 2.4.1
+of Rubinius. This code was written by Evan Phoenix, Brian Shirai, et al.
+
+https://github.com/rubinius/rubinius
+
+`api` contains code from `rubinius-core-api`, the Rubinius API implementation
+written in Ruby, in some cases modified. We have taken files from commit
+8d01207061518355da9b53274fe8766ecf85fdfe. This code was written by Evan Phoenix,
+Charles Nutter, et al.
+
+Some of the code from `rubinius-core-api` is also found at
+`core/src/main/java/org/jruby/truffle/runtime/rubinius`, and again may be
+modified.
+
+https://github.com/rubinius/rubinius-core-api
+
+We try not to modify files, so that they can easily be merged from upstream in
+the future, but we have found it easier to modify inline in a few cases, rather
+than somehow patch things from within JRuby+Truffle.
+
+We have also directly attached copyright and license information to each file.
diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/api/bootstrap/channel.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/api/bootstrap/channel.rb
@@ -3,7 +3,7 @@
 #
 # 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

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/bytearray.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/bytearray.rb
@@ -3,7 +3,7 @@
 #
 # 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

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/channel.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/channel.rb
@@ -3,7 +3,7 @@
 #
 # 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

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/thread.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/thread.rb
@@ -3,7 +3,7 @@
 #
 # 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

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/tuple.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/tuple.rb
@@ -3,7 +3,7 @@
 #
 # 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

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/type.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/api/common/type.rb
@@ -3,7 +3,7 @@
 #
 # 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