Skip to content

Commit

Permalink
Showing 97 changed files with 2,403 additions and 1,588 deletions.
4 changes: 3 additions & 1 deletion bin/jruby.bash
Original file line number Diff line number Diff line change
@@ -149,7 +149,9 @@ done
# The Truffle jar always needs to be on the boot classpath so that the VM can
# substitute classes. We add it even if the jar isn't necessarily available,
# but this doesn't cause any problems.
JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
if [ -e "$JRUBY_HOME/lib/jruby-truffle.jar" ]; then
JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
fi

if $cygwin; then
JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
4 changes: 3 additions & 1 deletion bin/jruby.sh
Original file line number Diff line number Diff line change
@@ -110,7 +110,9 @@ done
# The Truffle jar always needs to be on the boot classpath so that the VM can
# substitute classes. We add it even if the jar isn't necessarily available,
# but this doesn't cause any problems.
JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
if [ -e "$JRUBY_HOME/lib/jruby-truffle.jar" ]; then
JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
fi

# ----- Set Up The System Classpath -------------------------------------------

2 changes: 1 addition & 1 deletion bin/rake
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
version = $1
ARGV.shift
end
2 changes: 1 addition & 1 deletion bin/rdoc
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
version = $1
ARGV.shift
end
2 changes: 1 addition & 1 deletion bin/ri
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
version = $1
ARGV.shift
end
531 changes: 266 additions & 265 deletions core/src/main/java/org/jruby/RubyEnumerable.java

Large diffs are not rendered by default.

Loading

0 comments on commit eeb9299

Please sign in to comment.