From: hyunsik.noh Date: Fri, 22 Nov 2013 02:24:03 +0000 (+0900) Subject: CLI: Change currentWorkspacePath variable and set alias. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F12736%2F1;p=sdk%2Ftools%2Fcli.git CLI: Change currentWorkspacePath variable and set alias. Change currentWorkspacePath type from String to File Set alias "DA" for "Dynamic Analyzer" Change-Id: I4b93d94cb67e42ab747a55e27836e5c5acca825f Signed-off-by: hyunsik.noh --- 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 1858c86..2f048f9 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 @@ -75,7 +75,7 @@ public class TizenAutoComplete { public enum optionSuggestion { architecture(options[1][0], "--arch", "x86 arm"), compiler(options[1][0], "--compiler", "llvm gcc"), - configuration(options[1][0], "--configuration", "Debug Release Dynamic Analyzer"), + configuration(options[1][0], "--configuration", "Debug Release DA"), template("-t"); private String mainCmd; diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/AbstractCLI.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/AbstractCLI.java index c270a3b..f11666c 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/AbstractCLI.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/AbstractCLI.java @@ -43,7 +43,7 @@ public abstract class AbstractCLI { public File workingDir; @Option(hidden=true,name = "--current-workspace-path", metaVar = "current workspace path", usage = "Specify where is the root path for the command as a default") - public String currentWorkspacePath; + public File currentWorkspacePath; protected PrintWriter output = new PrintWriter(System.out);; diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildNativeCLI.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildNativeCLI.java index 5cab5f6..91e0c9d 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildNativeCLI.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildNativeCLI.java @@ -36,17 +36,20 @@ import org.tizen.ncli.ide.subcommands.BuildNativeCLICommand; public class BuildNativeCLI extends AbstractCLI { private Logger log = LoggerFactory.getLogger(getClass()); - @Option(name = "--arch", depends="--compiler", metaVar = "x86 | arm", usage = "architecture type") + @Option(name = "--arch", depends="--compiler", metaVar = "x86 | arm", usage = "Architecture for build result") private String architecture; - @Option(name = "--compiler", depends="--arch", metaVar = "gcc | llvm", usage = "compiler type") + @Option(name = "--compiler", depends="--arch", metaVar = "gcc | llvm", usage = "Compiler for build result") private String compiler; - @Option(name = "--configuration", metaVar = "Debug | Release | Dynamic Analyzer", usage = "") + @Option(name = "--configuration", metaVar = "Debug | Release | DA", usage = "Configuration for build result") private String configuration; @Option(name = "--predefine-option", usage = "") private String predefineOption; + + private static final String DA = "DA"; + private static final String DA_ORIGIN = "Dynamic Analyzer"; /* * (non-Javadoc) @@ -59,11 +62,10 @@ public class BuildNativeCLI extends AbstractCLI { BuildNativeCLICommand command = new BuildNativeCLICommand(); - command.setWorkingDir(workingDir); - command.setCurrentWorkspacePath(currentWorkspacePath); + command.setWorkingDir(workingDir == null ? currentWorkspacePath : workingDir); command.setArchitecture(architecture); command.setCompiler(compiler); - command.setConfiguration(configuration); + command.setConfiguration(DA.equals(configuration) ? DA_ORIGIN : configuration); command.setPredefineOption(predefineOption); BuildNative runCommand = command.runCommand(); diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildWebCLI.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildWebCLI.java index 4e5fe19..8d8d195 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildWebCLI.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildWebCLI.java @@ -35,7 +35,7 @@ public class BuildWebCLI extends AbstractCLI { BuildWebCLICommand command = new BuildWebCLICommand(); if( null == workingDir && null != currentWorkspacePath) { - workingDir = new File(currentWorkspacePath); + workingDir = currentWorkspacePath; }else { workingDir = cwd; } diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateWebProjectCLI.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateWebProjectCLI.java index 927ffee..3ca93f1 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateWebProjectCLI.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateWebProjectCLI.java @@ -72,19 +72,13 @@ public class CreateWebProjectCLI extends AbstractCLI webCommand.setProjectName(projectName); // set output directory - if (workingDir != null) + try { - try - { - webCommand.setOutputName(workingDir.getCanonicalPath()); - } catch (IOException e) - { - logger.error(e.getMessage()); - } - } - else + File outputDirectory = (workingDir != null ? workingDir : currentWorkspacePath); + webCommand.setOutputName(outputDirectory.getCanonicalPath()); + } catch (IOException e) { - webCommand.setOutputName(currentWorkspacePath); + logger.error(e.getMessage()); } webCommand.runCommand(); diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/AbstractSubCommand.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/AbstractSubCommand.java index 1748e6e..1294798 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/AbstractSubCommand.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/AbstractSubCommand.java @@ -34,7 +34,6 @@ import org.tizen.common.config.provider.SystemPropertiesProvider; import org.tizen.ncli.ide.CLIConstant; import org.tizen.ncli.ide.core.config.NCLIConfigLoader; import org.tizen.ncli.ide.core.config.TizenCLIConfigProvider; -import org.tizen.ncli.ide.exec.NewCommandLineExecutor; /** * This class provides common environment to other SubCommand. @@ -52,12 +51,6 @@ abstract public class AbstractSubCommand { this.workingDir = targetPath; } - protected String currentWorkspacePath; - - public void setCurrentWorkspacePath(String currentWorkspacePath) { - this.currentWorkspacePath = currentWorkspacePath; - } - /** * This method is called by CLI entry class. *

diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/BuildNativeCLICommand.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/BuildNativeCLICommand.java index abfed7a..1a6a869 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/BuildNativeCLICommand.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/BuildNativeCLICommand.java @@ -46,9 +46,9 @@ public class BuildNativeCLICommand extends AbstractSubCommand { private String buildPath = null; private String dataPath = null; - private String toolchainId = null; - private String platformId = null; - private String targetId = null; + public String toolchainId = null; + public String platformId = null; + public String targetId = null; private String HEADLESS_CMD = "%s/eclipse -nosplash --launcher.suppressErrors -application org.eclipse.cdt.managedbuilder.core.headlessbuild " + "-import %s " @@ -161,11 +161,10 @@ public class BuildNativeCLICommand extends AbstractSubCommand { sbi = SmartBuildInterface.getInstance(); idePath = InstallPathConfig.getSDKPath() + File.separatorChar + "ide"; - - if (workingDir == null) { - importPath = currentWorkspacePath; - } else { - importPath = workingDir.getAbsolutePath(); + try { + importPath = workingDir.getCanonicalPath(); + } catch (IOException e) { + e.printStackTrace(); } if(!isVaildImportPathAndConfiguration(importPath, configuration)) {