From 3e31bf5bb98680c13702d34e059067ffb2e3bde2 Mon Sep 17 00:00:00 2001 From: "hyunsik.noh" Date: Thu, 16 Jan 2014 21:22:13 +0900 Subject: [PATCH] CLI: Fix eclipse binary name depends on OS.(eclipse or eclipse.exe) Change-Id: I8bd07e2bfc5bcf092251b8f66f76119b713ba381 Signed-off-by: hyunsik.noh --- .../ncli/ide/subcommands/buildnative/BuildNativeCLICommand.java | 7 ++++++- .../tizen/ncli/ide/subcommands/buildnative/BuildNativeData.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/buildnative/BuildNativeCLICommand.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/buildnative/BuildNativeCLICommand.java index 6e0ea65..5871ae8 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/buildnative/BuildNativeCLICommand.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/buildnative/BuildNativeCLICommand.java @@ -42,6 +42,7 @@ import org.eclipse.osgi.util.NLS; import org.tizen.common.core.application.InstallPathConfig; import org.tizen.common.util.FileUtil; import org.tizen.common.util.HostUtil; +import org.tizen.common.util.OSChecker; import org.tizen.common.util.StringUtil; import org.tizen.nativecommon.build.CommonConfigurationManager; import org.tizen.nativecommon.build.SmartBuildInterface; @@ -155,7 +156,11 @@ public class BuildNativeCLICommand extends AbstractSubCommand { } private String makeBuildCommand(BuildNativeData data) { - String command = String.format(BuildNativeData.HEADLESS_CMD, data.getIdePath(), data.getImportPath(), data.getBuildPath(), data.getDataPath(), data.getTargetId()); + String eclipseBin = "eclipse"; + if(OSChecker.isWindows()) { + eclipseBin = eclipseBin + ".exe"; + } + String command = String.format(BuildNativeData.HEADLESS_CMD, eclipseBin, data.getIdePath(), data.getImportPath(), data.getBuildPath(), data.getDataPath(), data.getTargetId()); log.debug(command); return command; } diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/buildnative/BuildNativeData.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/buildnative/BuildNativeData.java index e56deaa..5c68e2a 100644 --- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/buildnative/BuildNativeData.java +++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/buildnative/BuildNativeData.java @@ -30,7 +30,7 @@ public class BuildNativeData { public static final String BIN_EXT = ".exe"; public static final String CPROJECT_EXT = ".cproject"; - public static final String HEADLESS_CMD = "%s/eclipse -nosplash --launcher.suppressErrors -application org.eclipse.cdt.managedbuilder.core.headlessbuild " + public static final String HEADLESS_CMD = "%s/%s -nosplash --launcher.suppressErrors -application org.eclipse.cdt.managedbuilder.core.headlessbuild " + "-import %s " + "-build %s " + "-data %s " -- 2.7.4