nixenvironment 0.0.67 → 0.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f834db42f3efa243c84e0a0218f7b992f1b47e7e
-  data.tar.gz: d74ed425d6f9623980740aff6738b1c4ce42a5e8
+  metadata.gz: 8a8a720fb6217e2b04685a2f71b7f11856a0e7ee
+  data.tar.gz: d7e0c0eafae687a85f4816b76109c852d915d0a4
 SHA512:
-  metadata.gz: 6ec4e5b1c6ae99fdc5a418417140ae62a184a5fcb28a3013d705023915316cbe92140f71ed851b7510335e3d197ec2f0bb64dff2b72e16ea89bbeaafb2794ea3
-  data.tar.gz: 5a65f8bd9613ea7c4cdae1822e994e104fe0177c32cd083d2f4e626efdfe7d268e5c92fc137de7a504c968fc8f0dd308ab18f8ab4567aadb28a7c0a1ece60d47
+  metadata.gz: 49c1ecf47b7b61763eee3de8a83a9202bc78704dba1c7ff5f5dac54c9756c0176abcfb64536dea5bde6d5e34d3a012b47041abf855feeccade4aec69759c8667
+  data.tar.gz: 37f92ab70e4895ef634b1d258ba0bc4226e33e5853cbcdec29945497e2a67451ce211746ead1ed1fa424153284387ffb79ad7be58cb3e3b39eb6bbe8490a7482

data/bin/nixenvironment

@@ -9,6 +9,7 @@ require 'tmpdir'
 require 'active_support/core_ext/object/blank'
 require 'terminal-table'
 require 'colorize'
+require 'nokogiri'
 
 include Nixenvironment
 
@@ -68,23 +69,48 @@ command :build do |c|
   c.option '--keystore_password PASSWORD', String, 'Specify the password for accessing a .keystore file'
   c.option '--key_alias_name NAME', String, 'Specify the alias name which should be used from .keystore file to sign a release version of an APK'
   c.option '--key_alias_password PASSWORD', String, 'Specify the password for accessing an alias name'
-  c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity build (ios or android)'
+  c.option '--unity_platform TARGET PLATFORM', String, 'Select target platform for unity build (ios | macos | android | winphone)'
   c.option '--ndsym', 'Disable .dsym generation for ios project'
   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 (for mac and unity-winphone builds only)'
   c.action do |_args, options|
     options.default :config => 'Debug', :ipa => 'device', :icon_tagger => 'full', :unity_path => 'UNITY'
 
-    need_to_build_ios = true
+    need_to_build_ios   = true
+    need_to_process_macos_build = false
+    need_to_process_winphone_build = false
     is_unity_platform = options.unity_platform.present?
 
     if is_unity_platform
       unity_path = ENV[options.unity_path] || options.unity_path
-      need_to_build_ios = unity_build(options.config, options.unity_platform, unity_path, options.development_build,
-                                      options.keystore_path, options.keystore_password, options.key_alias_name, options.key_alias_password)
+      unity_build(options.config, options.unity_platform, unity_path, options.development_build, options.keystore_path, options.keystore_password, options.key_alias_name, options.key_alias_password)
+      need_to_build_ios              = options.unity_platform == 'ios'
+      need_to_process_macos_build    = options.unity_platform == 'macos'
+      need_to_process_winphone_build = options.unity_platform == 'winphone'
     end
 
-    if need_to_build_ios
+    if need_to_process_macos_build
+      build_path = File.join(UNITY_IOS_PROJECT_PATH, 'build.app')
+      plist_path = File.join(build_path, 'Contents/Info.plist')
+
+      info_plist = Plist.from_file(plist_path)
+      info_plist['CFBundleVersion']            = monotonic_revision
+      info_plist['CFBundleShortVersionString'] = options.app_version   if options.app_version.present?
+      info_plist['CFBundleName']               = $resigned_bundle_name if $resigned_bundle_name.present?
+      info_plist['CFBundleDisplayName']        = $resigned_bundle_name if $resigned_bundle_name.present?
+      info_plist.save(plist_path, Plist::FORMAT_XML)
+    elsif need_to_process_winphone_build
+      build_path = File.join(Dir.pwd, 'Builds/WinPhone')
+      manifest_path = Dir.glob("#{build_path}/**/*.appxmanifest").first
+
+      File.open(manifest_path,'w') do |f|
+        manifest = Nokogiri::XML(File.open(f))
+        manifest.at('Package/Identity')['Version'] = "#{options.app_version}.#{monotonic_revision}"
+      end
+
+      # TODO: update app_version
+    elsif need_to_build_ios
       Dir.chdir(UNITY_IOS_PROJECT_PATH) if is_unity_platform
       read_config_settings
       @config_settings[CONFIGURATION_KEY] = options.config
