bin/nixenvironment in nixenvironment-0.0.31 vs bin/nixenvironment in nixenvironment-0.0.32

@@ -67,25 +67,26 @@
   c.action do |args, options|
     options.default :config => 'Debug', :ipa => 'ipa'
 
     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)
-      return unless need_to_build_ios
     end
 
-    begin
-      read_config_settings
-      enable_ci_build(options.ci_build)
-      supplement_config_settings(options.config)
-      prebuild(options.config)
-      build(options.config, options.ipa)
-      restore_info_plist
-    rescue
-      raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
-    ensure
-      if need_chdir_to_root_working_dir and root_working_dir
-        Dir.chdir(root_working_dir)
+    if not defined? need_to_build_ios or need_to_build_ios
+      begin
+        read_config_settings
+        enable_ci_build(options.ci_build)
+        supplement_config_settings(options.config)
+        prebuild(options.config)
+        build(options.config, options.ipa)
+        restore_info_plist
+      rescue
+        raise # re-rise exception but chdir to root_working_dir in ensure block first if needed
+      ensure
+        if need_chdir_to_root_working_dir and root_working_dir
+          Dir.chdir(root_working_dir)
+        end
       end
     end
   end
 end
 
@@ -507,23 +508,25 @@
       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}'")
-      abort('Build unity error!') unless unity_success
+      abort('iOS build unity error!') unless unity_success
       p('IOS project was generated.')
 
       need_chdir_to_root_working_dir = true
-
       clean_working_copy(false)
 
       Dir.chdir(ios_project_path)
 
       $project_to_build = 'Unity-iPhone.xcodeproj'
       $project_target_to_build = 'Unity-iPhone'
     when 'android'
-      #TODO: implement me!
+      build_success = system(File.join(BUILD_SCRIPTS_PATH, 'UnityBuildAndroid.py'))
+      abort('Android build unity error!') unless build_success
+
+      clean_working_copy(false)
     else
       abort("Error: Unknown unity target platform '#{unity}'!")
   end
 
   return need_to_build_ios, root_working_dir, need_chdir_to_root_working_dir
@@ -565,11 +568,11 @@
 
   p('Info.plist was restored.')
 end
 
 def deploy
-  deploy = File.join(BUILD_SCRIPTS_PATH, 'Deploy.sh')
+  deploy = File.join(BUILD_SCRIPTS_PATH, 'DeployIPA.sh')
 
   deploy_host = @config_settings['DEPLOY_HOST'].nil? || @config_settings['DEPLOY_HOST'].empty? ? ENV['DEPLOY_HOST'] : @config_settings['DEPLOY_HOST']
   deploy_path = @config_settings['DEPLOY_PATH'].nil? || @config_settings['DEPLOY_PATH'].empty? ? ENV['DEPLOY_PATH'] : @config_settings['DEPLOY_PATH']
   deploy_username = @config_settings['DEPLOY_USERNAME'].nil? || @config_settings['DEPLOY_USERNAME'].empty? ? ENV['DEPLOY_USERNAME'] : @config_settings['DEPLOY_USERNAME']
   deploy_password = @config_settings['DEPLOY_PASSWORD'].nil? || @config_settings['DEPLOY_PASSWORD'].empty? ? ENV['DEPLOY_PASSWORD'] : @config_settings['DEPLOY_PASSWORD']
@@ -590,10 +593,11 @@
       need_to_deploy_ios = true
 
       ios_project_path = File.join(root_working_dir, UNITY_BUILDS_IOS_PATH)
       Dir.chdir(ios_project_path)
     when 'android'
-      #TODO: implement me!
+      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}'!")
   end
 
   return need_to_deploy_ios, root_working_dir, need_chdir_to_root_working_dir