Merge pull request #218 from NativeScript/fatme/remove-device-option

* Remove device option

Author: Fatme

lib/options.ts

@@ -11,7 +11,6 @@ var knownOpts:any = {
 		"copy-from": String,
 		"link-to": String,
 		"release": Boolean,
-		"device": Boolean,
 		"emulator": Boolean,
 		"symlink": Boolean,
 		"keyStorePath": String,

lib/services/ios-project-service.ts

@@ -130,27 +130,27 @@ class IOSProjectService implements  IPlatformProjectService {
 			];
 			var args: string[] = [];
 
-			if(options.device) {
+			if(options.emulator) {
+				args = basicArgs.concat([
+					"-sdk", "iphonesimulator",
+					"-arch", "i386",
+					"VALID_ARCHS=\"i386\"",
+					"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "emulator")
+				]);
+			} else {
 				args = basicArgs.concat([
 					"-xcconfig", path.join(projectRoot, this.$projectData.projectName, "build.xcconfig"),
 					"-sdk", "iphoneos",
 					'ARCHS=armv7 arm64',
 					'VALID_ARCHS=armv7 arm64',
 					"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "device")
 				]);
-			} else {
-				args = basicArgs.concat([
-					"-sdk", "iphonesimulator",
-					"-arch", "i386",
-					"VALID_ARCHS=\"i386\"",
-					"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "emulator")
-				]);
 			}
 
 			this.$childProcess.spawnFromEvent("xcodebuild", args, "exit", {cwd: options, stdio: 'inherit'}).wait();
 
-			if(options.device) {
-				var buildOutputPath = path.join(projectRoot, "build", options.device ? "device" : "emulator");
+			if(!options.emulator) {
+				var buildOutputPath = path.join(projectRoot, "build", "device");
 
 				// Produce ipa file
 				var xcrunArgs = [

lib/services/platform-service.ts

@@ -216,10 +216,7 @@ export class PlatformService implements IPlatformService {
 
                 var platformData = this.$platformsData.getPlatformData(platform);
 
-                var cachedDeviceOption = options.device;
-                options.device = true;
                 this.buildPlatform(platform).wait();
-                options.device = cachedDeviceOption;
 
                 packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
                 this.$logger.out("Using ", packageFile);
@@ -263,11 +260,7 @@ export class PlatformService implements IPlatformService {
 
 			var platformData = this.$platformsData.getPlatformData(platform);
 
-			// We need to build for device
-			var cachedDeviceOption = options.device;
-			options.device = true;
 			this.buildPlatform(platform).wait();
-			options.device = cachedDeviceOption;
 
 			// Get latest package that is produced from build
 			var packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;