@@ -330,6 +356,10 @@ def update_config_settings(key, value, table, need_separator)
   table.add_separator if need_separator
 end
 
+def monotonic_revision
+  %x[ source _last_revision.sh && echo ${MONOTONIC_REVISION} ].strip!
+end
+
 def working_copy_is_clean?
   system("
   source \"_last_revision.sh\"
@@ -457,8 +487,6 @@ 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)
-  need_to_build_ios = false
-
   system("#{SAVE_REVISION_SCRIPT_PATH}")
   error('Error! Working copy is not clean!') unless working_copy_is_clean?
 
@@ -470,16 +498,20 @@ def unity_build(configuration, unity_platform, unity_path, development_build, ke
 
   case unity_platform
   when 'ios'
-    need_to_build_ios     = true
+    build_path_arg = "buildPath=#{UNITY_IOS_PROJECT_PATH}"
     development_build_arg = development_build ? ';developmentBuild=' : ''
 
     puts 'Generating IOS project from UNITY project ...'
-    unity_success = system("#{unity_path} -executeMethod NIXBuilder.MakeiOSBuild -projectPath '#{Dir.pwd}'\
-                                          -batchmode -logFile -quit -customArgs:buildPath='#{UNITY_IOS_PROJECT_PATH}#{development_build_arg}'")
+    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.')
+  when 'macos'
+    build_path = File.join(UNITY_IOS_PROJECT_PATH, 'build.app')
+    build_path_arg = "buildPath=#{build_path}"
+    development_build_arg = development_build ? ';developmentBuild=' : ''
 
-    clean_working_copy(false)
+    unity_success = system("#{unity_path} -projectPath '#{Dir.pwd}' -batchmode -logFile -quit -executeMethod NIXBuilder.MakeMacOSBuild -customArgs:'#{build_path_arg}#{development_build_arg}'")
+    error('iOS build unity error!') unless unity_success
   when 'android'
     development_build_arg  = development_build  ? '--development-build'                        : ''
     keystore_path_arg      = keystore_path      ? "--keystore-path #{keystore_path}"           : ''
@@ -490,22 +522,27 @@ def unity_build(configuration, unity_platform, unity_path, development_build, ke
     build_success = system("#{UNITY_BUILD_ANDROID_SCRIPT_PATH} --configuration #{configuration} --unity-path #{unity_path}\
                                                                #{development_build_arg} #{keystore_path_arg} #{keystore_password_arg} #{key_alias_name_arg} #{key_alias_password_arg}")
     error('Android build unity error!') unless build_success
-
-    clean_working_copy(false)
+  when 'winphone'
+    build_path = File.join(Dir.pwd, 'Builds/WinPhone')
+    build_path_arg = "buildPath=#{build_path}"
+    development_build_arg  = development_build ? ';developmentBuild=' : ''
+
+    puts 'Generating WinPhone project from UNITY project ...'
+    build_success = system("#{unity_path} -projectPath '#{Dir.pwd}' -batchmode -logFile -quit -executeMethod NIXBuilder.MakeWinPhoneBuild -customArgs:'#{build_path_arg}#{development_build_arg}'")
+    error('WinPhone build unity error!') unless build_success
   else
     error("Error: Unknown unity target platform '#{unity_platform}'!")
   end
 
-  success('Unity build complete!')
+  clean_working_copy(false)
 
-  need_to_build_ios
+  success('Unity build complete!')
 end
 
 def tag_icon(short_version)
   plist_path         = @config_settings[PRODUCT_SETTINGS_PATH_KEY]
   info_plist         = Plist.from_file(plist_path)
   version            = info_plist['CFBundleShortVersionString']
-  monotonic_revision = %x[ source _last_revision.sh && echo ${MONOTONIC_REVISION} ].strip!
   style              = short_version ? 'OneLine' : 'TwoLine'
   mask_path          = File.join(TAGGER_UTILITY_DIRECTORY, "masks/#{style}Mask.png")
   icons_dir          = File.join(Dir.pwd, @config_settings[ICONS_PATH_KEY])
@@ -539,14 +576,14 @@ def backup_info_plist(product_settings_path, description)
 end
 
 def update_info_plists(config)
-  revision           = %x[ source _last_revision.sh && echo ${REVISION} ].strip!
-  monotonic_revision = %x[ source _last_revision.sh && echo ${MONOTONIC_REVISION} ].strip!
-  bundle_id          = @config_settings[BUNDLE_ID_KEY]
-
-  update_info_plist(@config_settings[PRODUCT_SETTINGS_PATH_KEY],                    monotonic_revision, revision, bundle_id, config, nil)
-  update_info_plist(@config_settings[WATCHKIT_APP_PRODUCT_SETTINGS_PATH_KEY],       monotonic_revision, nil, nil, nil, WATCHKIT_APP_PREFIX)
-  update_info_plist(@config_settings[WATCHKIT_EXTENSION_PRODUCT_SETTINGS_PATH_KEY], monotonic_revision, nil, nil, nil, WATCHKIT_EXTENSION_PREFIX)
-  update_info_plist(@config_settings[WIDGET_PRODUCT_SETTINGS_PATH_KEY],             monotonic_revision, nil, nil, nil, WIDGET_PREFIX)
+  revision       = %x[ source _last_revision.sh && echo ${REVISION} ].strip!
+  monoc_revision = monotonic_revision
+  bundle_id      = @config_settings[BUNDLE_ID_KEY]
+
+  update_info_plist(@config_settings[PRODUCT_SETTINGS_PATH_KEY],                    monoc_revision, revision, bundle_id, config, nil)
+  update_info_plist(@config_settings[WATCHKIT_APP_PRODUCT_SETTINGS_PATH_KEY],       monoc_revision, nil, nil, nil, WATCHKIT_APP_PREFIX)
+  update_info_plist(@config_settings[WATCHKIT_EXTENSION_PRODUCT_SETTINGS_PATH_KEY], monoc_revision, nil, nil, nil, WATCHKIT_EXTENSION_PREFIX)
+  update_info_plist(@config_settings[WIDGET_PRODUCT_SETTINGS_PATH_KEY],             monoc_revision, nil, nil, nil, WIDGET_PREFIX)
 end
 
 def update_info_plist(product_settings_path, monotonic_revision, revision, bundle_id, config, description)

data/legacy/UnityBuildAutomationScripts/NIXBuilder.cs

@@ -78,10 +78,36 @@ public static class NIXBuilder
 			PlayerSettings.Android.keyaliasName = null;
 			PlayerSettings.Android.keyaliasPass = null;
 		}
+		
+		BuildTarget buildTarget = BuildTarget.Android;
 
-		EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.Android);
-		BuildPipeline.BuildPlayer(GetScenePaths(), buildPath, BuildTarget.Android, GetBuildOptions());
+		EditorUserBuildSettings.SwitchActiveBuildTarget(buildTarget);
+		BuildPipeline.BuildPlayer(GetScenePaths(), buildPath, buildTarget, GetBuildOptions());
     }
