Skip to content

Commit 7a9998d

Browse files
Cherry pick commits from release branch (#3221)
* Remove iOS static library verification (#3169) It tries to predict a linker error and stop earlier, but there are cases where it fails to do so correctly. We now start building without any preliminary checks on libraries and let it fail with whatever error it does. fixes #2967 * Update Changelog for 3.3.1 release
1 parent 66c21c2 commit 7a9998d

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
NativeScript CLI Changelog
22
================
33

4-
3.3.0 (2017, July 25)
4+
3.3.1 (2017, November 17)
5+
### Fixed
6+
* [Fixed #3164](https://github.com/NativeScript/nativescript-cli/issues/3164): `npm run build-*-bundle` gets stuck at nativescript-unit-test-runner hook.
7+
* [Fixed #3182](https://github.com/NativeScript/nativescript-cli/issues/3182): CLI fails when unable to start Analytics Broker process.
8+
9+
3.3.0 (2017, October 26)
510
==
611

712
### New

lib/services/ios-project-service.ts

-16
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
582582
}
583583

584584
private async addStaticLibrary(staticLibPath: string, projectData: IProjectData): Promise<void> {
585-
await this.validateStaticLibrary(staticLibPath);
586585
// Copy files to lib folder.
587586
const libraryName = path.basename(staticLibPath, ".a");
588587
const headersSubpath = path.join(path.dirname(staticLibPath), "include", libraryName);
@@ -1031,21 +1030,6 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
10311030
}
10321031
}
10331032

1034-
private async validateStaticLibrary(libraryPath: string): Promise<void> {
1035-
if (path.extname(libraryPath) !== ".a") {
1036-
this.$errors.failWithoutHelp(`The bundle at ${libraryPath} does not contain a valid static library in the '.a' file format.`);
1037-
}
1038-
1039-
const expectedArchs = ["armv7", "arm64", "i386"];
1040-
const archsInTheFatFile = await this.$childProcess.exec("lipo -i " + libraryPath);
1041-
1042-
expectedArchs.forEach(expectedArch => {
1043-
if (archsInTheFatFile.indexOf(expectedArch) < 0) {
1044-
this.$errors.failWithoutHelp(`The static library at ${libraryPath} is not built for one or more of the following required architectures: ${expectedArchs.join(", ")}. The static library must be built for all required architectures.`);
1045-
}
1046-
});
1047-
}
1048-
10491033
private replaceFileContent(file: string, projectData: IProjectData): void {
10501034
const fileContent = this.$fs.readText(file);
10511035
const replacedContent = helpers.stringReplaceAll(fileContent, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, projectData.projectName);

0 commit comments

Comments
 (0)