From 12307f01bb57efb4fa5f38aa7bb2e709fce7335c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= Date: Mon, 14 Oct 2013 15:56:11 +0200 Subject: [PATCH] [xcassets] Show compile info to user when not in verbose mode. --- lib/motion/project/builder.rb | 5 +++-- lib/motion/project/xcode_config.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/motion/project/builder.rb b/lib/motion/project/builder.rb index 4bb137de..b806f140 100644 --- a/lib/motion/project/builder.rb +++ b/lib/motion/project/builder.rb @@ -346,14 +346,15 @@ EOS "--app-icon \"#{config.app_icon_name_from_asset_bundle}\"" end + App.info 'Compile', assets_bundles.join(", ") app_resources_dir = File.expand_path(config.app_resources_dir(platform)) FileUtils.mkdir_p(app_resources_dir) cmd = "\"#{config.xcode_dir}/usr/bin/actool\" --output-format human-readable-text " \ "--notices --warnings --platform #{config.deploy_platform.downcase} " \ "--minimum-deployment-target #{config.deployment_target} " \ "#{Array(config.device_family).map { |d| "--target-device #{d}" }.join(' ')} " \ - "#{app_icons_options} " \ - "--compress-pngs --compile \"#{app_resources_dir}\" \"#{assets_bundles.join('" "')}\"" + "#{app_icons_options} --compress-pngs --compile \"#{app_resources_dir}\" " \ + "\"#{assets_bundles.map { |f| File.expand_path(f) }.join('" "')}\"" $stderr.puts(cmd) if App::VERBOSE actool_output = `#{cmd} 2>&1` $stderr.puts(actool_output) if App::VERBOSE diff --git a/lib/motion/project/xcode_config.rb b/lib/motion/project/xcode_config.rb index f1eb29cf..5a50d40b 100644 --- a/lib/motion/project/xcode_config.rb +++ b/lib/motion/project/xcode_config.rb @@ -327,7 +327,7 @@ EOS xcassets_bundles = [] resources_dirs.each do |dir| if File.exist?(dir) - xcassets_bundles.concat(Dir.glob(File.expand_path(File.join(dir, '*.xcassets')))) + xcassets_bundles.concat(Dir.glob(File.join(dir, '*.xcassets'))) end end xcassets_bundles