nixenvironment 0.0.70 → 0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23b91b030df9c768306cb2aca94062c3d660b51b
-  data.tar.gz: fbf507b463a92dbef8f4688b31009b144163b931
+  metadata.gz: 0ae2568f0e26258c2c5e3f378a4aee05e0b81fd2
+  data.tar.gz: 5d6ad9e68cd00116e9b6d2d7d43bd37dc6aa1ce2
 SHA512:
-  metadata.gz: 450a99d55ebccf32afc92c587d02f9c826ed95e116392280b15ea464a9a2343b742d6bfbceb69f58d5115ea33bc1bda10f2733d4b8001334c9d9fce09e149427
-  data.tar.gz: 1c709fce51785244d8a5d53e75588d1763eecc9b80e85819d0f52a1116fe5bc73ae4a942e7b2580bfafdedd09e764cbae00a581f89f02ac555080cca36bddddd
+  metadata.gz: f6f8c13907d4f803eb394d014e5806f77a703df837fade6863486ae6c485e373ebf834517ba79b92c5e620d0dd31ac41d6149fc42f044a1b28dfe7a492c8b770
+  data.tar.gz: b52b91be9c13277b93325dc528308b7256d218f6c32ab3cc9c1bb80fbfdad0f3b72ac24480f3974b0fbacdfe30a3358d50c701fcd8af788b6e16f2d63a67bbc3

data/README.md

@@ -37,7 +37,7 @@ Nixenvironment installs, updates and manages inner NIX environment stuff to make
   Then run this in Execute shell:
 
     # See credentials for deploy on https://qwiki.nixsolutions.com/display/IPT/Credentials
-    $ ./gemify.sh && bundle update && sudo gem install nixenvironment --verbose
+    $ ./gemify.sh && bundle update && sudo gem install nixenvironment --verbose --no-document
     
   NOTE! CI must be configured with UTF-8 locale! Please see how to implement it for Jenkins:
     

data/bin/nixenvironment

@@ -226,18 +226,6 @@ command :code_duplication_report do |c|
   end
 end
 
-command :tag do |c|
-  c.syntax = 'nixenvironment tag'
-  c.description = 'Make SVN/git/mercurial tag, SCM_USERNAME and SCM_PASSWORD must be defined on calling this target'
-  c.action { tag }
-end
-
-command :svn_tag_from_jenkins do |c|
-  c.syntax = 'nixenvironment svn_tag_from_jenkins'
-  c.description = 'Make tag by finding the first credential in local credential storage'
-  c.action { svn_tag_from_jenkins }
-end
-
 command :clean_working_copy do |c|
   c.syntax = 'nixenvironment clean_working_copy'
   c.description = 'Make working copy clean'
@@ -378,9 +366,9 @@ end
 def update_config_settings(key, value, table, need_separator)
   if value
     @config_settings[key] = value
-    spec_column = "|SPECIFIED| directly"
+    spec_column = "Specified directly"
   else
-    spec_column = "|NOT specified| directly. Used from Config"
+    spec_column = "Used from Config"
   end
 
   table.add_row [key, spec_column, @config_settings[key]]
@@ -388,25 +376,11 @@ def update_config_settings(key, value, table, need_separator)
 end
 
 def revision
-  %x[ source _last_revision.sh && echo ${REVISION} ].strip!
+  BuildEnvVarsLoader.load_last_revision['REVISION']
 end
 
 def monotonic_revision
