From 55f1322e4ecf6173e855abb33eaaeaf9bba99fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= Date: Thu, 16 Jan 2014 11:19:01 +0100 Subject: [PATCH] [vendor] Default to `:cflags` option for BS generation. Fixes http://hipbyte.myjetbrains.com/youtrack/issue/RM-388. --- NEWS | 2 ++ lib/motion/project/vendor.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index aaa5851d..60bfe6d7 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,8 @@ meant to be embedded inside the application. E.g. `/Library/Frameworks/iTunesLibrary.framework'. * Made `vendor_project' accept glob patterns for the `source_files' option. + * Made BridgeSupport metadata generation for `vendor' projects by default use + the `:cflags` option. = RubyMotion 2.19 = diff --git a/lib/motion/project/vendor.rb b/lib/motion/project/vendor.rb index 82b64601..09773aad 100644 --- a/lib/motion/project/vendor.rb +++ b/lib/motion/project/vendor.rb @@ -133,7 +133,7 @@ EOS unless headers.empty? bs_file = File.basename(@path) + '.bridgesupport' if !File.exist?(bs_file) or headers.any? { |h| File.mtime(h) > File.mtime(bs_file) } - bs_cflags = (opts.delete(:bridgesupport_cflags) or '') + bs_cflags = (opts.delete(:bridgesupport_cflags) or opts.delete(:cflags) or '') bs_exceptions = (opts.delete(:bridgesupport_exceptions) or []) @config.gen_bridge_metadata(platform, headers, bs_file, bs_cflags, bs_exceptions) end @@ -203,7 +203,7 @@ EOS project_dir = File.expand_path(@config.project_dir) headers = Dir.glob(File.join(project_dir, headers_dir, '**/*.h')) if !File.exist?(bs_file) or headers.any? { |x| File.mtime(x) > File.mtime(bs_file) } - bs_cflags = (opts.delete(:bridgesupport_cflags) or '') + bs_cflags = (opts.delete(:bridgesupport_cflags) or opts.delete(:cflags) or '') bs_exceptions = (opts.delete(:bridgesupport_exceptions) or []) @config.gen_bridge_metadata(platform, headers, bs_file, bs_cflags, bs_exceptions) end