Skip to content

Merge appbuilder branch for 1.7.1 in release #1750

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
rosen-vladimirov merged 11 commits into from
May 11, 2016
Merged

Merge appbuilder branch for 1.7.1 in release #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ef11930
Use baseConfig when merging Info.plist files
rosen-vladimirov Mar 31, 2016
a598b12
Disable analytics in AppBuilder
rosen-vladimirov Mar 31, 2016
feb517f
Merge pull request #1660 from NativeScript/vladimirov/appbuilder-fixes
rosen-vladimirov Mar 31, 2016
446ff59
Introduce `hooks` option
rosen-vladimirov Apr 6, 2016
9640dbe
Merge pull request #1669 from NativeScript/vladimirov/no-hooks
rosen-vladimirov Apr 6, 2016
f3ba2ce
Include custom platform template when using tns init -f
TsvetanMilanov Apr 20, 2016
2496937
Merge pull request #1700 from NativeScript/milanov/include-custom-pla…
TsvetanMilanov Apr 21, 2016
ccd7ec2
Include custom platform template when using tns init
TsvetanMilanov Apr 26, 2016
eacad19
Merge pull request #1716 from NativeScript/milanov/include-custom-pla…
TsvetanMilanov Apr 26, 2016
d1cdf14
Merge 1.7.1-appbuilder into vladimirov/merge-appbuilder-1.7.1
rosen-vladimirov May 11, 2016
66cfb96
Allow analytics
rosen-vladimirov May 11, 2016
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
4 changes: 2 additions & 2 deletions lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
public ensureConfigurationFileInAppResources(): IFuture<void> {
return (() => {
let projectDir = this.$projectData.projectDir;
let infoPlistPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
let infoPlistPath = this.$options.baseConfig || path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);

if (!this.$fs.exists(infoPlistPath).wait()) {
// The project is missing Info.plist, try to populate it from the project template.
Expand All @@ -444,7 +444,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
private mergeInfoPlists(): IFuture<void> {
return (() => {
let projectDir = this.$projectData.projectDir;
let infoPlistPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
let infoPlistPath = this.$options.baseConfig || path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
this.ensureConfigurationFileInAppResources().wait();

if (!this.$fs.exists(infoPlistPath).wait()) {
Expand Down
4 changes: 2 additions & 2 deletions lib/services/platform-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,11 @@ export class PlatformService implements IPlatformService {
let excludedDirs = [constants.APP_RESOURCES_FOLDER_NAME];
this.$projectFilesManager.processPlatformSpecificFiles(directoryPath, platform, excludedDirs).wait();

this.applyBaseConfigOption(platformData).wait();

// Process configurations files from App_Resources
platformData.platformProjectService.processConfigurationFilesFromAppResources().wait();

this.applyBaseConfigOption(platformData).wait();

// Replace placeholders in configuration files
platformData.platformProjectService.interpolateConfigurationFile().wait();

Expand Down