Skip to content

Commit 01b517a

Browse files
chrisseatonchrisseaton
committed
Version prep
PullRequest: truffleruby/651
2 parents b9db176 + 475977a commit 01b517a

File tree

8 files changed

+25
-87
lines changed

8 files changed

+25
-87
lines changed

‎doc/legal/legal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ See `epl-1.0.txt`, `gpl-2.txt`, `lgpl-2.1.txt`.
1919
## MRI
2020

2121
The standard implementation of Ruby is MRI. TruffleRuby contains code from MRI
22-
version 2.4.4, including:
22+
version 2.6.1, including:
2323

2424
* the standard library in `lib/mri`,
2525
* Ruby C extension API in `lib/cext/include` and `src/main/c/cext`,

‎doc/legal/ruby-licence.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ You can redistribute it and/or modify it under either the terms of the
1111

1212
a) place your modifications in the Public Domain or otherwise
1313
make them Freely Available, such as by posting said
14-
modifications to Usenet or an equivalent medium, or by allowing
15-
the author to include your modifications in the software.
14+
modifications to Usenet or an equivalent medium, or by allowing
15+
the author to include your modifications in the software.
1616

1717
b) use the modified software only within your corporation or
1818
organization.
@@ -26,11 +26,11 @@ You can redistribute it and/or modify it under either the terms of the
2626
provided that you do at least ONE of the following:
2727

2828
a) distribute the binaries and library files of the software,
29-
together with instructions (in the manual page or equivalent)
30-
on where to get the original distribution.
29+
together with instructions (in the manual page or equivalent)
30+
on where to get the original distribution.
3131

3232
b) accompany the distribution with the machine-readable source of
33-
the software.
33+
the software.
3434

3535
c) give non-standard binaries non-standard names, with
3636
instructions on where to get the original software distribution.

‎doc/user/compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Compatibility
22

33
TruffleRuby aims to be fully compatible with the standard implementation of
4-
Ruby, MRI, version 2.4.4, revision 63013.
4+
Ruby, MRI, version 2.6.1, revision 66950.
55

