Skip to content

Commit 2c3147e

Browse files
headiusheadius
committed
Reorg of stdlib files.
* lib/ruby/2.2 => lib/ruby/stdlib * lib/ruby/shared => lib/ruby/stdlib * added minitest, test-unit, and power_assert to default gems * fixes and config changes throughout to support these moves
1 parent 9d24f62 commit 2c3147e

1,017 files changed

Lines changed: 455 additions & 58908 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,24 @@ lib/jruby*.jar
4040
lib/native
4141
lib/ruby/cext/
4242
lib/ruby/gems
43-
lib/ruby/shared/*jopenssl*.jar
44-
lib/ruby/shared/bcpkix-jdk15on-*.jar
45-
lib/ruby/shared/bcprov-jdk15on-*.jar
46-
lib/ruby/shared/jar*
47-
lib/ruby/shared/jline
48-
lib/ruby/shared/jopenssl*
49-
lib/ruby/shared/krypt*
50-
lib/ruby/shared/openssl
51-
lib/ruby/shared/org/
52-
lib/ruby/shared/readline/*readline*.jar
53-
lib/ruby/shared/ripper.jar
54-
lib/ruby/shared/rubygems/defaults/jruby_native.rb
43+
lib/ruby/stdlib/*jopenssl*.jar
44+
lib/ruby/stdlib/bcpkix-jdk15on-*.jar
45+
lib/ruby/stdlib/bcprov-jdk15on-*.jar
46+
lib/ruby/stdlib/jar*
47+
lib/ruby/stdlib/jline
48+
lib/ruby/stdlib/jopenssl*
49+
lib/ruby/stdlib/krypt*
50+
lib/ruby/stdlib/openssl
51+
lib/ruby/stdlib/org/
52+
lib/ruby/stdlib/readline/*readline*.jar
53+
lib/ruby/stdlib/ripper.jar
54+
lib/ruby/stdlib/rubygems/defaults/jruby_native.rb
55+
lib/ruby/stdlib/rake*
56+
lib/ruby/stdlib/rdoc*
57+
lib/ruby/stdlib/test*
58+
lib/ruby/stdlib/hoe*
59+
lib/ruby/stdlib/minitest*
60+
lib/ruby/stdlib/power_assert*
5561
release.properties
5662
share
5763
spaces test

‎BUILDING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This will do all of the following:
3131

3232
* Compile JRuby
3333
* Build `lib/jruby.jar`, needed for running at command line
34-
* It will install the default gems specifications `lib/ruby/gems/shared/specifications/default/` and the ruby files of those gems in `lib/ruby/shared/` and `lib/ruby/2.1/`.
34+
* It will install the default gems specifications `lib/ruby/gems/shared/specifications/default/` and the ruby files of those gems in `lib/ruby/stdlib/`.
3535

3636
The environment is now suitable for running Ruby applications.
3737

‎core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static String getArchitecture() {
108108
}
109109

110110
public static String getRuntimeVerStr(Ruby runtime) {
111-
return "2.1";
111+
return Constants.RUBY_MAJOR_VERSION;
112112
}
113113

114114
public static String getNormalizedHome(Ruby runtime) {
@@ -167,7 +167,7 @@ public static String getRubySharedLibDir(Ruby runtime) {
167167
}
168168

169169
public static String getRubyLibDir(Ruby runtime) {
170-
return getRubyLibDirFor(runtime, getRuntimeVerStr(runtime));
170+
return getRubyLibDirFor(runtime, "stdlib");
171171
}
172172

173173
public static String getRubyLibDirFor(Ruby runtime, String runtimeVerStr) {

‎core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,6 @@
2020
import org.jruby.util.URLResource;
2121

2222
class LibrarySearcher {
23-
static class Ruby18 extends LibrarySearcher {
24-
public Ruby18(LoadService loadService) {
25-
super(loadService);
26-
}
27-
28-
@Override
29-
protected String resolveLoadName(FileResource unused, String ruby18Path) {
30-
return ruby18Path;
31-
}
32-
33-
@Override
34-
protected String resolveScriptName(FileResource unused, String ruby18Path) {
35-
return ruby18Path;
36-
}
37-
}
38-
3923
static class FoundLibrary implements Library {
4024
private final Library delegate;
4125
private final String loadName;

‎core/src/main/java/org/jruby/runtime/load/LoadService.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@ public LoadService(Ruby runtime) {
208208
loadTimer = new LoadTimer();
209209
}
210210

211-
this.librarySearcher = runtime.is1_8() ?
212-
new LibrarySearcher.Ruby18(this) :
213-
new LibrarySearcher(this);
211+
this.librarySearcher = new LibrarySearcher(this);
214212
}
215213

216214
/**

‎core/src/test/java/org/jruby/embed/MultipleScriptsRunner.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ public static void tearDownClass() throws Exception {
7979
@Before
8080
public void setUp() throws FileNotFoundException, IOException {
8181
String[] paths = new String[] {
82-
basedir + "/lib/ruby/1.9",
83-
basedir + "/lib/ruby/shared",
84-
basedir + "/lib/ruby/1.9/rdoc",
82+
basedir + "/lib/ruby/stdlib",
83+
basedir + "/lib/ruby/stdlib/rdoc",
8584
basedir + "/test",
8685
basedir
8786
};

‎core/src/test/java/org/jruby/embed/ReaderInputStreamTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,8 @@ public void testRead_3args_bigfile() throws Exception {
201201
}
202202
instance.close();
203203
String[] paths = {
204-
basedir + "/lib/ruby/1.9",
205-
basedir + "/lib/ruby/1.9/rdoc",
206-
basedir + "/lib/ruby/shared",
204+
basedir + "/lib/ruby/stdlib",
205+
basedir + "/lib/ruby/stdlib/rdoc",
207206
basedir + "/test",
208207
basedir + "/core/target/test-classes",
209208
basedir

‎core/src/test/java/org/jruby/embed/ScriptingContainerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ public void testParse_3args_2() {
573573
String filename = "";
574574
int[] lines = null;
575575

576-
String[] paths = {basedir + "/lib", basedir + "/lib/ruby/2.1"};
576+
String[] paths = {basedir + "/lib", basedir + "/lib/ruby/stdlib"};
577577
ScriptingContainer instance = new ScriptingContainer(LocalContextScope.THREADSAFE);
578578
instance.setLoadPaths(Arrays.asList(paths));
579579
instance.setError(pstream);
@@ -795,7 +795,7 @@ public void testRunScriptlet_PathType_String() {
795795
logger1.info("runScriptlet(type, filename)");
796796
PathType type = null;
797797
String filename = "";
798-
String[] paths = {basedir + "/lib/ruby/2.1"};
798+
String[] paths = {basedir + "/lib/ruby/stdlib"};
799799
ScriptingContainer instance = new ScriptingContainer(LocalContextScope.THREADSAFE);
800800
instance.setLoadPaths(Arrays.asList(paths));
801801
instance.setError(pstream);
@@ -905,7 +905,7 @@ public void testCallMethod_3args() {
905905
Object receiver = null;
906906
String methodName = "";
907907
Class<Object> returnType = null;
908-
String[] paths = {basedir + "/lib/ruby/2.1"};
908+
String[] paths = {basedir + "/lib/ruby/stdlib"};
909909
ScriptingContainer instance = new ScriptingContainer(LocalContextScope.THREADSAFE);
910910
instance.setLoadPaths(Arrays.asList(paths));
911911
instance.setError(pstream);

‎default.build.properties‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dest.lib.dir=${lib.dir}
99
spec.dir=spec
1010
jruby.gem.home=lib/ruby/gems/shared
1111
rubyspec.dir=${spec.dir}/ruby
12-
#rubyspec.tar.file=${build.dir}/rubyspec.tgz
1312
prawn.git.repo=git://github.com/sandal/prawn.git
1413
prawn.dir=${test.dir}/prawn
1514
prawn.stable.version=0.4.1
@@ -25,55 +24,13 @@ parser.dir=core/src/main/java/org/jruby/parser
2524
jflex.bin=jflex
2625
jay.bin=jay
2726

28-
#rspec.version=2.12.0
29-
#rspec.core.version=2.12.2
30-
#rspec.expectations.version=2.12.1
31-
#rspec.mocks.version=2.12.2
32-
#minitest.version=2.11.0
33-
#minitest.excludes.version=1.0.0
34-
#diff.lcs.version=1.1.3
35-
#rake.version=10.1.0
36-
#jruby.launcher.version=1.0.19
37-
#rdoc.version=3.12
38-
#json.version=1.7.3
39-
40-
#rspec.gem=${build.lib.dir}/rspec-${rspec.version}.gem
41-
#rspec.core.gem=${build.lib.dir}/rspec-core-${rspec.core.version}.gem
42-
#rspec.expectations.gem=${build.lib.dir}/rspec-expectations-${rspec.expectations.version}.gem
43-
#rspec.mocks.gem=${build.lib.dir}/rspec-mocks-${rspec.mocks.version}.gem
44-
#diff.lcs.gem=${build.lib.dir}/diff-lcs-${diff.lcs.version}.gem
45-
#rake.gem=${build.lib.dir}/rake-${rake.version}.gem
46-
#minitest.gem=${build.lib.dir}/minitest-${minitest.version}.gem
47-
#minitest.excludes.gem=${build.lib.dir}/minitest-excludes-${minitest.excludes.version}.gem
48-
#jruby.launcher.gem=${build.lib.dir}/jruby-launcher-${jruby.launcher.version}.gem
49-
#rdoc.gem=${build.lib.dir}/rdoc-${rdoc.version}.gem
50-
#json.gem=${build.lib.dir}/json-${json.version}.gem
51-
52-
#dev.gem.names=jruby-openssl tzinfo jruby-memcache-client i18n mocha rake rspec-core diff-lcs rspec-expectations rspec-mocks rspec minitest minitest-excludes
53-
#dev.gems=${rake.gem} ${rspec.core.gem} ${diff.lcs.gem} ${rspec.expectations.gem} ${rspec.mocks.gem} ${rspec.gem} ${json.gem} ${rdoc.gem} ${minitest.gem} ${minitest.excludes.gem}
54-
#complete.jar.gems=${rake.gem}
55-
#build.gems=
5627
jruby.win32ole.gem=jruby-win32ole
5728
installer.gems=${jruby.win32ole.gem}
58-
#dist.dir=dist
59-
#classes.dir=${build.dir}/classes
60-
#jruby.classes.dir=${classes.dir}/jruby
61-
#jruby.openssl.classes.dir=${classes.dir}/openssl
62-
#jruby.instrumented.classes.dir=${classes.dir}/jruby-instrumented
6329
test.classes.dir=${test.dir}/target/test-classes
64-
#docs.dir=docs
65-
#api.docs.dir=${docs.dir}/api
6630
release.dir=release
6731
test.results.dir=${build.dir}/test-results
68-
#html.test.results.dir=${test.results.dir}/html
69-
#javac.version=1.6
70-
#jruby.compile.memory=512M
7132
jruby.launch.memory=1024M
72-
#jruby.test.memory=1024M
73-
#jruby.test.memory.permgen=512M
74-
#jruby.test.jvm=java
7533
rake.args=
76-
#ruby.executable=/usr/bin/ruby
7734
install4j.executable=/Applications/install4j 4/bin/install4jc
7835

7936
# Ruby versions
@@ -92,16 +49,3 @@ version.ruby2_0.major=2.0
9249
version.ruby2_0=2.0.0
9350
version.ruby2_0.patchlevel=195
9451
version.ruby2_0.revision=40734
95-
96-
#joda.time.version=2.3
97-
#jline.version=2.11
98-
#asm.version=4.1
99-
#shared.lib.dir=lib/ruby/shared
100-
#asm.jar=asm-${asm.version}.jar
101-
#asm.commons.jar=asm-commons-${asm.version}.jar
102-
#asm.util.jar=asm-util-${asm.version}.jar
103-
#asm.analysis.jar=asm-analysis-${asm.version}.jar
104-
#asm.tree.jar=asm-tree-${asm.version}.jar
105-
106-
#gems.dist.dir=${build.dir}/gems_dist
107-
#gems.defaults.dir=${mac.dist}/lib/ruby/shared/rubygems/defaults

‎lib/.gitignore‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ruby/2.1/json*
2-
ruby/2.1/rdoc*
3-
ruby/2.1/ripper*
4-
ruby/shared/krypt*
5-
ruby/shared/*openssl*
6-
ruby/shared/rake**
7-
ruby/shared/readline*
8-
ruby/shared/bouncy-castle-java.rb
9-
ruby/shared/*.jar
1+
ruby/stdlib/json*
2+
ruby/stdlib/rdoc*
3+
ruby/stdlib/ripper*
4+
ruby/stdlib/krypt*
5+
ruby/stdlib/*openssl*
6+
ruby/stdlib/rake**
7+
ruby/stdlib/readline*
8+
ruby/stdlib/bouncy-castle-java.rb
9+
ruby/stdlib/*.jar
1010
ruby/gems/shared/specifications/default/*
1111
ruby/gems/shared/gems/*/bin/*

0 commit comments

Comments
 (0)