Support xcconfig file from plugin - close #883

Author: jasssonpet

lib/services/ios-project-service.ts

@@ -144,6 +144,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	public buildProject(projectRoot: string): IFuture<void> {
 		return (() => {
 			let basicArgs = [
+				"-xcconfig", this.projectXcconfigFilePath,
 				"-configuration", this.$options.release ? "Release" : "Debug",
 				"build",
 				'SHARED_PRECOMPS_DIR=' + path.join(projectRoot, 'build', 'sharedpch')
@@ -161,7 +162,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			let args: string[] = [];
 			if(this.$options.forDevice) {
 				args = basicArgs.concat([
-					"-xcconfig", path.join(projectRoot, this.$projectData.projectName, "build.xcconfig"),
 					"-sdk", "iphoneos",
 					'ARCHS=armv7 arm64',
 					'VALID_ARCHS=armv7 arm64',
@@ -333,6 +333,10 @@ 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 replace(name: string): string {
 		if(_.startsWith(name, '"')) {
 			name = name.substr(1, name.length-2);
@@ -369,6 +373,7 @@ 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>()();
 	}
 
@@ -379,6 +384,7 @@ 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>()();
 	}
 
@@ -432,7 +438,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 			let packageType = this.$childProcess.exec(`/usr/libexec/PlistBuddy -c "Print :CFBundlePackageType" "${infoPlistPath}"`).wait().trim();
 			if (packageType !== "FMWK") {
-				this.$errors.failWithoutHelp("The bundle at %s does not appear to be a dynamic framework.", libraryPath);
+				this.$errors.failWithoutHelp("The bundle at %s does not appear to be a framework.", libraryPath);
 			}
 		}).future<void>()();
 	}
@@ -509,6 +515,17 @@ 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 xcconfigContent = this.$fs.readText(pluginXcconfigFilePath).wait();
+				let contentToWrite = this.buildXcconfigContent(pluginXcconfigFilePath, xcconfigContent);
+				this.$fs.appendFile(this.projectXcconfigFilePath, contentToWrite).wait();
+			}
+		}).future<void>()();
+	}
+
 	private removeFrameworks(pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			let project = this.createPbxProj();
@@ -556,6 +573,19 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
+	private removeXcconfigFile(pluginPlatformsFolderPath: string): IFuture<void> {
+		return (() => {
+			let pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, "build.xcconfig");
+			if(this.$fs.exists(pluginXcconfigFilePath).wait()) {
+				let xcconfigContent = this.$fs.readText(pluginXcconfigFilePath).wait();
+				let projectXcconfigFileContent = this.$fs.readText(this.projectXcconfigFilePath).wait();
+				let contentToRemove = this.buildXcconfigContent(pluginXcconfigFilePath, xcconfigContent);
+				projectXcconfigFileContent = helpers.stringReplaceAll(projectXcconfigFileContent, contentToRemove, "");
+				this.$fs.writeFile(this.projectXcconfigFilePath, projectXcconfigFileContent).wait();
+			}
+		}).future<void>()();
+	}
+
 	private buildPodfileContent(pluginPodFilePath: string, pluginPodFileContent: string): string {
 		return `# Begin Podfile - ${pluginPodFilePath} ${os.EOL} ${pluginPodFileContent} ${os.EOL} # End Podfile ${os.EOL}`;
 	}
@@ -575,6 +605,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		let modulemap = `module ${libraryName} { explicit module ${libraryName} { ${headers.join(" ")} } }`;
 		this.$fs.writeFile(path.join(headersFolderPath, "module.modulemap"), modulemap).wait();
 	}
+
+	private buildXcconfigContent(xcconfigFilePath: string, xcconfigFileContent: string): string {
+		return `${os.EOL}// Begin xcconfig - ${xcconfigFilePath} ${os.EOL} ${xcconfigFileContent} ${os.EOL} // End xcconfig ${os.EOL}`;
+	}
 }
 
 $injector.register("iOSProjectService", IOSProjectService);