+	
+	public static void MakeWinPhoneBuild()
+    {
+        string projectPath = CommandLineReader.GetCustomArgument(BuildPathArgument);
+        CreateFolder(projectPath);
+		
+		BuildTarget buildTarget = BuildTarget.WSAPlayer;
+		
+		EditorUserBuildSettings.wsaSDK = WSASDK.PhoneSDK81;
+		EditorUserBuildSettings.SwitchActiveBuildTarget(buildTarget);
+		
+		BuildPipeline.BuildPlayer(GetScenePaths(), projectPath, buildTarget, GetBuildOptions());
+	}
+	
+	public static void MakeMacOSBuild()
+    {
+        string buildPath = CommandLineReader.GetCustomArgument(BuildPathArgument);
+		CreateFolder(Path.GetDirectoryName(buildPath));
+		
+		BuildTarget buildTarget = BuildTarget.StandaloneOSXUniversal;
+		
+		EditorUserBuildSettings.SwitchActiveBuildTarget(buildTarget);
+		BuildPipeline.BuildPlayer(GetScenePaths(), buildPath, buildTarget, GetBuildOptions());
+	}
 
 	public static void CreateFolder(string thePath)
     {

data/lib/nixenvironment/version.rb

@@ -1,3 +1,3 @@
 module Nixenvironment
-  VERSION = '0.0.67'
+  VERSION = '0.0.68'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nixenvironment
 version: !ruby/object:Gem::Version
-  version: 0.0.67
+  version: 0.0.68
 platform: ruby
 authors:
 - Karen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods