From 7aa09b81da332416a7698660bda86002d6108654 Mon Sep 17 00:00:00 2001 From: "shingil.kang" Date: Wed, 13 Nov 2013 12:37:26 +0900 Subject: [PATCH] CLI : added output option to auto completion module and fixed getting current working directory added '--output' and '-out' to auto completion list. fixed getting current working path as folder including CLI library. Change-Id: I39b4e18c4c37e2acd1813382a891ff8c8f217f3f Signed-off-by: shingil.kang --- .../src/org/tizen/ncli/ide/autocomplete/TizenAutoComplete.java | 2 +- org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateProjectCLI.java | 3 ++- .../src/org/tizen/ncli/ide/subcommands/CreateProjectCommandData.java | 2 +- .../src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/autocomplete/TizenAutoComplete.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/autocomplete/TizenAutoComplete.java index 228e9ba..07276f3 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/autocomplete/TizenAutoComplete.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/autocomplete/TizenAutoComplete.java @@ -45,7 +45,7 @@ public class TizenAutoComplete { { "run", "--target" }, { "debug", "--target" } }; public static String[][] optionsForSub = { - { "project", "-t --type -n --name" }, + { "project", "-t --type -n --name -out --output" }, { "security-profile", "--kind --active" }, { "security-profile-item", "--kind --cert --passwd --ca --rootca" }, { "certificate", diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateProjectCLI.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateProjectCLI.java index c77563e..e43e0c4 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateProjectCLI.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateProjectCLI.java @@ -71,8 +71,9 @@ public class CreateProjectCLI extends AbstractCLI CreateWebProjectCommand webCommand = new CreateWebProjectCommand(); webCommand.setAppType(appType); webCommand.setProjectName(projectName); + webCommand.setOutputName(currentWorkspacePath); if(outputName != null) - webCommand.setOutputName(outputName); + webCommand.setOutputName(outputName); webCommand.runCommand(); break; default: diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateProjectCommandData.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateProjectCommandData.java index 0c1f1c6..a820ddf 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateProjectCommandData.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateProjectCommandData.java @@ -58,7 +58,7 @@ public class CreateProjectCommandData private TizenAppType appType; private String projectName; - private String outputName = System.getProperty("user.dir"); + private String outputName = ""; private static TizenAppTemplate tizenAppTemplate; diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java index 642a722..f772a6b 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/CreateWebProjectCommand.java @@ -794,8 +794,6 @@ class ProjectGenUtil { String jarPath = urlPath.replaceAll("file:", "").substring(0, urlPath.lastIndexOf(WebConstant.BUILTIN_TEMPLATE_LIBRARIES_FOLDER) - 7); - System.out.println("jar path = " + jarPath); - String destDirPath = jarPath + "_dir"; // make it if the destination directory is not created. -- 2.7.4