Merge pull request #183 from airsdk/feature/handle-ios-simulator-platform-assets

Release v1.6.1

Author: marchbold

client/src/com/apm/client/commands/packages/processes/InstallDeployProcess.as

@@ -15,6 +15,7 @@ package com.apm.client.commands.packages.processes
 {
 	import com.apm.client.APM;
 	import com.apm.client.processes.ProcessBase;
+	import com.apm.data.common.Platform;
 	import com.apm.data.install.InstallData;
 	import com.apm.data.install.InstallPackageData;
 	import com.apm.utils.DeployFileUtils;
@@ -84,10 +85,10 @@ package com.apm.client.commands.packages.processes
 									// Check each asset directory (named after the platform) for inclusion in project
 									for each (var assetsDir:File in ref.getDirectoryListing())
 									{
-										var assetsPlatform:String = assetsDir.name.toLowerCase();
-										var assetsDeployLocation:File = deployLocation.resolvePath( assetsPlatform );
+										var assetsPlatform:String = Platform.getPlatformFromVariant( assetsDir.name );
 										if (APM.config.projectDefinition.shouldIncludePlatform( assetsPlatform ))
 										{
+											var assetsDeployLocation:File = deployLocation.resolvePath( assetsDir.name );
 											FileUtils.copyDirectoryTo( assetsDir, assetsDeployLocation, true );
 										}
 									}

client/src/com/apm/data/common/Platform.as

@@ -62,6 +62,40 @@ package com.apm.data.common
 		}
 
 
+		/**
+		 * This helper function retrieves the platform name from a sub-platform variant.
+		 *
+		 * Variants include sub-platforms like <code>ios_simulator</code>
+		 *
+		 * @param variant	The name of the sub-platform
+		 * @return
+		 */
+		public static function getPlatformFromVariant( variant:String ):String
+		{
+			var variantLowerCase:String = variant.toLowerCase();
+			if (variantLowerCase.substr(0, Platform.IOS.length) == Platform.IOS)
+			{
+				return Platform.IOS;
+			}
+			if (variantLowerCase.substr(0, Platform.ANDROID.length) == Platform.ANDROID)
+			{
+				return Platform.ANDROID;
+			}
+			if (variantLowerCase.substr(0, Platform.WINDOWS.length) == Platform.WINDOWS)
+			{
+				return Platform.WINDOWS;
+			}
+			if (variantLowerCase.substr(0, Platform.MACOS.length) == Platform.MACOS)
+			{
+				return Platform.MACOS;
+			}
+			if (variantLowerCase.substr(0, Platform.LINUX.length) == Platform.LINUX)
+			{
+				return Platform.LINUX;
+			}
+			return variantLowerCase;
+		}
+
 		public static function isKnownPlatformName( platform:String ):Boolean
 		{
 			switch (platform)

version.config

@@ -2,5 +2,5 @@
 
 version_major=1
 version_minor=6
-version_build=0
+version_build=1
 version_preview=