bin/nixenvironment in nixenvironment-0.0.100 vs bin/nixenvironment in nixenvironment-0.0.101
- old
+ new
@@ -86,10 +86,11 @@
c.option '--ci_build', 'Deprecated' # TODO: remove
c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (full, short, off)'
c.option '--app_version VERSION', String, 'Specify the version of the app (not implemented for unity-android)' # TODO: implement for unity-android
c.option '--build_number BUILD_NUMBER', String, 'Specify the build number of the app (not implemented for unity-android)' # TODO: implement for unity-android
c.option '--requires_fullscreen', 'Set UIRequiresFullScreen to YES in Info.plist (ios)'
+ c.option '--skip_working_copy_check', 'Skip working copy cleaning check'
c.action do |_args, options|
options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
unity_platform = options.unity_platform
is_unity_platform = unity_platform.present?
need_to_build_ios = true
@@ -163,11 +164,11 @@
end
@config_settings.merge!(Xcodebuild.config_settings) { |_key, v1, v2| v1 || v2 }
begin
- prebuild(options.config, options.app_version, options.requires_fullscreen)
+ 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)
ensure
restore_info_plists
end
elsif need_to_process_webgl_build
@@ -478,20 +479,20 @@
def build_number
$build_number.presence || BuildEnvVarsLoader.load_last_revision['MONOTONIC_REVISION']
end
-def save_revision
+def save_revision(skip_working_copy_check)
revision, monotonic_revision, working_copy_is_clean = SCM.last_revision
build_num = $build_number.presence || monotonic_revision
BuildEnvVarsLoader.save_last_revision(revision, build_num, working_copy_is_clean)
- error('Error! Working copy is not clean!') unless BuildEnvVarsLoader.working_copy_is_clean?
+ error('Error! Working copy is not clean!') unless BuildEnvVarsLoader.working_copy_is_clean? unless skip_working_copy_check
end
-def prebuild(config, app_version, requires_fullscreen)
- save_revision
+def prebuild(config, app_version, requires_fullscreen, skip_working_copy_check)
+ save_revision(skip_working_copy_check)
backup_info_plists
BuildEnvVarsLoader.save_last_build_vars(@config_settings)
update_info_plists(config, app_version, requires_fullscreen)
end
\ No newline at end of file