nixenvironment 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 296e05c969fab7464580cbc2e1c9eac00148dcf2
-  data.tar.gz: cadb41a812053dbb4bfbf05b14eec2cc3305dba8
+  metadata.gz: ff1906202875cba18a757ba4d864e3551fd2ccbc
+  data.tar.gz: 717a97c9c607fdfe10193ed3c99c6ec7a7378964
 SHA512:
-  metadata.gz: 5c1ac77acbf8738c28f585ba17e7aa65b5490e2120f84295e06cb200d8b3b4c8d2ba10f0dd22491f502035d106c0fdd9346bb254e9fa1cdea12b7f1afdbb6ee9
-  data.tar.gz: 8adb30493918e7e8860e8dfc94d74ef6d589c251991a0a816eb5d8957b8281bc6773bd41710a05f8bc34acac003cbbedfa35edf6870754bc80e84c0ba8e915ff
+  metadata.gz: b45796f9c38ea46ecb0612866fe013f3c74a132643485d6319789cb9f1cfa7bef279920e4034d1f0f841a67513808324146ce26d15761a948cb60f4b6fa41215
+  data.tar.gz: 0cdc033a109e7894b4f824b2c63967fd496e27be63d9b61f87f3243248d46995eaee779194ddf08e247487d4070e6b3790669c441cc0757edfd2481a53da2676

data/bin/nixenvironment

@@ -64,14 +64,51 @@ command :build do |c|
   c.option '--config NAME', String, 'Select configuration'
   c.option '--ipa TYPE', String, 'Select sign (ipa, resigned_ipa_for_device, resigned_ipa_for_adhoc_distribution or resigned_ipa_for_appstore)'
   c.option '--ci_build VALUE', String, 'Define NIXENV_CI_BUILD environment variable (yes, true, 1 or on to enable)'
+  c.option '--unity TARGET PLATFORM', String, 'Select target platform to build (ios or android)'
   c.action do |args, options|
     options.default :config => 'Debug', :ipa => 'ipa', :ci_build => 'yes'
-    read_config(options)
-    enable_ci_build(options.ci_build)
-    build_settings = setup(options.config)
-    prebuild(build_settings, options.config)
-    build(build_settings, options.config, options.ipa)
-    restore_info_plist
+
+    root_working_directory = nil
+    need_chdir_to_root_working_directory = false
+
+    unity = options.unity
+    if unity and unity.length > 0
+      case unity
+        when 'ios'
+          ios_project_path = File.join(Dir.pwd, 'Builds/iOS')
+
+          unity_success = system("unity -executeMethod NIXBuilder.MakeiOSBuild -batchmode -quit -customArgs:path='#{ios_project_path}'")
+          abort('Build unity error!') unless unity_success
+
+          root_working_directory = Dir.pwd
+          need_chdir_to_root_working_directory = true
+
+          Dir.chdir(ios_project_path)
+
+          $project_to_build = 'Unity-iPhone.xcodeproj'
+          $project_target_to_build = 'Unity-iPhone'
+          $infoplist_path = 'Info.plist'
+        when 'android'
+          #TODO: implement me!
+        else
+          abort("Error: Unknown unity target platform '#{unity}'!")
+      end
+    end
+
+    begin
+      read_config(options)
+      enable_ci_build(options.ci_build)
+      build_settings = setup(options.config)
+      prebuild(build_settings, options.config)
+      build(build_settings, options.config, options.ipa)
+      restore_info_plist
+    rescue
+      raise # re-rise exception but chdir to root_working_directory in ensure block first if needed
+    ensure
+      if need_chdir_to_root_working_directory and root_working_directory
+        Dir.chdir(root_working_directory)
+      end
+    end
   end
 end
 
@@ -361,7 +398,7 @@ def prebuild(build_settings, config)
 
   save_build_env_vars(build_settings)
 
-  update_info_plist(build_settings, config)
+  update_info_plist(config)
 
   # TODO: rewrite tagIcons.sh
   # system("#{tag_icons} @config['ICONS_PATH']")
@@ -449,24 +486,22 @@ def backup_info_plist
   p('Info.plist was backuped.')
 end
 
-def update_info_plist(build_settings, config)
+def update_info_plist(config)
   p('Updating Info.plist ...')
 
-  update_build_number    = File.join(BUILD_SCRIPTS_PATH, 'UpdateBuildNumber.sh')
-  update_revision_number = File.join(BUILD_SCRIPTS_PATH, 'UpdateRevisionNumber.sh')
+  revision = %x[ source _last_revision.sh && echo ${REVISION} ].strip!
+  monotonic_revision = %x[ source _last_revision.sh && echo ${MONOTONIC_REVISION} ].strip!
 
   update_success = system("/usr/libexec/PlistBuddy -c 'Set :CFBundleIdentifier \"#{@config['BUNDLE_ID']}\"' \"#{@config['INFOPLIST_PATH']}\"")
+  update_success &&= system("/usr/libexec/PlistBuddy -c 'Set :CFBundleVersion \"#{monotonic_revision}\"' \"#{@config['INFOPLIST_PATH']}\"")
   update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :Configuration string \"#{config}\"' \"#{@config['INFOPLIST_PATH']}\"")
-  update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :RevisionNumber string \"undefined\"' \"#{@config['INFOPLIST_PATH']}\"")
+  update_success &&= system("/usr/libexec/PlistBuddy -c 'Add :RevisionNumber string \"#{revision}\"' \"#{@config['INFOPLIST_PATH']}\"")
 
   unless update_success
     restore_info_plist
     abort('Update Info.plist error!')
   end
 
-  system("#{update_build_number}")
-  system("#{update_revision_number}")
-
   p('Info.plist was updated.')
 end
 

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.20'
+  VERSION = '0.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler