kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-04-01 22:42:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Instruments] Always try to find the instrument CLI tool in the right xcode_dir.

Browse Source
This commit is contained in:
Eloy Durán
2014-08-18 13:01:51 +02:00
parent a7c8699013
commit ce150dbab3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/motion/project/xcode_config.rb
View File

@@ -301,7 +301,7 @@ EOS
if File.exist?(template)
template_path = template
elsif !builtin_templates.grep(/#{template}/i).empty?
list = `/usr/bin/xcrun instruments -s 2>&1`.strip.split("\n").map { |line| line.sub(/^\s*"/, '').sub(/",*$/, '') }
list = `#{locate_binary('instruments')} -s 2>&1`.strip.split("\n").map { |line| line.sub(/^\s*"/, '').sub(/",*$/, '') }
template = template.downcase
template_path = list.find { |path| File.basename(path, File.extname(path)).downcase == template }
else
@@ -339,7 +339,7 @@ EOS
def profiler_config_device_identifier(device_name, target)
if xcode_version[0] >= '6.0'
re = /#{device_name} \(#{target} Simulator\) \[(.+)\]/
`/usr/bin/xcrun instruments -s 2>&1`.strip.split("\n").each { |line|
`#{locate_binary('instruments')} -s 2>&1`.strip.split("\n").each { |line|
if m = re.match(line)
return m[1]
end