Merge pull request #1240 from NativeScript/remove-ant

teobugslayer · teobugslayer · commit 9f778613fffd · 2016-01-19T16:08:49.000+02:00
Remove library add command
diff --git a/README.md b/README.md
@@ -268,7 +268,6 @@ Run `tns help` to view all available commands in the browser. Run `tns help <Com
 * `platform add <Platform>` adds a new target platform to your project.
 * `platform remove <Platform>` removes the selected platform from the target platforms of the project.
 * `platform update <Platform>` updates the NativeScript runtime for the specified platform.
-* `library add <Platform> <Library Dir>` adds all libraries in the stated directory (Library Dir).
 * `prepare <Platform>` copies cross-platform and selected platform-specific content to the subdirectory for the target platform.
 * `build <Platform>` builds the project for the selected target platform.
 * `emulate <Platform>` builds the project for the selected target platform and runs it in the native emulator, if configured.
diff --git a/docs/man_pages/lib-management/library-add.md b/docs/man_pages/lib-management/library-add.md
diff --git a/docs/man_pages/lib-management/library.md b/docs/man_pages/lib-management/library.md
diff --git a/docs/man_pages/lib-management/plugin-add.md b/docs/man_pages/lib-management/plugin-add.md
@@ -26,8 +26,6 @@ General | `$ tns plugin add <Plugin>`
 
 Command | Description
 ----------|----------
-[library](library.html) | You must run the library command with a related command.
-[library add](library-add.html) | Adds a native library to the current project.
 [plugin](plugin.html) | Lets you manage the plugins for your project.
 [plugin remove](plugin-remove.html) | Uninstalls the specified plugin and its dependencies.
 <% } %>
diff --git a/docs/man_pages/lib-management/plugin-remove.md b/docs/man_pages/lib-management/plugin-remove.md
@@ -17,8 +17,6 @@ General | `$ tns plugin remove <Plugin>`
 
 Command | Description
 ----------|----------
-[library](library.html) | You must run the library command with a related command.
-[library add](library-add.html) | Adds a native library to the current project.
 [plugin](plugin.html) | Lets you manage the plugins for your project.
 [plugin add](plugin-add.html) | Installs the specified plugin and its dependencies.
 <% } %>
diff --git a/docs/man_pages/lib-management/plugin.md b/docs/man_pages/lib-management/plugin.md
@@ -18,8 +18,6 @@ Lets you manage the plugins for your project.
 
 Command | Description
 ----------|----------
-[library](library.html) | You must run the library command with a related command.
-[library add](library-add.html) | Adds a native library to the current project.
 [plugin add](plugin-add.html) | Installs the specified plugin and its dependencies.
 [plugin remove](plugin-remove.html) | Uninstalls the specified plugin and its dependencies.
 <% } %>
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -31,7 +31,6 @@ $injector.requireCommand("platform|*list", "./commands/list-platforms");
 $injector.requireCommand("platform|add", "./commands/add-platform");
 $injector.requireCommand("platform|remove", "./commands/remove-platform");
 $injector.requireCommand("platform|update", "./commands/update-platform");
-$injector.requireCommand("library|add", "./commands/add-library");
 $injector.requireCommand("run|ios", "./commands/run");
 $injector.requireCommand("run|android", "./commands/run");
 
diff --git a/lib/commands/add-library.ts b/lib/commands/add-library.ts
diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts
@@ -13,7 +13,6 @@ interface IPlatformService {
 	deployOnEmulator(platform: string, buildConfig?: IBuildConfig): IFuture<void>;
 	validatePlatformInstalled(platform: string): void;
 	validatePlatform(platform: string): void;
-	addLibrary(platform: string, libraryPath: string): IFuture<void>;
 
 	getLatestApplicationPackageForDevice(platformData: IPlatformData): IFuture<IApplicationPackage>;
 	getLatestApplicationPackageForEmulator(platformData: IPlatformData): IFuture<IApplicationPackage>;
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -64,7 +64,6 @@ interface IPlatformProjectService {
 	prepareProject(): IFuture<void>;
 	prepareAppResources(appResourcesDirectoryPath: string): IFuture<void>;
 	isPlatformPrepared(projectRoot: string): IFuture<boolean>;
-	addLibrary(libraryPath: string): IFuture<void>;
 	canUpdatePlatform(currentVersion: string, newVersion: string): IFuture<boolean>;
 	/**
 	* Provides a platform specific update logic for the specified runtime versions.
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -246,22 +246,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return this.$fs.exists(path.join(this.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME));
 	}
 
-	public addLibrary(libraryPath: string): IFuture<void> {
-		return (() => {
-			if(this.$fs.exists(path.join(libraryPath, "project.properties")).wait()) {
-				this.$errors.failWithoutHelp("Unable to add android library. You can use `library add` command only with path to folder containing one or more .jar files.");
-			}
-
-			let name = path.basename(libraryPath);
-			let targetLibPath = this.getLibraryPath(name);
-
-			let targetPath = path.dirname(targetLibPath);
-			this.$fs.ensureDirectoryExists(targetPath).wait();
-
-			shell.cp("-f", path.join(libraryPath, "*.jar"), targetPath);
-		}).future<void>()();
-	}
-
 	public getFrameworkFilesExtensions(): string[] {
 		return [".jar", ".dat"];
 	}
@@ -360,10 +344,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}).future<boolean>()();
 	}
 
-	private getLibraryPath(libraryName: string): string {
-		 return path.join(this.$projectData.projectDir, "lib", this.platformData.normalizedPlatformName, libraryName);
-	}
-
 	private copy(projectRoot: string, frameworkDir: string, files: string, cpArg: string): void {
 		let paths = files.split(' ').map(p => path.join(frameworkDir, p));
 		shell.cp(cpArg, paths, projectRoot);
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -247,17 +247,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		return this.$fs.exists(path.join(projectRoot, this.$projectData.projectName, constants.APP_FOLDER_NAME));
 	}
 
-	public addLibrary(libraryPath: string): IFuture<void> {
-		return (() => {
-			let extension = path.extname(libraryPath);
-			if (extension === ".framework") {
-				this.addDynamicFramework(libraryPath).wait();
-			} else {
-				this.$errors.failWithoutHelp(`The bundle at ${libraryPath} does not appear to be a dynamic framework package.`);
-			}
-		}).future<void>()();
-	}
-
 	public deploy(deviceIdentifier: string): IFuture<void> {
 		return Future.fromResult();
 	}
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -504,17 +504,6 @@ export class PlatformService implements IPlatformService {
 		}
 	}
 
-	public addLibrary(platform: string, libraryPath: string): IFuture<void> {
-		return (() => {
-			if (!this.$fs.exists(libraryPath).wait()) {
-				this.$errors.failWithoutHelp("The path %s does not exist", libraryPath);
-			} else {
-				let platformData = this.$platformsData.getPlatformData(platform);
-				platformData.platformProjectService.addLibrary(libraryPath).wait();
-			}
-		}).future<void>()();
-	}
-
 	public ensurePlatformInstalled(platform: string): IFuture<void> {
 		return (() => {
 			if(!this.isPlatformInstalled(platform).wait()) {
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -324,9 +324,6 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 	isPlatformPrepared(projectRoot: string): IFuture<boolean> {
 		return Future.fromResult(false);
 	}
-    addLibrary(libraryPath: string): IFuture<void> {
-        return Future.fromResult();
-    }
 	canUpdatePlatform(currentVersion: string, newVersion: string): IFuture<boolean> {
 		return Future.fromResult(false);
 	}
