[Title] sync express, normal, cli wizard logic

[Type]
[Module]
[Priority]
[Jira#]
[Redmine#] 7888
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ic2c7413f08a84b03c3a7dd6d807079a6ceccb186

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java b/org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java
index 224bf92..060fc3f 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java
+++ b/org.tizen.cli/src/org/tizen/cli/exec/gen/CLIProjectGenerator.java
@@ -45,7 +45,6 @@ import org.tizen.nativecommon.templateengine.build.model.DevPackageModel;
 import org.tizen.nativecommon.templateengine.build.model.RootstrapModel;
 import org.tizen.nativecommon.templateengine.build.model.TargetModel;
 import org.tizen.nativecommon.templateengine.build.model.ToolchainModel;
-import org.tizen.nativecommon.templateengine.build.util.BuildPluginUtil;
 import org.tizen.nativecommon.templateengine.model.TizenTemplate;
 import org.tizen.nativecommon.templateengine.process.TizenProcessRunner;
 import org.tizen.nativecommon.templateengine.util.TemplateUtil;
@@ -112,6 +111,11 @@ public class CLIProjectGenerator extends AbstractProjectGenerator {
         return msg.replace(WHITE_SPACE, WHITE_SPACE_IN_CLI);
     }
     
+    
+    @Override
+    protected String getManifestAppId() {
+        return "$(APPID)";
+    }
     @Override
     public void pressDefaultPostValueStore(Map<String, String> valueStore, TizenTemplate template) throws TizenProcessFailureException {
         
@@ -261,10 +265,4 @@ public class CLIProjectGenerator extends AbstractProjectGenerator {
         template.setProperty(MACRO_PRJTYPE, projectType);
         template.setProperty(MACRO_TOOLCHAIN, toolChainName);
     }
-
-    @Override
-    protected String getRPathOption() {
-        String appInstPath = BuildPluginUtil.PATH_APP + "$(APPID)";
-        return BuildPluginUtil.OSP_LIB_RPATH_OPTION.replace("$(" + TizenTemplateEngine.MACRO_APP_INST_PATH + ")", appInstPath);
-    }
 }

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java b/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java
index 40a1ae5..2278e50 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java
+++ b/org.tizen.cli/src/org/tizen/cli/exec/gen/NativeMain.java
@@ -231,7 +231,6 @@ public class NativeMain extends AbstractLauncher {
         
         TizenTemplate template = new TizenTemplate("", binaryName, projectPath);
         Map<String, String> valueStore = new HashMap<String, String>();
-        TizenTemplateEngine.setRpathOption(valueStore, target, template);
         
         template.setProperty(TizenTemplate.PROPERTY_KEY_PROJECTTYPE, projectId);
         template.setProperty(TizenTemplate.PROPERTY_KEY_EMUL_TARGET, target);