Merge branch 'master' into inline

jruby · Jan 17, 2017 · 13a9aac · 13a9aac
2 parents df34344 + e87bfca
commit 13a9aac
Show file tree

Hide file tree

Showing 3,088 changed files with 461 additions and 451,866 deletions.
diff --git a/.gitignore b/.gitignore
@@ -83,16 +83,13 @@ test/pom.xml
 test/prawn
 test/rails
 test/testapp/testapp
-test/truffle/*.methods
-test/truffle/integration/gem-testing
 tool/nailgun/Makefile
 tool/nailgun/config.log
 tool/nailgun/config.status
 tool/nailgun/ng
 reference.txt
 rubyspec_temp
 .polyglot.pom.rb
-test/truffle/cexts/**/Makefile
 
 # binaries
 !bin/gem
@@ -134,10 +131,5 @@ build.eclipse
 /RUBY.dist
 /RUBY-TEST.dist
 
-# Truffle findbugs
-truffle-findbugs-report.html
-findbugs-noUpdateChecks-3.0.0.tar.gz
-findbugs-3.0.0
-
 # Vagrant
 .vagrant
diff --git a/.travis.yml b/.travis.yml
@@ -75,9 +75,6 @@ matrix:
       jdk: oraclejdk8
     - env: COMMAND=test/check_versions.sh
       jdk: oraclejdk8
-    # JRuby+Truffle needs Java 8
-    - env: JT='test fast'
-      jdk: oraclejdk8
   allow_failures:
     - env: PHASE='-Pj2ee'
       jdk: oraclejdk7

diff --git a/BUILDING.md b/BUILDING.md
@@ -26,7 +26,6 @@ command to execute is:
 This will run the default "install" goal (```mvn install```) and will do all of the following:
 
 * Compile JRuby
-* Compile JRuby-Truffle and place it in `lib/jruby-truffle.jar`
 * Build `lib/jruby.jar`, needed for running at command line
 * It will install the default gems specifications `lib/ruby/gems/shared/specifications/default/` and the ruby files of those gems in `lib/ruby/stdlib/`.
 
@@ -98,7 +97,6 @@ jar files by
 
 ```
 mvn -pl core
-mvn -pl truffle
 ```
 
 ### Day to Day Testing

diff --git a/COPYING b/COPYING
@@ -12,36 +12,6 @@ bytelist (http://github.com/jruby/bytelist),
 yydebug (http://svn.codehaus.org/jruby/trunk/jay/yydebug)
 are released under the same copyright/license.
 
-The Truffle component is copyright (c) 2013-2017 Oracle and/or its
-affiliates and is released under the same licenses.
-
-The Truffle component also distributes:
-
-  SnakeYAML (Copyright the SnakeYAML authors, Apache 2.0 licence)
-
-  truffle-api and truffle-debug (Copyright Oracle and/or its affiliates, GPL
-  v2, with classpath exception)
-
-  Parts of the core library implementation in truffle/src/main/ruby/core
-  are copyright (c) 2011, Evan Phoenix, and released under the 3-clause BSD
-  license.
-
-  Parts of the core library implementation in truffle/src/main/ruby/core 
-  are copyright (c) 2007-2015, Evan Phoenix and contributors, and released under
-  the 3-clause BSD license.
-
-  Some parts of the Truffle Java code is derived from Rubinius C++ code which is
-  copyright (c) 2007-2015, Evan Phoenix and contributors, and released under the
-  3-clause BSD license.
-
-  Some parts of the RubySL implementations of the stdlib in
-  lib/ruby/truffle/rubysl are copyright (c) 2013 Brian Shirai and are licensed
-  under the 3-clause BSD license.
-
-  pr-zlib is copyright Park Heesob and Daniel Berger. "This library is covered
-  under the same license as zlib itself. For the text of the zlib license,
-  please see http://zlib.net/zlib_license.html."
-
 Some additional libraries distributed with JRuby are not covered by
 JRuby's licence. Most of these libraries and their licenses are listed 
 below. Also see LICENSE.RUBY for most files found in lib/ruby/stdlib.

diff --git a/bench/truffle/metrics/mandelbrot.rb b/bench/truffle/metrics/mandelbrot.rb
diff --git a/bin/jruby-truffle b/bin/jruby-truffle
diff --git a/bin/jruby-truffle-tool b/bin/jruby-truffle-tool
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -157,9 +157,6 @@ else
         if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
           continue
         fi
-        if [ "$j" == "$JRUBY_HOME"/lib/jruby-truffle.jar ]; then
-          continue
-        fi
         if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
           continue
         fi
@@ -188,7 +185,6 @@ declare -a ruby_args
 mode=""
 
 JAVA_CLASS_JRUBY_MAIN=org.jruby.Main
-JAVA_CLASS_JRUBY_TRUFFLE_MAIN=org.jruby.truffle.Main
 java_class=$JAVA_CLASS_JRUBY_MAIN
 JAVA_CLASS_NGSERVER=org.jruby.main.NailServerMain
 
@@ -245,12 +241,6 @@ do
      # Pass -X... and -X? search options through
      -X*\.\.\.|-X*\?)
         ruby_args=("${ruby_args[@]}" "$1") ;;
-     -Xclassic)
-        unset USING_TRUFFLE
-        ;;
-     -X+T)
-        USING_TRUFFLE="true"
-        ;;
      # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
      -X*)
         val=${1:2}
@@ -320,12 +310,6 @@ do
     shift
 done
 
-if [[ "$USING_TRUFFLE" != "" ]]; then
-   JRUBY_CP="$JRUBY_HOME/lib/jruby-truffle.jar"
-   java_class=$JAVA_CLASS_JRUBY_TRUFFLE_MAIN
-   ruby_args=("-X+T" "${ruby_args[@]}")
-fi
-
 # Force file.encoding to UTF-8 when on Mac, since Apple JDK defaults to MacRoman (JRUBY-3576)
 if [[ $darwin && -z "$JAVA_ENCODING" ]]; then
   java_args=("${java_args[@]}" "-Dfile.encoding=UTF-8")
@@ -368,7 +352,7 @@ if [ "$nailgun_client" != "" ]; then
     exit 1
   fi
 else
-if [[ "$NO_BOOTCLASSPATH" != "" || ("$VERIFY_JRUBY" != "" && -z "$USING_TRUFFLE") ]]; then
+if [[ "$NO_BOOTCLASSPATH" != "" || "$VERIFY_JRUBY" != "" ]]; then
   if [ "$PROFILE_ARGS" != "" ]; then
       echo "Running with instrumented profiler"
   fi

diff --git a/bin/jruby.sh b/bin/jruby.sh
@@ -118,9 +118,6 @@ else
         if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
           continue
         fi
-        if [ "$j" == "$JRUBY_HOME"/lib/jruby-truffle.jar ]; then
-          continue
-        fi
         if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
           continue
         fi

diff --git a/ci.hocon b/ci.hocon