Skip to content

Commit 032750f

Browse files
headiusheadius
committed
Remove some remaining version-switching nuggets.
1 parent 29ad807 commit 032750f

17 files changed

+45
-103
lines changed

‎bin/jruby.bash

+6-4
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,12 @@ do
280280
--ng)
281281
# Use native Nailgun client to toss commands to server
282282
process_special_opts "--ng" ;;
283-
# Special pass --1.9 along so when processing cygwin we don't think it is
284-
# a file (this is fairly gross that we special case this -- my bash-fu
285-
# is weak)
286-
--1.9) mode=--1.9 ;;
283+
# warn but ignore
284+
--1.8) echo "warning: --1.8 ignored" ;;
285+
# warn but ignore
286+
--1.9) echo "warning: --1.9 ignored" ;;
287+
# warn but ignore
288+
--2.0) echo "warning: --1.9 ignored" ;;
287289
# Abort processing on the double dash
288290
--) break ;;
289291
# Other opts go to ruby

‎core/src/main/java/org/jruby/RubyInstanceConfig.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -631,10 +631,8 @@ public CompatVersion getCompatVersion() {
631631
/**
632632
* @see Options.COMPAT_VERSION
633633
*/
634+
@Deprecated
634635
public void setCompatVersion(CompatVersion compatVersion) {
635-
if (compatVersion == null) compatVersion = CompatVersion.RUBY1_8;
636-
637-
this.compatVersion = compatVersion;
638636
}
639637

640638
public void setOutput(PrintStream newOutput) {

‎core/src/main/java/org/jruby/embed/EmbedRubyInstanceConfigAdapter.java

+1
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ public interface EmbedRubyInstanceConfigAdapter {
182182
*
183183
* @param version a Ruby version
184184
*/
185+
@Deprecated
185186
public void setCompatVersion(CompatVersion version);
186187

187188
/**

‎core/src/main/java/org/jruby/embed/ScriptingContainer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,8 @@ public CompatVersion getCompatVersion() {
504504
*
505505
* @param version a Ruby version
506506
*/
507+
@Deprecated
507508
public void setCompatVersion(CompatVersion version) {
508-
provider.getRubyInstanceConfig().setCompatVersion(version);
509509
}
510510

511511
/**

‎core/src/main/java/org/jruby/embed/bsf/JRubyEngine.java

-3
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,6 @@ public void initialize(BSFManager manager, String language, Vector someDeclaredB
152152
container = new ScriptingContainer(scope, behavior);
153153
SystemPropertyCatcher.setConfiguration(container);
154154
//container.getProvider().setLoadPaths(getClassPath(manager));
155-
if (!SystemPropertyCatcher.isRuby19(language)) {
156-
container.getProvider().getRubyInstanceConfig().setCompatVersion(CompatVersion.RUBY1_8);
157-
}
158155
Ruby runtime = container.getProvider().getRuntime();
159156

160157
if (someDeclaredBeans != null && someDeclaredBeans.size() > 0) {

‎core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java

-6
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,6 @@ public static void setConfiguration(ScriptingContainer container) {
165165
config.setCompileMode(CompileMode.OFF);
166166
}
167167
}
168-
s = SafePropertyAccessor.getProperty(PropertyName.COMPATVERSION.toString());
169-
if (s != null) {
170-
if (isRuby19(s)) {
171-
config.setCompatVersion(CompatVersion.RUBY1_9);
172-
}
173-
}
174168
}
175169

176170
/**

‎core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@ private void processArgument() {
352352
break;
353353
} else if (argument.equals("--compat")) {
354354
characterIndex = argument.length();
355-
config.setCompatVersion(CompatVersion.getVersionFromString(grabValue(getArgumentError("--compat must be RUBY1_8 or RUBY1_9"))));
355+
grabValue(getArgumentError("--compat takes an argument, but will be ignored"));
356+
config.getError().println("warning: " + argument + " ignored");
356357
break FOR;
357358
} else if (argument.equals("--copyright")) {
358359
config.setShowCopyright(true);

‎core/src/main/java/org/jruby/util/cli/OutputStrings.java

-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ public static String getBasicUsageHelp() {
6767
.append(" --manage enable remote JMX management and monitoring of the VM\n")
6868
.append(" and JRuby\n")
6969
.append(" --headless do not launch a GUI window, no matter what\n")
70-
.append(" --1.8 specify Ruby 1.8.x compatibility\n")
71-
.append(" --1.9 specify Ruby 1.9.x compatibility (default)\n")
72-
.append(" --2.0 specify Ruby 2.0.x compatibility\n")
7370
.append(" --bytecode show the JVM bytecode produced by compiling specified code\n")
7471
.append(" --version print the version\n")
7572
.append(" --disable-gems do not load RubyGems on startup\n");

‎core/src/test/java/org/jruby/test/TestRubyBase.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ public TestRubyBase(String name) {
5959
protected void setUp() throws Exception {
6060
super.setUp();
6161
if (runtime == null) {
62-
RubyInstanceConfig config = new RubyInstanceConfig();
63-
config.setCompatVersion(CompatVersion.RUBY1_8);
64-
runtime = Ruby.newInstance(config);
62+
runtime = Ruby.newInstance();
6563
}
6664
}
6765

‎install/jruby.install4j

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<versionLine x="20" y="40" text="version ${compiler:sys.version}" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
161161
</text>
162162
</splashScreen>
163-
<java mainClass="org.jruby.Main" vmParameters="&quot;-Djruby.home=${launcher:sys.launcherDirectory}&quot;" arguments="--1.9 &quot;${launcher:sys.launcherDirectory}/bin/jirb_swing&quot;" allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
163+
<java mainClass="org.jruby.Main" vmParameters="&quot;-Djruby.home=${launcher:sys.launcherDirectory}&quot;" arguments="&quot;${launcher:sys.launcherDirectory}/bin/jirb_swing&quot;" allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
164164
<classPath>
165165
<archive location="lib/jruby.jar" failOnError="false" />
166166
</classPath>

‎rakelib/rspec.rake

+26-33
Original file line numberDiff line numberDiff line change
@@ -28,44 +28,37 @@ namespace :spec do
2828
:all => [:int, :jit, :aot]
2929
}
3030

31-
{"" => "--1.9"}.each do |version_suffix, version_arg|
32-
permute_specs "ji#{version_suffix}", compile_flags, "test:compile" do |t|
33-
t.ruby_opts = ["-I#{rake_location}", version_arg]
34-
t.rspec_opts ||= []
35-
t.rspec_opts << "--options spec/java_integration/spec.quiet.opts"
36-
t.pattern = 'spec/java_integration/**/*_spec.rb'
37-
end
31+
permute_specs "ji", compile_flags, "test:compile" do |t|
32+
t.ruby_opts = ["-I#{rake_location}"]
33+
t.rspec_opts ||= []
34+
t.rspec_opts << "--options spec/java_integration/spec.quiet.opts"
35+
t.pattern = 'spec/java_integration/**/*_spec.rb'
36+
end
3837

39-
permute_specs "compiler#{version_suffix}", compile_flags do |t|
40-
t.ruby_opts = [version_arg]
41-
t.pattern = 'spec/compiler/**/*_spec.rb'
42-
end
38+
permute_specs "compiler", compile_flags do |t|
39+
t.pattern = 'spec/compiler/**/*_spec.rb'
40+
end
4341

44-
permute_specs "profiler#{version_suffix}", compile_flags do |t|
45-
t.ruby_opts = ["--profile", version_arg]
46-
t.pattern = 'spec/profiler/**/*_spec.rb'
47-
end
42+
permute_specs "profiler", compile_flags do |t|
43+
t.ruby_opts = ["--profile"]
44+
t.pattern = 'spec/profiler/**/*_spec.rb'
45+
end
4846

49-
permute_specs "ffi#{version_suffix}", compile_flags do |t|
50-
t.ruby_opts = [version_arg]
51-
t.pattern = 'spec/ffi/**/*_spec.rb'
52-
end
47+
permute_specs "ffi", compile_flags do |t|
48+
t.pattern = 'spec/ffi/**/*_spec.rb'
49+
end
5350

54-
permute_specs "java_signature_parser#{version_suffix}", compile_flags do |t|
55-
t.ruby_opts = [version_arg]
56-
t.rspec_opts = "--options spec/java_integration/spec.quiet.opts"
57-
t.pattern = 'spec/grammar/**/*_spec.rb'
58-
end
51+
permute_specs "java_signature_parser", compile_flags do |t|
52+
t.rspec_opts = "--options spec/java_integration/spec.quiet.opts"
53+
t.pattern = 'spec/grammar/**/*_spec.rb'
54+
end
5955

60-
permute_specs "ir#{version_suffix}", compile_flags do |t|
61-
t.ruby_opts = [version_arg]
62-
t.rspec_opts = "--options spec/java_integration/spec.opts"
63-
t.pattern = 'spec/ir/**/*_spec.rb'
64-
end
56+
permute_specs "ir", compile_flags do |t|
57+
t.rspec_opts = "--options spec/java_integration/spec.opts"
58+
t.pattern = 'spec/ir/**/*_spec.rb'
59+
end
6560

66-
permute_specs "regression#{version_suffix}", compile_flags do |t|
67-
t.ruby_opts = [version_arg]
68-
t.pattern = 'spec/regression/**/*_spec.rb'
69-
end
61+
permute_specs "regression", compile_flags do |t|
62+
t.pattern = 'spec/regression/**/*_spec.rb'
7063
end
7164
end

‎rakelib/test.rake

-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ namespace :test do
161161
desc "Run the main JUnit test suite"
162162
task :main => 'test:compile' do
163163
junit :classpath => test_class_path, :test => "org.jruby.test.MainTestSuite", :maxmemory => '512M' do
164-
env :key => "JRUBY_OPTS", :value => "--1.9"
165-
sysproperty :key => 'jruby.compat.version', :value => '1.9'
166164
jvmarg :line => '-ea'
167165
end
168166
end

‎spec/jruby.1.9.mspec

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ WINDOWS = RbConfig::CONFIG['host_os'] =~ /mswin/
1212
SPEC_DIR = File.join(File.dirname(__FILE__), 'ruby') unless defined?(SPEC_DIR)
1313
TAGS_DIR = File.join(File.dirname(__FILE__), 'tags') unless defined?(TAGS_DIR)
1414

15-
# update env to force children into proper mode
16-
ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].to_s + " --1.9"
17-
1815
class MSpecScript
1916
# Language features specs
2017
set :language, [

‎spec/regression/JRUBY-6307_integer_power_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /usr/bin/env jruby --1.9
1+
#!/usr/bin/env jruby
22
require 'rspec'
33

44
describe "JRUBY-6307: Powering operation of Integer sometimes gets a wrong calculation when 1.9 mode." do

‎test/test_command_line_switches.rb

+3-37
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,14 @@ def test_dash_little_p_wraps_script_with_while_gets_and_prints
6161
# -s option (-g-a=123) is passed and is ignored.
6262
def test_dash_little_s
6363
with_temp_script(%q{puts $g, $v, $foo, *ARGV}) do |s|
64-
assert_equal "nil\n123\nbar\n4\n5\n6", `#{RUBY} --1.8 -s #{s.path} -g-a=123 -v=123 -foo=bar 4 5 6`.chomp
65-
assert_equal 0, $?.exitstatus
66-
end
67-
with_temp_script(%q{puts $g, $v, $foo, *ARGV}) do |s|
68-
assert_equal "\n123\nbar\n4\n5\n6", `#{RUBY} --1.9 -s #{s.path} -g-a=123 -v=123 -foo=bar 4 5 6`.chomp
64+
assert_equal "\n123\nbar\n4\n5\n6", `#{RUBY} -s #{s.path} -g-a=123 -v=123 -foo=bar 4 5 6`.chomp
6965
assert_equal 0, $?.exitstatus
7066
end
7167
end
7268

7369
def test_dash_little_s_options_must_come_after_script
7470
with_temp_script(%q{puts $v, *ARGV}) do |s|
75-
assert_equal "nil\na\n-v=123\nb\nc", `#{RUBY} --1.8 -s #{s.path} a -v=123 b c`.chomp
76-
assert_equal 0, $?.exitstatus
77-
end
78-
with_temp_script(%q{puts $v, *ARGV}) do |s|
79-
assert_equal "\na\n-v=123\nb\nc", `#{RUBY} --1.9 -s #{s.path} a -v=123 b c`.chomp
71+
assert_equal "\na\n-v=123\nb\nc", `#{RUBY} -s #{s.path} a -v=123 b c`.chomp
8072
assert_equal 0, $?.exitstatus
8173
end
8274
end
@@ -126,35 +118,9 @@ def test_dash_big_S_resolves_relative___FILE___correctly
126118
end
127119
end
128120

129-
def test_dash_little_v_version_verbose_T_taint_d_debug_K_kcode_r_require_b_benchmarks_a_splitsinput_I_loadpath_C_cwd_F_delimeter_J_javaprop_18
130-
e_line = 'puts $VERBOSE, $SAFE, $DEBUG, $KCODE, $F.join(59.chr), $LOAD_PATH.join(44.chr), Dir.pwd, Java::java::lang::System.getProperty(:foo.to_s)'
131-
args = "--1.8 -J-Dfoo=bar -v -T3 -d -Ku -a -n -Ihello -C .. -F, -e #{q + e_line + q}"
132-
lines = jruby_with_pipe("echo 1,2,3", args).split("\n")
133-
assert_equal 0, $?.exitstatus, "failed execution with output:\n#{lines}"
134-
parent_dir = Dir.chdir('..') { Dir.pwd }
135-
136-
assert_match /jruby \d+(\.\d+\.\d+)?/, lines[0]
137-
assert_match /true$/, lines[1]
138-
assert_equal "0", lines[2]
139-
assert_equal "true", lines[3]
140-
assert_equal "UTF8", lines[4]
141-
assert_equal "1;2;3", lines[5].rstrip
142-
assert_match /^hello/, lines[6]
143-
# The gsub is for windows
144-
assert_equal "#{parent_dir}", lines[7].gsub('\\', '/')
145-
assert_equal "bar", lines[8]
146-
147-
e_line = 'puts Gem'
148-
args = " -rrubygems -e #{q + e_line + q}"
149-
lines = jruby_with_pipe("echo 1,2,3", args).split("\n")
150-
assert_equal 0, $?.exitstatus
151-
152-
assert_equal "Gem", lines[0]
153-
end
154-
155121
def test_dash_little_v_version_verbose_T_taint_d_debug_K_kcode_r_require_b_benchmarks_a_splitsinput_I_loadpath_C_cwd_F_delimeter_J_javaprop_19
156122
e_line = 'puts $VERBOSE, $SAFE, $DEBUG, Encoding.default_external, $F.join(59.chr), $LOAD_PATH.join(44.chr), Dir.pwd, Java::java::lang::System.getProperty(:foo.to_s)'
157-
args = "--1.9 -J-Dfoo=bar -v -T3 -d -Ku -a -n -Ihello -C .. -F, -e #{q + e_line + q}"
123+
args = "-J-Dfoo=bar -v -T3 -d -Ku -a -n -Ihello -C .. -F, -e #{q + e_line + q}"
158124
lines = jruby_with_pipe("echo 1,2,3", args).split("\n")
159125
assert_equal 0, $?.exitstatus, "failed execution with output:\n#{lines}"
160126
parent_dir = Dir.chdir('..') { Dir.pwd }

‎test/test_runaway_magic_comment_1_9.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ class MagicCommentTest19 < Test::Unit::TestCase
55
# JRUBY-5922
66
def test_magic_comment_parse
77
path = File.join(File.dirname(__FILE__), 'runaway_magic_comment.rb')
8-
assert(system "#{ENV_JAVA['jruby.home']}/bin/jruby --1.9 #{path}")
8+
assert(system "#{ENV_JAVA['jruby.home']}/bin/jruby #{path}")
99
end
1010
end

‎tool/git_bisect_run_general.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
# simple script for use with 'git bisect run'
4-
# e.g., git bisect run tool/git_bisect_run.sh -T--1.9 spec/ruby/language/defined_spec.rb
4+
# e.g., git bisect run tool/git_bisect_run.sh spec/ruby/language/defined_spec.rb
55

66
PRE_COMMAND=''
77
POST_COMMAND=''

0 commit comments

Comments
 (0)