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

NEWS

@@ -8,7 +8,7 @@
     strings into file.
   * Fixed a bug in Object#respond_to? which might return true for a method that
     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'
     error.
   * Improved `rake spec' error message to include the details. Thanks to
@@ -27,6 +27,9 @@
     on module and then use its method.
   * Fixed a bug where 'rake device debug=1' will cause a crash when contained
     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 =
 

bin/sim.m

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

lib/motion/project/config.rb

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