public
Fork of evanphx/rubinius
Description: Rubinius, the Ruby VM
Homepage: http://rubini.us
Clone URL: git://github.com/ezmobius/rubinius.git
Don't hard-code lib and stdlib in $LOAD_PATH
drbrain (author)
Sat Mar 08 21:12:44 -0800 2008
commit  7ed3bdbdcad69fca64ed18775e983ac7a7e29587
tree    bbf3657499a07ffe010be506b7883718f7977c25
parent  1a0ef6822bbee837d1ac33ebfed2030d74a7e756
...
5
6
7
8
 
9
10
11
...
5
6
7
 
8
9
10
11
0
@@ -5,7 +5,7 @@
0
 
0
 class GlobalVariables
0
   def initialize
0
- load_path = ["lib", "stdlib", "."]
0
+ load_path = %w[.]
0
     loaded_features = []
0
 
0
     @internal = LookupTable.new(
...
40
41
42
43
 
44
45
46
...
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
...
40
41
42
 
43
44
45
46
...
67
68
69
 
 
 
 
 
 
 
 
 
70
71
72
0
@@ -40,7 +40,7 @@ end
0
 # code. We read out of ARGV to figure out what the user is
0
 # trying to do.
0
 
0
-Signal.action("INT") do |thr|
0
+Signal.action("INT") do |thr|
0
   # We can't raise on ourselves, we raise on main.
0
   if thr == Thread.current
0
     thr = Thread.main
0
@@ -67,15 +67,6 @@ end
0
 
0
 # Setup $LOAD_PATH.
0
 
0
-# If there is a prefix set, then adjust lib and stdlib to be
0
-# relative to it.
0
-if ENV['RBX_PREFIX']
0
- ["lib", "stdlib"].each do |lib|
0
- idx = $LOAD_PATH.index(lib)
0
- $LOAD_PATH[idx] = File.join ENV['RBX_PREFIX'], lib
0
- end
0
-end
0
-
0
 additions = []
0
 
0
 # The main stdlib location
...
10
11
12
13
14
15
16
...
10
11
12
 
13
14
15
0
@@ -10,7 +10,6 @@
0
 
0
 /* TODO incorporate system paths calculated at compile time. */
0
 static const char *search_path[] = {
0
- "runtime",
0
 #ifdef CONFIG_RBAPATH
0
   CONFIG_RBAPATH,
0
 #endif
...
69
70
71
 
 
72
73
74
 
75
76
77
...
69
70
71
72
73
74
75
 
76
77
78
79
0
@@ -69,9 +69,11 @@ unless ENV['RBX_PLATFORM_CONF']
0
   ENV['RBX_PLATFORM_CONF'] = "#{prefix}/runtime/platform.conf"
0
 end
0
 
0
+ENV['RUBYLIB'] = 'lib:stdlib'
0
+
0
 if ARGV[0] == "--gdb"
0
   ARGV.shift
0
-
0
+
0
   ENV['PATH'] = "#{prefix}/shotgun:#{ENV['PATH']}"
0
   args = ['-x', "#{prefix}/shotgun/gdbcommands"]
0
   if `uname -s` == "Darwin" and `uname -r`.split(".")[0].to_i < 9

Comments

    No one has commented yet.