Skip to content

Output ios libraries in lib/iOS insted lib/iOS/libraryName folder #799

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
Fatme merged 1 commit into from
Aug 17, 2015
Merged

Output ios libraries in lib/iOS insted lib/iOS/libraryName folder #799

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
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 @@ -182,7 +182,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
var umbrellaHeader = this.getUmbrellaHeaderFromDynamicFramework(libraryPath).wait();

let frameworkName = path.basename(libraryPath, path.extname(libraryPath));
let targetPath = path.join("lib", this.platformData.normalizedPlatformName, frameworkName);
let targetPath = path.join("lib", this.platformData.normalizedPlatformName);
let fullTargetPath = path.join(this.$projectData.projectDir, targetPath);
this.$fs.ensureDirectoryExists(fullTargetPath).wait();
shell.cp("-R", libraryPath, fullTargetPath);
Expand Down Expand Up @@ -273,7 +273,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase

private getFrameworkRelativePath(libraryPath: string): string {
let frameworkName = path.basename(libraryPath, path.extname(libraryPath));
let targetPath = path.join("lib", this.platformData.normalizedPlatformName, frameworkName);
let targetPath = path.join("lib", this.platformData.normalizedPlatformName);
let frameworkPath = path.relative("platforms/ios", path.join(targetPath, frameworkName + ".framework"));
return frameworkPath;
}
Expand Down