-  %x[ source _last_revision.sh && echo ${MONOTONIC_REVISION} ].strip!
-end
-
-def working_copy_is_clean?
-  system("
-  source \"_last_revision.sh\"
-
-  if [ ${WORKING_COPY_IS_CLEAN} -eq 1 ]; then
-    echo \"Working copy is clean. Continuing ...\"
-  else
-    echo \"error: working copy must not have local modifications.\" 1>&2
-    echo \"You must add following files and folders to .gitignore:\"
-    echo \"#{Git.status(:porcelain => true)}\"
-    exit 1
-  fi")
+  BuildEnvVarsLoader.load_last_revision['MONOTONIC_REVISION']
 end
 
 def save_build_env_vars
@@ -425,7 +399,7 @@ def save_build_env_vars
 
   system("
 echo \"#!/bin/sh\
-### AUTOGENERATED BY Nixenvironment; DO NOT EDIT ###
+#{AUTOGENERATED_FILES_HEADER}
             PROJECT='#{@config_settings[PROJECT_KEY]}'
 BUILT_PRODUCTS_DIR='#{@config_settings[BUILT_PRODUCTS_DIR_KEY]}'
 OBJECTS_NORMAL_DIR='#{@config_settings[OBJECT_FILE_DIR_NORMAL_KEY]}'
@@ -447,13 +421,13 @@ RESIGNED_WIDGET_BUNDLE_ID='#{@config_settings[RESIGNED_WIDGET_BUNDLE_ID_KEY]}'
 RESIGNED_BUNDLE_NAME='#{@config_settings[RESIGNED_BUNDLE_NAME_KEY]}'
 RESIGNED_ENTITLEMENTS_PATH='#{@config_settings[RESIGNED_ENTITLEMENTS_PATH_KEY]}'
 RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH='#{resigned_watchkit_extension_entitlements_path}'
-RESIGNED_WIDGET_ENTITLEMENTS_PATH='#{resigned_widget_entitlements_path}'\" > _last_build_vars.sh
+RESIGNED_WIDGET_ENTITLEMENTS_PATH='#{resigned_widget_entitlements_path}'\" > #{AUTOGENERATED_LAST_BUILD_VARS}
   ")
 end
 
 def prebuild(config)
-  system("#{SAVE_REVISION_SCRIPT_PATH}")
-  error('Error! Working copy is not clean!') unless working_copy_is_clean?
+  SCM.save_revision
+  error('Error! Working copy is not clean!') unless BuildEnvVarsLoader.working_copy_is_clean?
   backup_info_plists
   save_build_env_vars
   update_info_plists(config)
@@ -488,6 +462,8 @@ def build(config, ipa, ndsym, icon_tagger)
 
     success("Make 'macos_zip' complete!")
   elsif sdk.include?('iphoneos')
+    puts
+
     if config == 'Release'
       puts 'IconTagger: configuration is Release. Skipping ...'
     else
@@ -499,6 +475,8 @@ def build(config, ipa, ndsym, icon_tagger)
       end
     end
 
+    puts
+
     ipa.split.each do |current_ipa|
       begin
         case current_ipa
@@ -522,8 +500,8 @@ def build(config, ipa, ndsym, icon_tagger)
 end
 
 def unity_build(configuration, unity_platform, unity_path, development_build, keystore_path, keystore_password, key_alias_name, key_alias_password)
-  system("#{SAVE_REVISION_SCRIPT_PATH}")
-  error('Error! Working copy is not clean!') unless working_copy_is_clean?
+  SCM.save_revision
+  error('Error! Working copy is not clean!') unless BuildEnvVarsLoader.working_copy_is_clean?
 
   if File.directory?(UNITY_EDITOR_DIR)
     FileUtils.cp_r(UNITY_BUILD_SCRIPTS_DIR, UNITY_EDITOR_DIR)
@@ -539,7 +517,7 @@ def unity_build(configuration, unity_platform, unity_path, development_build, ke
     puts 'Generating IOS project from UNITY project ...'
     unity_success = system("#{unity_path} -projectPath '#{Dir.pwd}' -batchmode -logFile -quit -executeMethod NIXBuilder.MakeiOSBuild -customArgs:'#{build_path_arg}#{development_build_arg}'")
     error('iOS build unity error!') unless unity_success
-    success('IOS project was generated.')
+    success("IOS project was generated.\n")
   when 'macos'
     build_path_arg = "buildPath=#{UNITY_MACOS_BUILD_PATH}"
     development_build_arg = development_build ? ';developmentBuild=' : ''
@@ -569,7 +547,7 @@ def unity_build(configuration, unity_platform, unity_path, development_build, ke
 
   clean_working_copy(false)
 
-  success('Unity build complete!')
+  success("Unity build complete!\n")
 end
 
 def tag_icon(short_version)
@@ -591,10 +569,12 @@ def tag_icon(short_version)
 end
 
 def backup_info_plists
+  puts
   @info_plist_backup_name                    = backup_info_plist(@config_settings[PRODUCT_SETTINGS_PATH_KEY],                    nil)
   @watchkit_app_info_plist_backup_name       = backup_info_plist(@config_settings[WATCHKIT_APP_PRODUCT_SETTINGS_PATH_KEY],       WATCHKIT_APP_PREFIX)
   @watchkit_extension_info_plist_backup_name = backup_info_plist(@config_settings[WATCHKIT_EXTENSION_PRODUCT_SETTINGS_PATH_KEY], WATCHKIT_EXTENSION_PREFIX)
   @widget_info_plist_backup_name             = backup_info_plist(@config_settings[WIDGET_PRODUCT_SETTINGS_PATH_KEY],             WIDGET_PREFIX)
+  puts
 end
 
 def backup_info_plist(product_settings_path, description)
@@ -634,14 +614,17 @@ def update_info_plist(product_settings_path, monotonic_revision, revision, bundl
     error("Update #{description}Info.plist error!", e)
   end
 
-  success("#{description}Info.plist was updated.")
+  puts "#{description}Info.plist was updated."
+  puts
 end
 
 def restore_info_plists
+  puts
   restore_info_plist(@config_settings[PRODUCT_SETTINGS_PATH_KEY],                    @info_plist_backup_name,                    nil)
   restore_info_plist(@config_settings[WATCHKIT_APP_PRODUCT_SETTINGS_PATH_KEY],       @watchkit_app_info_plist_backup_name,       WATCHKIT_APP_PREFIX)
   restore_info_plist(@config_settings[WATCHKIT_EXTENSION_PRODUCT_SETTINGS_PATH_KEY], @watchkit_extension_info_plist_backup_name, WATCHKIT_EXTENSION_PREFIX)
   restore_info_plist(@config_settings[WIDGET_PRODUCT_SETTINGS_PATH_KEY],             @widget_info_plist_backup_name,             WIDGET_PREFIX)
+  puts
 end
 
 def restore_info_plist(product_settings_path, info_plist_backup_name, description)
@@ -659,55 +642,22 @@ def deploy(deliver_deploy)
   deploy_password               = @config_settings[DEPLOY_PASSWORD_KEY].blank?               ? ENV[DEPLOY_PASSWORD_KEY]               : @config_settings[DEPLOY_PASSWORD_KEY]
   deploy_itunesconnect_username = @config_settings[DEPLOY_ITUNESCONNECT_USERNAME_KEY].blank? ? ENV[DEPLOY_ITUNESCONNECT_USERNAME_KEY] : @config_settings[DEPLOY_ITUNESCONNECT_USERNAME_KEY]
 
-  deploy_itunesconnect_username ||= 'unknown'
-  deliver_deploy = deliver_deploy ? 1 : 0
-
-  sdk_name = %x[ source _last_build_vars.sh && echo ${SDK_NAME} ].strip!
-
-  if sdk_name.include?('macos')
-    build_env_vars        = BuildEnvVarsLoader.load
-    ipa_bundle_id         = build_env_vars[IPA_BUNDLE_ID_KEY]
-    current_app_version   = build_env_vars[CURRENT_APP_VERSION_KEY]
-    current_build_version = build_env_vars[CURRENT_BUILD_VERSION_KEY]
-    name_for_deployment   = build_env_vars[NAME_FOR_DEPLOYMENT_KEY]
-    executable_name       = build_env_vars[EXECUTABLE_NAME_KEY]
-    ipa_product           = build_env_vars[IPA_PRODUCT_KEY]
-    app_dsym              = build_env_vars[APP_DSYM_KEY]
-    built_products_dir    = build_env_vars[BUILT_PRODUCTS_DIR_KEY]
-
-    local_path_to_app = File.join(Dir.tmpdir, ipa_bundle_id)
-    local_path_to_build = File.join(local_path_to_app, "v.#{current_app_version}_#{current_build_version}")
-    FileUtils.rm_rf(local_path_to_build)
-    FileUtils.mkdir_p(local_path_to_build)
-
-    configuration_full_path = File.join(local_path_to_build, name_for_deployment)
-    FileUtils.mkdir(configuration_full_path)
-    FileUtils.cp(ipa_product, File.join(configuration_full_path, executable_name) + ZIP_EXT)
-
-    # TODO: mds currently doesn't support dsym for mac projects. Will be implemented later.
-    # if File.exist?(app_dsym)
-    #   Dir.chdir(built_products_dir)
-    #   destination = File.join(configuration_full_path, "#{executable_name + APP_EXT + DSYM_EXT + ZIP_EXT}")
-    #   system("zip -r '#{destination}' '#{executable_name + APP_EXT + DSYM_EXT}'")
-    # end
-
-    deploy_path    = @config_settings[DEPLOY_PATH_KEY].blank? ? MACOS_PROJECTS_DEPLOY_PATH : @config_settings[DEPLOY_PATH_KEY]
-    deploy_success = system("#{DEPLOY_SCRIPT_PATH} #{deploy_host} #{deploy_path} #{deploy_username} #{deploy_password} #{local_path_to_app}")
-  else
-    deploy_path    = @config_settings[DEPLOY_PATH_KEY].blank? ? ENV[DEPLOY_PATH_KEY] : @config_settings[DEPLOY_PATH_KEY]
-    deploy_success = system("#{DEPLOY_IPA_SCRIPT_PATH} #{deploy_host} #{deploy_path} #{deploy_username} #{deploy_password} #{deploy_itunesconnect_username} #{deliver_deploy}")
-  end
+  sdk_name = BuildEnvVarsLoader.load_last_build_vars[SDK_NAME_KEY]
 
-  deploy_success ? success('Deploy complete!') : error('Deploy error!')
+  deploy_path = sdk_name.include?('macos') ? MACOS_PROJECTS_DEPLOY_PATH : ENV[DEPLOY_PATH_KEY]
+  deploy_path = @config_settings[DEPLOY_PATH_KEY] if @config_settings[DEPLOY_PATH_KEY].present?
+  Deployer.deploy(deploy_host, deploy_path, deploy_username, deploy_password, deploy_itunesconnect_username, deliver_deploy)
+
+  success('Deploy complete!')
 end
 
 def clean
   FileUtils.rm_f(Dir.glob('*.pyc'))
-  FileUtils.rm_f('last_revision.sh')
-  FileUtils.rm_f('last_build_vars.sh')
-  FileUtils.rm_f('coverage.xml')
-  FileUtils.rm_f('duplication.xml')
-  FileUtils.rm_rf('test-results/')
+  FileUtils.rm_f(AUTOGENERATED_LAST_REVISION)
+  FileUtils.rm_f(AUTOGENERATED_LAST_BUILD_VARS)
+  FileUtils.rm_f(AUTOGENERATED_COVERAGE)
+  FileUtils.rm_f(AUTOGENERATED_DUPLICATION)
+  FileUtils.rm_rf(AUTOGENERATED_TEST_RESULTS)
   Xcodebuild.clean_all_targets
 end
 
@@ -738,32 +688,18 @@ def code_coverage
 end
 
 def code_duplication_report
-  duplication_success = system("#{CODE_DUPLICATION_REPORT_SCRIPT_PATH} \"#{@config_settings[EXCLUDE_PATTERN_FOR_CODE_DUPLICATION_KEY]}\" duplication.xml")
+  duplication_success = system("#{CODE_DUPLICATION_REPORT_SCRIPT_PATH} '#{@config_settings[EXCLUDE_PATTERN_FOR_CODE_DUPLICATION_KEY]}' #{AUTOGENERATED_DUPLICATION}")
   error('Generate code duplication error!') unless duplication_success
 end
 
-def tag
-  tag_success = system("#{MAKE_TAG_SCRIPT_PATH} \"#{ENV[SCM_USERNAME_KEY]}\" \"#{ENV[SCM_PASSWORD_KEY]}\"")
-  error('Make tag error!') unless tag_success
-end
-
-# Jenkins stores SVN credentials locally in XML, so this command gets and uses them on making tag by finding the first credential in local credential storage
-# ATTENTION: if this command picks up wrong credentials, then you should manually edit subversion.credentials file on Jenkins in order to remove the wrong credential
-# Additional |echo| is needed in order to add newline, otherwise base64 encoding doesn't work
-def svn_tag_from_jenkins
-  ENV[SCM_USERNAME_KEY]=%x[ $(shell xpath ../subversion.credentials \(//userName\)[1]/text\(\)) ]
-  ENV[SCM_PASSWORD_KEY]=%x[ $(shell echo $$(xpath ../subversion.credentials \(//password\)[1]/text\(\) 2>/dev/null && echo) | openssl base64 -d) ]
-
-  tag
-end
-
 def clean_working_copy(all)
-  clean_all     = all ? 'all' : nil
-  clean_success = system("#{CLEAN_WORKING_COPY_SCRIPT_PATH} #{clean_all}")
-  error('Clean working copy error!') unless clean_success
+  SCM.clean_working_copy(all)
+  error('Clean working copy error!') unless $?.success?
 end
 
 def error(msg, e = nil)
+  puts
+
   if e.present?
     puts e.inspect
     puts e.backtrace
@@ -773,5 +709,6 @@ def error(msg, e = nil)
 end
 
 def success(msg)
+  puts
   puts msg.green.bold
 end

data/lib/nixenvironment.rb

@@ -5,3 +5,5 @@ require 'nixenvironment/xcodebuild'
 require 'nixenvironment/archiver'
 require 'nixenvironment/build_env_vars_loader'
 require 'nixenvironment/plist'
+require 'nixenvironment/scm'
+require 'nixenvironment/deployer'

data/lib/nixenvironment/archiver.rb

@@ -50,16 +50,18 @@ module Nixenvironment
       end
 
       def make_macos_zip
-        build_env_vars     = BuildEnvVarsLoader.load
-        built_products_dir = build_env_vars[BUILT_PRODUCTS_DIR_KEY].presence
-        executable_name    = build_env_vars[EXECUTABLE_NAME_KEY].presence
-        target_name        = build_env_vars[TARGET_NAME_KEY].presence
-        configuration      = build_env_vars[CONFIGURATION_KEY].presence
-        app_product        = build_env_vars[APP_PRODUCT_KEY].presence
+        load_last_build_vars = BuildEnvVarsLoader.load_last_build_vars
+        built_products_dir   = load_last_build_vars[BUILT_PRODUCTS_DIR_KEY].presence
+        executable_name      = load_last_build_vars[EXECUTABLE_NAME_KEY].presence
+        target_name          = load_last_build_vars[TARGET_NAME_KEY].presence
+        configuration        = load_last_build_vars[CONFIGURATION_KEY].presence
+        app_product          = load_last_build_vars[APP_PRODUCT_KEY].presence
 
         new_ipa_name = "#{executable_name}-#{target_name}-#{configuration}"
         new_ipa_path = File.join(built_products_dir, new_ipa_name) + ZIP_EXT
+        puts
         puts "IPA_PRODUCT = #{new_ipa_path}"
+        puts
 
         Dir.mktmpdir do |tmp_dir|
           dest_app_dir     = File.join(tmp_dir, new_ipa_name)
@@ -77,10 +79,7 @@ module Nixenvironment
           end
 
           puts "--> Zip '#{tmp_dir}' into '#{new_ipa_path}' ..."
-          Dir.chdir(tmp_dir) do
-            zip_success = system("/usr/bin/zip --symlinks --verbose --recurse-paths \"#{new_ipa_path}\" .")
-            raise unless zip_success
-          end
+          Dir.chdir(tmp_dir) { system("/usr/bin/zip --symlinks --verbose --recurse-paths '#{new_ipa_path}' .") }
         end
 
         ipa_bundle_id = get_bundle_id(File.join(app_product, 'Contents'))
@@ -89,7 +88,7 @@ module Nixenvironment
 IPA_PRODUCT='#{new_ipa_path}'
 IPA_BUNDLE_ID='#{ipa_bundle_id}'
 NAME_FOR_DEPLOYMENT='#{configuration}'
-    \" >> _last_build_vars.sh")
+    \" >> #{AUTOGENERATED_LAST_BUILD_VARS}")
       end
 
       private
@@ -99,43 +98,34 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
         is_appstore = ipa_product_suffix.present? && ipa_product_suffix.include?('Appstore')
         is_adhoc    = ipa_product_suffix.present? && ipa_product_suffix.include?('AdHoc')
 
-        build_env_vars     = BuildEnvVarsLoader.load
-        built_products_dir = build_env_vars[BUILT_PRODUCTS_DIR_KEY].presence
-        executable_name    = build_env_vars[EXECUTABLE_NAME_KEY].presence
-        target_name        = build_env_vars[TARGET_NAME_KEY].presence
-        configuration      = build_env_vars[CONFIGURATION_KEY].presence
-        app_product        = build_env_vars[APP_PRODUCT_KEY].presence
-
-        watchkit_app_relative_product        = build_env_vars['WATCHKIT_APP_RELATIVE_PRODUCT'].presence
-        watchkit_extension_relative_product  = build_env_vars['WATCHKIT_EXTENSION_RELATIVE_PRODUCT'].presence
-        widget_relative_product              = build_env_vars['WIDGET_RELATIVE_PRODUCT'].presence
-
-        resigned_bundle_id                            = is_resigned ? build_env_vars[RESIGNED_BUNDLE_ID_KEY].presence                            : nil
-        resigned_watchkit_app_bundle_id               = is_resigned ? build_env_vars[RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY].presence               : nil
-        resigned_watchkit_extension_bundle_id         = is_resigned ? build_env_vars[RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID_KEY].presence         : nil
-        resigned_widget_bundle_id                     = is_resigned ? build_env_vars[RESIGNED_WIDGET_BUNDLE_ID_KEY].presence                     : nil
-        resigned_bundle_name                          = is_resigned ? build_env_vars[RESIGNED_BUNDLE_NAME_KEY].presence                          : nil
-        resigned_entitlements_path                    = is_resigned ? build_env_vars[RESIGNED_ENTITLEMENTS_PATH_KEY].presence                    : nil
-        resigned_watchkit_extension_entitlements_path = is_resigned ? build_env_vars[RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH_KEY].presence : nil
-        resigned_widget_entitlements_path             = is_resigned ? build_env_vars[RESIGNED_WIDGET_ENTITLEMENTS_PATH_KEY].presence             : nil
+        load_last_build_vars = BuildEnvVarsLoader.load_last_build_vars
+        built_products_dir   = load_last_build_vars[BUILT_PRODUCTS_DIR_KEY].presence
+        executable_name      = load_last_build_vars[EXECUTABLE_NAME_KEY].presence
+        target_name          = load_last_build_vars[TARGET_NAME_KEY].presence
+        configuration        = load_last_build_vars[CONFIGURATION_KEY].presence
+        app_product          = load_last_build_vars[APP_PRODUCT_KEY].presence
+
+        watchkit_app_relative_product        = load_last_build_vars['WATCHKIT_APP_RELATIVE_PRODUCT'].presence
+        watchkit_extension_relative_product  = load_last_build_vars['WATCHKIT_EXTENSION_RELATIVE_PRODUCT'].presence
+        widget_relative_product              = load_last_build_vars['WIDGET_RELATIVE_PRODUCT'].presence
+
+        resigned_bundle_id                            = is_resigned ? load_last_build_vars[RESIGNED_BUNDLE_ID_KEY].presence                            : nil
+        resigned_watchkit_app_bundle_id               = is_resigned ? load_last_build_vars[RESIGNED_WATCHKIT_APP_BUNDLE_ID_KEY].presence               : nil
+        resigned_watchkit_extension_bundle_id         = is_resigned ? load_last_build_vars[RESIGNED_WATCHKIT_EXTENSION_BUNDLE_ID_KEY].presence         : nil
+        resigned_widget_bundle_id                     = is_resigned ? load_last_build_vars[RESIGNED_WIDGET_BUNDLE_ID_KEY].presence                     : nil
+        resigned_bundle_name                          = is_resigned ? load_last_build_vars[RESIGNED_BUNDLE_NAME_KEY].presence                          : nil
+        resigned_entitlements_path                    = is_resigned ? load_last_build_vars[RESIGNED_ENTITLEMENTS_PATH_KEY].presence                    : nil
+        resigned_watchkit_extension_entitlements_path = is_resigned ? load_last_build_vars[RESIGNED_WATCHKIT_EXTENSION_ENTITLEMENTS_PATH_KEY].presence : nil
+        resigned_widget_entitlements_path             = is_resigned ? load_last_build_vars[RESIGNED_WIDGET_ENTITLEMENTS_PATH_KEY].presence             : nil
 
         ipa_product = "#{built_products_dir}/#{executable_name}-#{target_name}-#{configuration}#{ipa_product_suffix}.ipa"
         puts "#{ipa_product_key} = #{ipa_product}"
 
-        if is_appstore
-          app_name         = File.basename(app_product)
-          temp_app_product = File.join(Dir.tmpdir, app_name)
-
-          FileUtils.cp_r(app_product, temp_app_product)
-
-          set_plist_values_in_app_path(temp_app_product, 'Configuration' => 'Appstore')
-        end
-
         @valid_keychain_identities_cache = get_valid_keychain_identities
 
         resign(app_product, ipa_product, watchkit_app_relative_product, watchkit_extension_relative_product, widget_relative_product,
                resigned_bundle_id, resigned_watchkit_app_bundle_id, resigned_watchkit_extension_bundle_id, resigned_widget_bundle_id,
-               resigned_bundle_name, resigned_entitlements_path, resigned_watchkit_extension_entitlements_path, resigned_widget_entitlements_path, profile_type)
+               resigned_bundle_name, resigned_entitlements_path, resigned_watchkit_extension_entitlements_path, resigned_widget_entitlements_path, profile_type, is_appstore)
 
         ipa_bundle_id = is_resigned ? resigned_bundle_id : get_bundle_id(app_product)
 
@@ -147,13 +137,11 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
           name_for_deployment = configuration
         end
 
-        system("echo \"\n# generated by Nixenvironment:
+        system("echo \"\n
 #{ipa_product_key}='#{ipa_product}'
 #{ipa_bundle_id_key}='#{ipa_bundle_id}'
 #{name_for_deployment_key}='#{name_for_deployment}'
-        \" >> _last_build_vars.sh")
-
-        FileUtils.rm_rf(temp_app_product) if is_appstore
+        \" >> #{AUTOGENERATED_LAST_BUILD_VARS}")
       end
 
       # Resigns specified .app product and packages it into .ipa file. Finds best matching provisioning profile based on specified options.
@@ -163,7 +151,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
       def resign(app_product_path, new_ipa_path, watchkit_app_relative_product_path = nil, watchkit_extension_relative_product_path = nil,
                  widget_relative_product_path = nil, new_bundle_id = nil, new_watchkit_app_bundle_id = nil, new_watchkit_extension_bundle_id = nil,
                  new_widget_bundle_id = nil, new_bundle_name = nil, new_entitlements_path = nil, new_watchkit_extension_entitlements_path = nil,
-                 new_widget_entitlements_path = nil, profile_type = PROFILE_TYPE_DEVELOPER)
+                 new_widget_entitlements_path = nil, profile_type = PROFILE_TYPE_DEVELOPER, is_appstore = false)
         raise "Unknown profile type '#{profile_type}'! Must be from #{AVAILABLE_PROFILE_TYPES}" unless AVAILABLE_PROFILE_TYPES.include?(profile_type)
 
         new_bundle_id   ||= get_bundle_id(app_product_path)
@@ -207,7 +195,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
                             new_bundle_id, new_watchkit_app_bundle_id, new_watchkit_extension_bundle_id, new_widget_bundle_id, new_bundle_name,
                             new_entitlements_path, new_watchkit_extension_entitlements_path, new_widget_entitlements_path,
                             profile_info.path, identity_name, watchkit_app_profile_path, watchkit_app_identity_name, watchkit_extension_profile_path, watchkit_extension_identity_name,
-                            widget_profile_path, widget_identity_name)
+                            widget_profile_path, widget_identity_name, is_appstore)
       end
 
       def find_profile_info_and_identity_name(profile_type, new_bundle_id)
@@ -224,12 +212,13 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
         profiles_and_identities.each { |item| pp item.first.to_s, item.last }
 
         puts "--> Looking for the best match among found profiles, based on similarity between profile's app id and desired bundle id ..."
-        best_match = find_best_match_for_bundle_id(profiles_and_identities, new_bundle_id)
-        puts_header "--> Best match: #{best_match.to_s}"
 
+        best_match = find_best_match_for_bundle_id(profiles_and_identities, new_bundle_id)
         profile_info  = best_match.first
         identity_name = best_match.last
 
+        puts_header "--> Best match: #{profile_info.to_s}, identity_name='#{identity_name}'"
+
         return profile_info, identity_name
       end
 
@@ -256,7 +245,7 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
                               new_bundle_id, new_watchkit_app_bundle_id, new_watchkit_extension_bundle_id, new_widget_bundle_id, new_bundle_name,
                               new_entitlements_path, new_watchkit_extension_entitlements_path, new_widget_entitlements_path,
                               profile_path, identity_name, watchkit_app_profile_path, watchkit_app_identity_name, watchkit_extension_profile_path, watchkit_extension_identity_name,
-                              widget_profile_path, widget_identity_name)
+                              widget_profile_path, widget_identity_name, is_appstore)
         Dir.mktmpdir do |tmp_dir|
           dest_app_dir          = File.join(tmp_dir, "Payload")
           dest_app_product_path = File.join(dest_app_dir, File.basename(app_product_path))
@@ -267,6 +256,8 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
           puts "--> Copy '#{app_product_path}' into '#{dest_app_product_path}' ..."
           FileUtils.cp_r(app_product_path, dest_app_product_path)
 
+          set_plist_values_in_app_path(app_product_path, 'Configuration' => 'Appstore') if is_appstore
+
           # replace provision, rename bundle_id and bundle_name
           is_provision_replaced        = replace_provision(dest_app_product_path, profile_path)
           is_bundle_id_or_name_changed = rename_bundle_id_and_name(dest_app_product_path, new_bundle_id, new_bundle_name)
@@ -320,11 +311,13 @@ NAME_FOR_DEPLOYMENT='#{configuration}'
 
           if Dir.exist?(new_ipa_path)
             puts "--> Remove old '#{new_ipa_path}' ..."
-            FileUtils.rm(new_ipa_path)
+            FileUtils.rm_rf(new_ipa_path)
           end
 
           puts "--> Zip '#{tmp_dir}' into '#{new_ipa_path}' ..."
           Dir.chdir(tmp_dir) { system("/usr/bin/zip --symlinks --verbose --recurse-paths '#{new_ipa_path}' .") }
+
+          puts
         end
       end