Merge pull request #1038 from NativeScript/fatme/fix-emulate-after-livesync

Fix emulate-livesync-emulate

Author: Fatme

lib/commands/create-project.ts

@@ -14,7 +14,7 @@ export class ProjectCommandParameter implements ICommandParameter {
 			}
 
 			if (value.toUpperCase() === "APP") {
-				this.$logger.warn("You cannot build aplications named 'app' in Xcode. Consider creating a project with different name.");
+				this.$logger.warn("You cannot build applications named 'app' in Xcode. Consider creating a project with different name.");
 			}
 
 			return this.$projectNameValidator.validate(value);

lib/common

@@ -53,7 +53,7 @@ interface IPlatformProjectService {
 	removePluginNativeCode(pluginData: IPluginData): IFuture<void>;
 	afterPrepareAllPlugins(): IFuture<void>;
 	getAppResourcesDestinationDirectoryPath(): IFuture<string>;
-	deploy(device: Mobile.IDevice, appIdentifier: string): IFuture<void>;
+	deploy(deviceIdentifier: string): IFuture<void>;
 }
 
 interface IAndroidProjectPropertiesManager {

lib/definitions/project.d.ts

@@ -6,6 +6,7 @@ import Future = require("fibers/future");
 import * as constants from "../constants";
 import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
+import * as androidDebugBridgePath from "../common/mobile/android/android-debug-bridge";
 
 class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static VALUES_DIRNAME = "values";
@@ -28,7 +29,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		$projectData: IProjectData,
 		$projectDataService: IProjectDataService,
 		private $sysInfo: ISysInfo,
-		private $mobileHelper: Mobile.IMobileHelper) {
+		private $mobileHelper: Mobile.IMobileHelper,
+		private $injector: IInjector) {
 			super($fs, $projectData, $projectDataService);
 			this._androidProjectPropertiesManagers = Object.create(null);
 	}
@@ -285,10 +287,11 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		return Future.fromResult();
 	}
 
-	public deploy(device: Mobile.IAndroidDevice, appIdentifier: string): IFuture<void> {
+	public deploy(deviceIdentifier: string): IFuture<void> {
 		return (() => {
-			let deviceRootPath = `/data/local/tmp/${appIdentifier}`;
-			device.adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
+			let adb = this.$injector.resolve(androidDebugBridgePath.AndroidDebugBridge, { identifier: deviceIdentifier });
+			let deviceRootPath = `/data/local/tmp/${this.$projectData.projectId}`;
+			adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "sync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "removedsync")]).wait();
 		}).future<void>()();

lib/services/android-project-service.ts

@@ -212,7 +212,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
-	public deploy(device: Mobile.IDevice, appIdentifier: string): IFuture<void> {
+	public deploy(deviceIdentifier: string): IFuture<void> {
 		return Future.fromResult();
 	}
 
@@ -349,8 +349,12 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		return path.join(this.platformData.projectRoot, "Podfile");
 	}
 
-	private get projectXcconfigFilePath(): string {
-		return path.join(this.platformData.appDestinationDirectoryPath, "build.xcconfig");
+	private get pluginsDebugXcconfigFilePath(): string {
+		return path.join(this.platformData.projectRoot, "plugins-debug.xcconfig");
+	}
+
+	private get pluginsReleaseXcconfigFilePath(): string {
+		return path.join(this.platformData.projectRoot, "plugins-release.xcconfig");
 	}
 
 	private replace(name: string): string {
@@ -389,7 +393,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			this.prepareFrameworks(pluginPlatformsFolderPath, pluginData).wait();
 			this.prepareStaticLibs(pluginPlatformsFolderPath, pluginData).wait();
 			this.prepareCocoapods(pluginPlatformsFolderPath).wait();
-			this.prepareXcconfigFile(pluginPlatformsFolderPath).wait();
 		}).future<void>()();
 	}
 
@@ -400,7 +403,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			this.removeFrameworks(pluginPlatformsFolderPath, pluginData).wait();
 			this.removeStaticLibs(pluginPlatformsFolderPath, pluginData).wait();
 			this.removeCocoapods(pluginPlatformsFolderPath).wait();
-			this.removeXcconfigFile(pluginPlatformsFolderPath).wait();
 		}).future<void>()();
 	}
 
@@ -433,6 +435,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 				this.executePodInstall().wait();
 			}
+
+			this.regeneratePluginsXcconfigFile().wait();
 		}).future<void>()();
 	}
 
@@ -535,16 +539,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
-	private prepareXcconfigFile(pluginPlatformsFolderPath: string): IFuture<void> {
-		return (() => {
-			let pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, "build.xcconfig");
-			if(this.$fs.exists(pluginXcconfigFilePath).wait()) {
-				let contentToWrite = this.buildXcconfigContent(pluginXcconfigFilePath);
-				this.$fs.appendFile(this.projectXcconfigFilePath, contentToWrite).wait();
-			}
-		}).future<void>()();
-	}
-
 	private removeFrameworks(pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			let project = this.createPbxProj();
@@ -588,18 +582,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 				} else {
 					this.$fs.writeFile(this.projectPodFilePath, projectPodFileContent).wait();
 				}
-			}
-		}).future<void>()();
-	}
 
