Skip to content

Allow build.xcconfig in app/App_Resources/iOS/build.xcconfig #1547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PanayotCankov merged 1 commit into from
Feb 26, 2016
Merged

Allow build.xcconfig in app/App_Resources/iOS/build.xcconfig #1547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
public processConfigurationFilesFromAppResources(): IFuture<void> {
return (() => {
this.mergeInfoPlists().wait();
this.mergeProjectXcconfigFiles().wait();
_(this.getAllInstalledPlugins().wait())
.map(pluginData => this.$pluginVariablesService.interpolatePluginVariables(pluginData, this.platformData.configurationFilePath).wait())
.value();
Expand Down Expand Up @@ -565,8 +566,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ

this.executePodInstall().wait();
}

this.regeneratePluginsXcconfigFile().wait();
}).future<void>()();
}

Expand Down Expand Up @@ -778,7 +777,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
}).future<void>()();
}

private regeneratePluginsXcconfigFile(): IFuture<void> {
private mergeProjectXcconfigFiles(): IFuture<void> {
return (() => {
this.$fs.deleteFile(this.pluginsDebugXcconfigFilePath).wait();
this.$fs.deleteFile(this.pluginsReleaseXcconfigFilePath).wait();
Expand All @@ -793,6 +792,12 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
}
}

let appResourcesXcconfigPath = path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, "build.xcconfig");
if (this.$fs.exists(appResourcesXcconfigPath).wait()) {
this.mergeXcconfigFiles(appResourcesXcconfigPath, this.pluginsDebugXcconfigFilePath).wait();
this.mergeXcconfigFiles(appResourcesXcconfigPath, 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();
Expand Down