nixenvironment 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5c47f54246daba6b399cc1474a964800c5d9420
-  data.tar.gz: c19409541ac93314de5e4407df6afd06c00458a1
+  metadata.gz: 491270912572211b60be4a4cd5e787fcac5b64e5
+  data.tar.gz: 213cf397adecd0d0612cd68cc72e13682ff56065
 SHA512:
-  metadata.gz: fb874cbf42b8f76db8424c965810a535133d6b4f3c352a3774658a2d3e2bb23fc37f504572a10b699f5dcfdf7aa01c9284fab8fa44ed353c5f3370577e0bbd33
-  data.tar.gz: effcb35401b57ddbaa9cf31317634dee1437bec66715c8db00ff14d5fd89e282d5f1513b8d1ebf504b7a57c4c3b4989797e31a14bd0f67fb115d3569dcd59e21
+  metadata.gz: 3fb89c78a28cb8f190fbb7e0ff4d93b107f83782153d8069b06405cf5d770726ba9bb5c04299debc3049ba2356a19f0f9ed48f5d56e377606e01d1c592212b49
+  data.tar.gz: ae01db6e53cd87a773e2a6fd22f0183bfb98ae41b88afc9462e3eaa645566855f1a841757b049f1098bbf5ef50071ff6248fbd80c668034953e2a45e54538df5

data/bin/nixenvironment

@@ -63,16 +63,17 @@ command :build do |c|
   c.option '--config NAME', String, 'Select configuration'
   c.option '--ipa TYPES', String, 'Select sign (device, resigned_device, resigned_adhoc, resigned_appstore)'
   c.option '--ci_build', 'Define NIXENV_CI_BUILD environment variable'
-  c.option '--unity TARGET PLATFORM', String, 'Select target platform for unity build (ios or android)'
+  c.option '--unity_path PATH', String, 'Select unity executable path (UNITY, UNITY_4 or custom path)'
+  c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity build (ios or android)'
   c.option '--ndsym', 'Disable .dsym generation for ios project'
   c.option '--icon_tagger MODE', String, 'Set XcodeIconTagger mode (full, short, off)'
   c.action do |args, options|
-    options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full'
+    options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
 
     need_to_build_ios = true
 
-    if options.unity and options.unity.length > 0
-      need_to_build_ios, root_working_dir, need_chdir_to_root_working_dir = unity_build(options.unity)
+    if options.unity_platform and options.unity_platform.length > 0
+      need_to_build_ios, root_working_dir, need_chdir_to_root_working_dir = unity_build(options.unity_platform, options.unity_path)
     end
 
     if need_to_build_ios
@@ -97,12 +98,12 @@ end
 command :deploy do |c|
   c.syntax = 'nixenvironment deploy'
   c.description = 'Deploy built artifacts to given server'
-  c.option '--unity TARGET PLATFORM', String, 'Select target platform for unity deploy (ios or android)'
+  c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity deploy (ios or android)'
   c.action do |args, options|
     need_to_deploy_ios = true
 
-    if options.unity and options.unity.length > 0
-      need_to_deploy_ios, root_working_dir, need_chdir_to_root_working_dir = unity_deploy(options.unity)
+    if options.unity_platform and options.unity_platform.length > 0
+      need_to_deploy_ios, root_working_dir, need_chdir_to_root_working_dir = unity_deploy(options.unity_platform)
     end
 
     if need_to_deploy_ios
@@ -506,7 +507,7 @@ def build(config, ipa, ndsym, icon_tagger)
   end
 end
 
-def unity_build(unity)
+def unity_build(unity_platform, unity_path)
   root_working_dir = nil
   need_chdir_to_root_working_dir = false
   need_to_build_ios = false
@@ -525,14 +526,16 @@ def unity_build(unity)
     abort("Copy UnityBuildAutomationScripts error! #{unity_editor_dir} doesn't exist!")
   end
 
-  case unity
+  unity = ENV[unity_path].nil? ? unity_path : ENV[unity_path]
+
+  case unity_platform
     when 'ios'
       need_to_build_ios = true
       root_working_dir = Dir.pwd
       ios_project_path = File.join(root_working_dir, UNITY_BUILDS_IOS_PATH)
 
       p('Generating IOS project from UNITY project ...')
-      unity_success = system("unity -executeMethod NIXBuilder.MakeiOSBuild -projectPath #{root_working_dir.shellescape} -batchmode -logFile -quit -customArgs:path='#{ios_project_path}'")
+      unity_success = system("#{unity} -executeMethod NIXBuilder.MakeiOSBuild -projectPath #{root_working_dir.shellescape} -batchmode -logFile -quit -customArgs:path='#{ios_project_path}'")
       abort('iOS build unity error!') unless unity_success
       p('IOS project was generated.')
 
@@ -544,12 +547,13 @@ def unity_build(unity)
       $project_to_build = 'Unity-iPhone.xcodeproj'
       $project_target_to_build = 'Unity-iPhone'
     when 'android'
-      build_success = system(File.join(BUILD_SCRIPTS_PATH, 'UnityBuildAndroid.py'))
+      unity_build_android = File.join(BUILD_SCRIPTS_PATH, 'UnityBuildAndroid.py')
+      build_success = system("#{unity_build_android} --unity-path #{unity}")
       abort('Android build unity error!') unless build_success
 
       clean_working_copy(false)
     else
-      abort("Error: Unknown unity target platform '#{unity}'!")
+      abort("Error: Unknown unity target platform '#{unity_platform}'!")
   end
 
   return need_to_build_ios, root_working_dir, need_chdir_to_root_working_dir
@@ -624,12 +628,12 @@ def deploy
   abort('Deploy error!') unless deploy_success
 end
 
-def unity_deploy(unity)
+def unity_deploy(unity_platform)
   root_working_dir = nil
   need_chdir_to_root_working_dir = false
   need_to_deploy_ios = false
 
-  case unity
+  case unity_platform
     when 'ios'
       root_working_dir = Dir.pwd
       need_chdir_to_root_working_dir = true
@@ -641,7 +645,7 @@ def unity_deploy(unity)
       deploy_success = system(File.join(BUILD_SCRIPTS_PATH, 'DeployAPK.py'))
       abort('Android deploy unity error!') unless deploy_success
     else
-      abort("Error: Unknown unity target platform '#{unity}'!")
+      abort("Error: Unknown unity target platform '#{unity_platform}'!")
   end
 
   return need_to_deploy_ios, root_working_dir, need_chdir_to_root_working_dir

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.39'
+  VERSION = '0.0.40'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - Karen Arzumanian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler