autoproj 1.7.21.b6 → 1.7.21.b7
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/autoproj_bootstrap +2 -2
- data/lib/autoproj/cmdline.rb +3 -4
- data/lib/autoproj/osdeps.rb +1 -1
- data/lib/autoproj/version.rb +1 -1
- metadata +3 -3
data/bin/autoproj_bootstrap
CHANGED
@@ -33,7 +33,7 @@ needed_gem_home = ENV['AUTOPROJ_GEM_HOME'] || "#{Dir.pwd}/.gems"
|
|
33
33
|
if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
|
34
34
|
if ENV['GEM_HOME'] != needed_gem_home
|
35
35
|
require 'rbconfig'
|
36
|
-
RUBY =
|
36
|
+
RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
|
37
37
|
|
38
38
|
ENV['GEM_HOME'] = needed_gem_home
|
39
39
|
exec RUBY, __FILE__, *ARGV
|
@@ -345,7 +345,7 @@ fi
|
|
345
345
|
return Autobuild.programs['gem']
|
346
346
|
end
|
347
347
|
|
348
|
-
ruby_bin =
|
348
|
+
ruby_bin = RbConfig::CONFIG['RUBY_INSTALL_NAME']
|
349
349
|
if ruby_bin =~ /^ruby(.+)$/
|
350
350
|
Autobuild.programs['gem'] = "gem#{$1}"
|
351
351
|
else
|
data/lib/autoproj/cmdline.rb
CHANGED
@@ -1,6 +1,5 @@
|
|
1
1
|
require 'highline'
|
2
2
|
require 'utilrb/module/attr_predicate'
|
3
|
-
|
4
3
|
module Autoproj
|
5
4
|
class << self
|
6
5
|
attr_accessor :verbose
|
@@ -77,7 +76,7 @@ module Autoproj
|
|
77
76
|
Autobuild.srcdir = Autoproj.root_dir
|
78
77
|
Autobuild.logdir = File.join(Autobuild.prefix, 'log')
|
79
78
|
|
80
|
-
ruby =
|
79
|
+
ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
|
81
80
|
if ruby != 'ruby'
|
82
81
|
bindir = File.join(Autoproj.build_dir, 'bin')
|
83
82
|
FileUtils.mkdir_p bindir
|
@@ -161,7 +160,7 @@ module Autoproj
|
|
161
160
|
Autoproj.save_config
|
162
161
|
ENV['AUTOPROJ_RESTARTING'] = '1'
|
163
162
|
require 'rbconfig'
|
164
|
-
ruby =
|
163
|
+
ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
|
165
164
|
if defined?(ORIGINAL_ARGV)
|
166
165
|
exec(ruby, $0, *ORIGINAL_ARGV)
|
167
166
|
else
|
@@ -1404,7 +1403,7 @@ where 'mode' is one of:
|
|
1404
1403
|
Autoproj.message "restarting bootstrapping from #{Dir.pwd}"
|
1405
1404
|
|
1406
1405
|
require 'rbconfig'
|
1407
|
-
ruby =
|
1406
|
+
ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
|
1408
1407
|
exec ruby, $0, *ARGV
|
1409
1408
|
end
|
1410
1409
|
|
data/lib/autoproj/osdeps.rb
CHANGED
data/lib/autoproj/version.rb
CHANGED
metadata
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autoproj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 129
|
5
5
|
prerelease: 7
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 7
|
9
9
|
- 21
|
10
10
|
- b
|
11
|
-
-
|
12
|
-
version: 1.7.21.
|
11
|
+
- 7
|
12
|
+
version: 1.7.21.b7
|
13
13
|
platform: ruby
|
14
14
|
authors:
|
15
15
|
- Sylvain Joyeux
|