Changeset 904702d for waflib/Tools/ruby.py

Timestamp:

Mar 14, 2015, 6:06:10 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6d7acc8

Parents:

5525507

Message:

waf, waflib: update to 1.8.7

File:

• waflib/Tools/ruby.py (modified) (3 diffs)

waflib/Tools/ruby.py

@@ -28 +28 @@
         ruby=self.env.RUBY
         try:
-                version=self.cmd_and_log([ruby,'-e','puts defined?(VERSION) ? VERSION : RUBY_VERSION']).strip()
+                version=self.cmd_and_log(ruby+['-e','puts defined?(VERSION) ? VERSION : RUBY_VERSION']).strip()
         except Exception:
                 self.fatal('could not determine ruby version')
@@ -52 +52 @@
         version=tuple(map(int,self.env.RUBY_VERSION.split(".")))
         def read_out(cmd):
-                return Utils.to_list(self.cmd_and_log([self.env.RUBY,'-rrbconfig','-e',cmd]))
+                return Utils.to_list(self.cmd_and_log(self.env.RUBY+['-rrbconfig','-e',cmd]))
         def read_config(key):
-                return read_out('puts Config::CONFIG[%r]'%key)
+                return read_out('puts RbConfig::CONFIG[%r]'%key)
         ruby=self.env['RUBY']
         archdir=read_config('archdir')
@@ -88 +88 @@
         self.start_msg('Ruby module %s'%module_name)
         try:
-                self.cmd_and_log([self.env['RUBY'],'-e','require \'%s\';puts 1'%module_name])
+                self.cmd_and_log(self.env.RUBY+['-e','require \'%s\';puts 1'%module_name])
         except Exception:
                 self.end_msg(False)