66
Any incompatibility with MRI is considered a bug, except for rare cases detailed below.
77
If you find an incompatibility with MRI, please [report](https://github.com/oracle/truffleruby/issues) it to us.

‎doc/user/options.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# TruffleRuby Options and Command Line
22

3-
TruffleRuby has the same command line interface as MRI 2.4.4.
3+
TruffleRuby has the same command line interface as our compatible MRI version.
44

55
```
66
Usage: truffleruby [switches] [--] [programfile] [arguments]
@@ -22,16 +22,17 @@ Usage: truffleruby [switches] [--] [programfile] [arguments]
2222
-s enable some switch parsing for switches after script name
2323
-S look for the script using PATH environment variable
2424
-T[level=1] turn on tainting checks
25-
-v, --verbose print version number, then turn on verbose mode
25+
-v print the version number, then turn on verbose mode
2626
-w turn warnings on for your script
2727
-W[level=2] set warning level; 0=silence, 1=medium, 2=verbose
2828
-x[directory] strip off text before #!ruby line and perhaps cd to directory
2929
--copyright print the copyright
30-
--enable=feature[,...], --disable=feature[,...]
31-
enable or disable features
30+
--enable={gems|rubyopt|...}[,...], --disable={gems|rubyopt|...}[,...]
31+
enable or disable features. see below for available features
3232
--external-encoding=encoding, --internal-encoding=encoding
3333
specify the default external or internal character encoding
34-
--version print the version
34+
--verbose turn on verbose mode and disable script from stdin
35+
--version print the version number, then exit
3536
--help show this message, -h for short message
3637
3738
Features:

‎doc/user/standalone-distribution.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Just add `truffleruby` in the build matrix, such as:
2424
```yaml
2525
language: ruby
2626
rvm:
27-
- 2.6.0
27+
- 2.6.1
2828
- truffleruby
2929
```
3030
@@ -48,7 +48,7 @@ export TRUFFLERUBY_RESILIENT_GEM_HOME=true
4848
curl -L https://github.com/oracle/truffleruby/releases/download/vm-$TRUFFLERUBY_VERSION/truffleruby-$TRUFFLERUBY_VERSION-linux-amd64.tar.gz | tar xz
4949
export PATH="$PWD/truffleruby-$TRUFFLERUBY_VERSION-linux-amd64/bin:$PATH"
5050
$PWD/truffleruby-$TRUFFLERUBY_VERSION-linux-amd64/lib/truffle/post_install_hook.sh
51-
ruby -v # => truffleruby 1.0.0-rc3, like ruby 2.4.4, GraalVM CE Native [x86_64-linux]
51+
ruby -v # => truffleruby 1.0.0, like ruby x.y.z, GraalVM CE Native [x86_64-linux]
5252
```
5353

5454
Note that you also need to ensure `GEM_HOME` and `GEM_PATH` are not set, so

‎src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ private static void printPreRunInformation(CommandLineOptions config) {
295295
}
296296

297297
// To update this, use:
298-
// ruby -h | ruby -e 'puts STDIN.readlines.map{|line|"out.println(#{line.chomp.inspect});"}'
299-
// and replace ruby by truffleruby for the first line.
298+
// ruby --help | ruby -e 'puts STDIN.readlines.map{|line|"out.println(#{line.chomp.inspect});"}'
299+
// replace ruby by truffleruby for the first line, and remove unsupported flags.
300300
// Also add an extra out.println(); before out.println("Features:");
301301
private static void printHelp(PrintStream out) {
302302
out.println("Usage: truffleruby [switches] [--] [programfile] [arguments]");
@@ -318,16 +318,17 @@ private static void printHelp(PrintStream out) {
318318
out.println(" -s enable some switch parsing for switches after script name");
319319
out.println(" -S look for the script using PATH environment variable");
320320
out.println(" -T[level=1] turn on tainting checks");
321-
out.println(" -v, --verbose print version number, then turn on verbose mode");
321+
out.println(" -v print the version number, then turn on verbose mode");
322322
out.println(" -w turn warnings on for your script");
323323
out.println(" -W[level=2] set warning level; 0=silence, 1=medium, 2=verbose");
324324
out.println(" -x[directory] strip off text before #!ruby line and perhaps cd to directory");
325325
out.println(" --copyright print the copyright");
326-
out.println(" --enable=feature[,...], --disable=feature[,...]");
327-
out.println(" enable or disable features");
326+
out.println(" --enable={gems|rubyopt|...}[,...], --disable={gems|rubyopt|...}[,...]");
327+
out.println(" enable or disable features. see below for available features");
328328
out.println(" --external-encoding=encoding, --internal-encoding=encoding");
329329
out.println(" specify the default external or internal character encoding");
330-
out.println(" --version print the version");
330+
out.println(" --verbose turn on verbose mode and disable script from stdin");
331+
out.println(" --version print the version number, then exit");
331332
out.println(" --help show this message, -h for short message");
332333
out.println();
333334
out.println("Features:");

‎src/shared/java/org/truffleruby/shared/TruffleRuby.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public class TruffleRuby {
2020
public static final String EXTENSION = ".rb";
2121
public static final String LLVM_ID = "llvm";
2222
public static final String ENGINE_ID = "truffleruby";
23-
public static final String LANGUAGE_VERSION = "2.4.4";
24-
public static final String LANGUAGE_BASE_VERSION = "2.4.0"; // From RbConfig::CONFIG["ruby_version"]
25-
public static final int LANGUAGE_REVISION = 63013;
23+
public static final String LANGUAGE_VERSION = "2.4.4"; // "2.6.1";
24+
public static final String LANGUAGE_BASE_VERSION = "2.4.0"; // "2.6.0"; // From RbConfig::CONFIG["ruby_version"]
25+
public static final int LANGUAGE_REVISION = 66950; // 66950;
2626
public static final String BOOT_SOURCE_NAME = "main_boot_source";
2727
public static final String RUBY_COPYRIGHT = "truffleruby - Copyright (c) 2013-2019 Oracle and/or its affiliates";
2828
public static final boolean PRE_INITIALIZE_CONTEXTS = System.getProperty("polyglot.engine.PreinitializeContexts") != null;

‎test/mri/sulong.exclude

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -104,67 +104,3 @@ ruby/test_file_exhaustive.rb
104104
syslog/test_syslog_logger.rb
105105
test_syslog.rb
106106
zlib/test_zlib.rb
107-
108-
cext/ruby/array/test_resize.rb
109-
cext/ruby/bignum/test_big2str.rb
110-
cext/ruby/bignum/test_bigzero.rb
111-
cext/ruby/bignum/test_div.rb
112-
cext/ruby/bignum/test_mul.rb
113-
cext/ruby/bignum/test_pack.rb
114-
cext/ruby/bignum/test_str2big.rb
115-
cext/ruby/bug_reporter/test_bug_reporter.rb
116-
cext/ruby/class/test_class2name.rb
117-
cext/ruby/debug/test_debug.rb
118-
cext/ruby/debug/test_profile_frames.rb
119-
cext/ruby/exception/test_data_error.rb
120-
cext/ruby/exception/test_enc_raise.rb
121-
cext/ruby/exception/test_ensured.rb
122-
cext/ruby/file/test_stat.rb
123-
cext/ruby/float/test_nextafter.rb
124-
cext/ruby/funcall/test_passing_block.rb
125-
cext/ruby/gvl/test_last_thread.rb
126-
cext/ruby/hash/test_delete.rb
127-
cext/ruby/iseq_load/test_iseq_load.rb
128-
cext/ruby/iter/test_iter_break.rb
129-
cext/ruby/iter/test_yield_block.rb
130-
cext/ruby/load/test_dot_dot.rb
131-
cext/ruby/marshal/test_internal_ivar.rb
132-
cext/ruby/marshal/test_usrmarshal.rb
133-
cext/ruby/method/test_arity.rb
134-
cext/ruby/num2int/test_num2int.rb
135-
cext/ruby/path_to_class/test_path_to_class.rb
136-
cext/ruby/popen_deadlock/test_popen_deadlock.rb
137-
cext/ruby/postponed_job/test_postponed_job.rb
138-
cext/ruby/proc/test_bmethod.rb
139-
cext/ruby/rational/test_rat.rb
140-
cext/ruby/st/test_foreach.rb
141-
cext/ruby/st/test_numhash.rb
142-
cext/ruby/st/test_update.rb
143-
cext/ruby/string/test_coderange.rb
144-
cext/ruby/string/test_cstr.rb
145-
cext/ruby/string/test_ellipsize.rb
146-
cext/ruby/string/test_enc_associate.rb
147-
cext/ruby/string/test_enc_str_buf_cat.rb
148-
cext/ruby/string/test_fstring.rb
149-
cext/ruby/string/test_modify_expand.rb
150-
cext/ruby/string/test_nofree.rb
151-
cext/ruby/string/test_normalize.rb
152-
cext/ruby/string/test_qsort.rb
153-
cext/ruby/string/test_set_len.rb
154-
cext/ruby/struct/test_duplicate.rb
155-
cext/ruby/struct/test_member.rb
156-
cext/ruby/symbol/test_inadvertent_creation.rb
157-
cext/ruby/symbol/test_type.rb
158-
cext/ruby/test_bug-3571.rb
159-
cext/ruby/test_bug-5832.rb
160-
cext/ruby/test_notimplement.rb
161-
cext/ruby/test_printf.rb
162-
cext/ruby/test_recursion.rb
163-
cext/ruby/time/test_new.rb
164-
cext/ruby/tracepoint/test_tracepoint.rb
165-
cext/ruby/typeddata/test_typeddata.rb
166-
cext/ruby/vm/test_at_exit.rb
167-
cext/ruby/wait_for_single_fd/test_wait_for_single_fd.rb
168-
cext/ruby/win32/test_console_attr.rb
169-
cext/ruby/win32/test_dln.rb
170-
cext/ruby/win32/test_fd_setsize.rb

0 commit comments

Comments
 (0)