nixenvironment 0.0.104 → 0.0.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110aaf882172dea0f844950af18c6b35ae048055
-  data.tar.gz: 95bf57ea8622a82b8d3dae5d316545c7f470c7f8
+  metadata.gz: 82d6d44bb8dc0c0ec99fb0a51d04201423dbf908
+  data.tar.gz: ca297587fa3cb40462014a1b24dbfc41f4feaa83
 SHA512:
-  metadata.gz: d0809d20a1193b3d8ac44c39782418d3f0fa7ed1073b33740843b0c2ad263bf7bb9fd7451599263b9d1dfc88c8cacbbe314f641d3816dabaa98f9c3b73b4f9e5
-  data.tar.gz: 4447dc85c35a76cf69c41666f7ac3b38fddfdd3977af2f8b2c06d103bb7b057e8325ed9e200223692d7e7f616742da00d77167a98b73c653130382aacb0a5b8b
+  metadata.gz: e03e37c6af2d9e5b26df8423d461d8297eeab0bbf0295dd9cf16436129b34e410a9c6fd73bf7f9f18aefba2b4be336c17630985bf22872d77f2c5b20e3891e5f
+  data.tar.gz: f42c618fd17f5317ac783fd769f07a0e852fd6e20622d2177a8daf1f3f24cc8cf6f945ed39d8e40c85559e7b006e59ebdf401a459503019ce9964f65e7348611

data/bin/nixenvironment

@@ -91,6 +91,7 @@ command :build do |c|
   c.option '--requires_fullscreen', 'Set UIRequiresFullScreen to YES in Info.plist (ios)'
   c.option '--skip_working_copy_check', 'Skip working copy cleaning check'
   c.option '--share_schemes', 'Share schemes for xcode project'
+  c.option '--xc_args ARGS', String, 'Pass arguments to xcodebuild'
   c.action do |_args, options|
     options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
     unity_platform    = options.unity_platform
@@ -177,7 +178,7 @@ command :build do |c|
 
       begin
         prebuild(options.config, options.app_version, options.requires_fullscreen, options.skip_working_copy_check)
-        build(options.config, options.xcconfig, options.ipa, options.ndsym, options.icon_tagger)
+        build(options.config, options.xcconfig, options.ipa, options.ndsym, options.icon_tagger, options.xc_args)
       ensure
         restore_info_plists
       end
@@ -508,7 +509,7 @@ def prebuild(config, app_version, requires_fullscreen, skip_working_copy_check)
   update_info_plists(config, app_version, requires_fullscreen)
 end
 
-def build(config, xcconfig, ipa, ndsym, icon_tagger)
+def build(config, xcconfig, ipa, ndsym, icon_tagger, xc_args)
   project_to_build          = @config_settings[PROJECT_TO_BUILD_KEY]
   project_target_to_build   = @config_settings[PROJECT_TARGET_TO_BUILD_KEY]
   workspace_to_build        = @config_settings[WORKSPACE_TO_BUILD_KEY]
@@ -521,10 +522,21 @@ def build(config, xcconfig, ipa, ndsym, icon_tagger)
 
   debug_information_format = ndsym ? 'dwarf' : 'dwarf-with-dsym'
 
-  other_args = { 'DEBUG_INFORMATION_FORMAT' => debug_information_format, 'DWARF_DSYM_FOLDER_PATH' => dwarf_dsym_folder_path,
-                 'CONFIGURATION_BUILD_DIR' => configuration_build_dir, 'BUILT_PRODUCTS_DIR' => built_products_dir }
+  other_args = { 'DEBUG_INFORMATION_FORMAT' => debug_information_format,
+                 'DWARF_DSYM_FOLDER_PATH' => dwarf_dsym_folder_path,
+                 'CONFIGURATION_BUILD_DIR' => configuration_build_dir,
+                 'BUILT_PRODUCTS_DIR' => built_products_dir,
+                 'GCC_PRECOMPILE_PREFIX_HEADER' => 'NO', # set "Precompile Prefix Header" flag to "NO"; otherwise it can throw error ".pch.pch has been modified since the precompiled header"
+                 'ENABLE_BITCODE' => 'NO'} # need this in order to build unity <= 5.2.0 generated projects. TODO: remove me!
+  other_args_str = other_args.map { |key, value| "#{key}='#{value}'" }.join(' ')
 
-  Xcodebuild.build(sdk, config, xcconfig, project_to_build, project_target_to_build,  workspace_to_build, workspace_scheme_to_build, env_var_prefix, other_args)
+  if xc_args.present?
+    xc_args.concat(" #{other_args_str}")
+  else
+    xc_args = other_args_str
+  end
+
+  Xcodebuild.build(sdk, config, xcconfig, project_to_build, project_target_to_build, workspace_to_build, workspace_scheme_to_build, env_var_prefix, xc_args)
 
   error('Build error!') unless Xcodebuild.last_cmd_success?
 

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.104'
+  VERSION = '0.0.105'
 end

data/lib/nixenvironment/xcodebuild.rb

@@ -26,7 +26,7 @@ module Nixenvironment
     end
 
     # other => other args to be passed to xcodebuild
-    def self.build(sdk = nil, config = nil, xcconfig = nil, project = nil, target = nil, workspace = nil, scheme = nil, env_var_prefix = nil, other = {})
+    def self.build(sdk = nil, config = nil, xcconfig = nil, project = nil, target = nil, workspace = nil, scheme = nil, env_var_prefix = nil, xc_args = nil)
       build_args = []
       build_args << "-sdk '#{sdk}'"              if sdk.present?
       build_args << "-configuration '#{config}'" if config.present?
@@ -57,11 +57,7 @@ module Nixenvironment
         build_args << "GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS#{vars_to_define}'" if vars_to_define.present?
       end
 
-      # set "Precompile Prefix Header" flag to "NO";
-      # otherwise it can throw error ".pch.pch has been modified since the precompiled header"
-      build_args << 'GCC_PRECOMPILE_PREFIX_HEADER=NO'
-      build_args << 'ENABLE_BITCODE=NO' # need this in order to build unity <= 5.2.0 generated projects. TODO: remove me!
-      build_args << other.map { |key, value| "#{key}='#{value}'" }.join(' ')
+      build_args << xc_args if xc_args.present?
       build_args << '| xcpretty -c; exit ${PIPESTATUS[0]}'
 
       execute(nil, build_args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.104
+  version: 0.0.105
 platform: ruby
 authors:
 - Karen