Skip to content

Commit

Permalink
Showing 3,701 changed files with 6,368 additions and 462,490 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ env:
- PHASE='-Prake -Dtask=test:jruby'
- PHASE='-Prake -Dtask=test:jruby:fullint'
- PHASE='-Prake -Dtask=test:jruby:jit'
- PHASE='-Prake -Dtask=test:jruby:aot'
- PHASE='-Prake -Dtask=test:mri'
- PHASE='-Prake -Dtask=test:mri:fullint'
- PHASE='-Prake -Dtask=test:mri:jit'
@@ -74,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
2 changes: 0 additions & 2 deletions BUILDING.md
Original file line number Diff line number Diff line change
@@ -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
32 changes: 1 addition & 31 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
JRuby is Copyright (c) 2007-2016 The JRuby project, and is released
JRuby is Copyright (c) 2007-2017 The JRuby project, and is released
under a tri EPL/GPL/LGPL license. You can use it, redistribute it
and/or modify it under the terms of the:

@@ -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-2016 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.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.1.7.0-SNAPSHOT
9.1.9.0-SNAPSHOT
110 changes: 0 additions & 110 deletions bench/truffle/metrics/mandelbrot.rb

This file was deleted.

6 changes: 0 additions & 6 deletions bin/jruby-truffle

This file was deleted.

3 changes: 0 additions & 3 deletions bin/jruby-truffle-tool

This file was deleted.

18 changes: 1 addition & 17 deletions bin/jruby.bash
Original file line number Diff line number Diff line change
@@ -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
Binary file modified bin/jruby.dll
Binary file not shown.
Binary file modified bin/jruby.exe
Binary file not shown.
3 changes: 0 additions & 3 deletions bin/jruby.sh
Original file line number Diff line number Diff line change
@@ -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
Binary file modified bin/jrubyw.exe
Binary file not shown.
89 changes: 0 additions & 89 deletions ci.hocon

This file was deleted.

Loading

0 comments on commit 39155ec

Please sign in to comment.