kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-04-28 12:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:lrz/RubyMotion

Browse Source
This commit is contained in:
Laurent Sansonetti
2013-04-04 12:15:18 +02:00
parent 45e33e6f9a 3ff66ae72c
commit b9eab69d82
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@@ -8,7 +8,7 @@
strings into file. strings into file.
* Fixed a bug in Object#respond_to? which might return true for a method that * Fixed a bug in Object#respond_to? which might return true for a method that
does not exist. does not exist.
* Fixed a bug in REPL which often causes an error with "quit" command. * Fixed a bug in REPL which often causes an error with quit and exit command.
* Fixed a bug which AVPlayer#currentTime causes `{?=qiIq}@:' not precompiled' * Fixed a bug which AVPlayer#currentTime causes `{?=qiIq}@:' not precompiled'
error. error.
* Improved `rake spec' error message to include the details. Thanks to * Improved `rake spec' error message to include the details. Thanks to
@@ -27,6 +27,9 @@
on module and then use its method. on module and then use its method.
* Fixed a bug where 'rake device debug=1' will cause a crash when contained * Fixed a bug where 'rake device debug=1' will cause a crash when contained
UTF-8 characters in app name. UTF-8 characters in app name.
* Fixed a bug in build system which does not load all depended frameworks.
* Fixed a bug in super which fails to look up method in method which called
by super.
= RubyMotion 1.34 = = RubyMotion 1.34 =

3
bin/sim.m
View File

@@ -793,7 +793,8 @@ again:
add_history([expr UTF8String]); add_history([expr UTF8String]);
NSString *res = [self replEval:expr]; NSString *res = [self replEval:expr];
if (res == nil) { if (res == nil) {
if ([line compare:@"quit"] == NSOrderedSame) { if ([line compare:@"quit"] == NSOrderedSame
|| [line compare:@"exit"] == NSOrderedSame) {
terminate_session(); terminate_session();
} }
break; break;

8
lib/motion/project/config.rb
View File

@@ -319,21 +319,21 @@ EOS
def frameworks_dependencies def frameworks_dependencies
@frameworks_dependencies ||= begin @frameworks_dependencies ||= begin
# Compute the list of frameworks, including dependencies, that the project uses. # Compute the list of frameworks, including dependencies, that the project uses.
deps = [] deps = frameworks.dup.uniq
slf = File.join(sdk('iPhoneSimulator'), 'System', 'Library', 'Frameworks') slf = File.join(sdk('iPhoneSimulator'), 'System', 'Library', 'Frameworks')
frameworks.each do |framework| deps.each do |framework|
framework_path = File.join(slf, framework + '.framework', framework) framework_path = File.join(slf, framework + '.framework', framework)
if File.exist?(framework_path) if File.exist?(framework_path)
`#{locate_binary('otool')} -L \"#{framework_path}\"`.scan(/\t([^\s]+)\s\(/).each do |dep| `#{locate_binary('otool')} -L \"#{framework_path}\"`.scan(/\t([^\s]+)\s\(/).each do |dep|
# Only care about public, non-umbrella frameworks (for now). # Only care about public, non-umbrella frameworks (for now).
if md = dep[0].match(/^\/System\/Library\/Frameworks\/(.+)\.framework\/(.+)$/) and md[1] == md[2] if md = dep[0].match(/^\/System\/Library\/Frameworks\/(.+)\.framework\/(.+)$/) and md[1] == md[2]
deps << md[1] deps << md[1]
deps.uniq!
end end
end end
end end
deps << framework
end end
deps.uniq!
if @framework_search_paths.empty? if @framework_search_paths.empty?
deps = deps.select { |dep| File.exist?(File.join(datadir, 'BridgeSupport', dep + '.bridgesupport')) } deps = deps.select { |dep| File.exist?(File.join(datadir, 'BridgeSupport', dep + '.bridgesupport')) }
end end

2
vm

Submodule vm updated: 950af4d14f...54340e6477