-	private removeXcconfigFile(pluginPlatformsFolderPath: string): IFuture<void> {
-		return (() => {
-			let pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, "build.xcconfig");
-			if(this.$fs.exists(pluginXcconfigFilePath).wait()) {
-				let projectXcconfigFileContent = this.$fs.readText(this.projectXcconfigFilePath).wait();
-				let contentToRemove = this.buildXcconfigContent(pluginXcconfigFilePath);
-				projectXcconfigFileContent = helpers.stringReplaceAll(projectXcconfigFileContent, contentToRemove, "");
-				this.$fs.writeFile(this.projectXcconfigFilePath, projectXcconfigFileContent).wait();
 			}
 		}).future<void>()();
 	}
@@ -624,9 +607,38 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		this.$fs.writeFile(path.join(headersFolderPath, "module.modulemap"), modulemap).wait();
 	}
 
-	private buildXcconfigContent(xcconfigFilePath: string): string {
-		let relativePluginXcconfigFilePath = path.relative(path.dirname(this.projectXcconfigFilePath), xcconfigFilePath);
-		return `${os.EOL}#include "${relativePluginXcconfigFilePath}"${os.EOL}`;
+	private mergeXcconfigFiles(pluginFile: string, projectFile: string): IFuture<void> {
+		return (() => {
+			if (!this.$fs.exists(projectFile).wait()) {
+				this.$fs.writeFile(projectFile, "").wait();
+			}
+
+			let mergeScript = `require 'xcodeproj'; Xcodeproj::Config.new('${projectFile}').merge(Xcodeproj::Config.new('${pluginFile}')).save_as(Pathname.new('${projectFile}'))`;
+			this.$childProcess.exec(`ruby -e "${mergeScript}"`).wait();
+		}).future<void>()();
+	}
+
+	private regeneratePluginsXcconfigFile(): IFuture<void> {
+		return (() => {
+			this.$fs.deleteFile(this.pluginsDebugXcconfigFilePath).wait();
+			this.$fs.deleteFile(this.pluginsReleaseXcconfigFilePath).wait();
+
+			let allPlugins: IPluginData[] = (<IPluginsService>this.$injector.resolve("pluginsService")).getAllInstalledPlugins().wait();
+			for (let plugin of allPlugins) {
+				let pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+				let pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, "build.xcconfig");
+				if (this.$fs.exists(pluginXcconfigFilePath).wait()) {
+					this.mergeXcconfigFiles(pluginXcconfigFilePath, this.pluginsDebugXcconfigFilePath).wait();
+					this.mergeXcconfigFiles(pluginXcconfigFilePath, this.pluginsReleaseXcconfigFilePath).wait();
+				}
+			}
+
+			let podFolder = path.join(this.platformData.projectRoot, "Pods/Target Support Files/Pods/");
+			if (this.$fs.exists(podFolder).wait()) {
+				this.mergeXcconfigFiles(path.join(this.platformData.projectRoot, "Pods/Target Support Files/Pods/Pods.debug.xcconfig"), this.pluginsDebugXcconfigFilePath).wait();
+				this.mergeXcconfigFiles(path.join(this.platformData.projectRoot, "Pods/Target Support Files/Pods/Pods.release.xcconfig"), this.pluginsReleaseXcconfigFilePath).wait();
+			}
+		}).future<void>()();
 	}
 }
 

lib/services/ios-project-service.ts

@@ -276,7 +276,7 @@ export class PlatformService implements IPlatformService {
 			this.$devicesServices.initialize({platform: platform, deviceId: this.$options.device}).wait();
 			let action = (device: Mobile.IDevice): IFuture<void> => {
 				return (() => {
-					platformData.platformProjectService.deploy(device, this.$projectData.projectId).wait();
+					platformData.platformProjectService.deploy(device.deviceInfo.identifier).wait();
 					device.deploy(packageFile, this.$projectData.projectId).wait();
 
 					if (!this.$options.justlaunch) {
@@ -301,6 +301,9 @@ export class PlatformService implements IPlatformService {
 			emulatorServices.checkAvailability().wait();
 			emulatorServices.checkDependencies().wait();
 
+			let emulatorId = emulatorServices.getEmulatorId().wait();
+			platformData.platformProjectService.deploy(emulatorId).wait();
+
 			if(!this.$options.availableDevices) {
 				this.buildPlatform(platform, buildConfig).wait();
 

lib/services/platform-service.ts

@@ -201,7 +201,7 @@ export class PluginsService implements IPluginsService {
 
 	public getAllInstalledPlugins(): IFuture<IPluginData[]> {
 		return (() => {
-			let nodeModules = this.getAllInstalledModules().wait();
+			let nodeModules = this.getAllInstalledModules().wait().map(nodeModuleData => this.convertToPluginData(nodeModuleData));
 			return _.filter(nodeModules, nodeModuleData => nodeModuleData && nodeModuleData.isPlugin);
 		}).future<IPluginData[]>()();
 	}

lib/services/plugins-service.ts

@@ -325,7 +325,7 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 	afterPrepareAllPlugins(): IFuture<void> {
 		return Future.fromResult();
 	}
-	deploy(device: Mobile.IAndroidDevice, appIdentifier: string): IFuture<void> {
+	deploy(deviceIdentifier: string): IFuture<void> {
 		return Future.fromResult();
 	}
 }