base image option: add base image binary version to launch config file

Change-Id: Ia501bf5bdd53e1bedd864e72dd4c377a4e9b4306
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

diff --git a/src/org/tizen/emulator/manager/platform/BaseImage.java b/src/org/tizen/emulator/manager/platform/BaseImage.java
index e768dd9..68590d9 100644 (file)
--- a/src/org/tizen/emulator/manager/platform/BaseImage.java
+++ b/src/org/tizen/emulator/manager/platform/BaseImage.java
@@ -273,9 +273,9 @@ public class BaseImage {
                version = platform.getVersion();
                profile = platform.getProfile();
                type = "custom"; // TODO //$NON-NLS-1$
-               cpu     = findCpuTypeFromPath(); //$NON-NLS-1$
+               cpu     = findCpuTypeFromPath();
                skinShape = SKIN_SHAPE.NONE; // TODO
-               binaryVersion = ""; //$NON-NLS-1$
+               binaryVersion = "Custom"; //$NON-NLS-1$
                extension = platform.isChildPlatform()
                                ? platform.getPlugin().getAttribute(PluginStringResources.Extension)
                                : "";

diff --git a/src/org/tizen/emulator/manager/vms/Creator.java b/src/org/tizen/emulator/manager/vms/Creator.java
index 35eeb2c..e06c2ca 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/Creator.java
+++ b/src/org/tizen/emulator/manager/vms/Creator.java
@@ -305,7 +305,7 @@ public class Creator {
                ec.getBaseInformation().getDiskImage().getBaseDiskImage().setFormat("qcow2"); //$NON-NLS-1$
                ec.getBaseInformation().getDiskImage().getBaseDiskImage().setValue(newVM.baseImagePath);
 
-               if (!newVM.baseImage.getBinaryVersion().isEmpty()) {
+               if (newVM.baseImage.isStandard() && !newVM.baseImage.getBinaryVersion().isEmpty()) {
                        ec.getBaseInformation().getDiskImage().getBaseDiskImage().setVersion(newVM.baseImage.getBinaryVersion());
                }
                ec.getBaseInformation().getDiskImage().getCurrentDiskImage().setFormat("qcow2"); //$NON-NLS-1$

diff --git a/src/org/tizen/emulator/manager/vms/option/BaseImageOption.java b/src/org/tizen/emulator/manager/vms/option/BaseImageOption.java
index d2367fa..4049a72 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/BaseImageOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/BaseImageOption.java
@@ -36,7 +36,9 @@ public class BaseImageOption extends Option {
 
        @Override
        public void getLaunchArgument(LaunchConfig config, VMProperty property) {
-
+               if (property.getPropertyValue().baseImage != null) {
+                       config.addVariable(OPTION_KEY.VAR_IMAGE_VER, property.getPropertyValue().baseImage.getBinaryVersion());
+               }
                config.addVariableWithSpace(OPTION_KEY.VAR_DRIVE, "file=${vms_path}" + File.separator + "${vm_name}" //$NON-NLS-1$ //$NON-NLS-2$
                                + File.separator + "emulimg-${vm_name}." + varForm(OPTION_KEY.VAR_IMAGE_ARCH) //$NON-NLS-1$
                                + ",if=none,index=1,cache.no-flush=on"); //$NON-NLS-1$

diff --git a/src/org/tizen/emulator/manager/vms/option/OPTION_KEY.java b/src/org/tizen/emulator/manager/vms/option/OPTION_KEY.java
index 4838d28..dcb3f94 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/OPTION_KEY.java
+++ b/src/org/tizen/emulator/manager/vms/option/OPTION_KEY.java
@@ -58,7 +58,8 @@ public enum OPTION_KEY {
        VAR_STILL_IMAGE_PATH("still_image_path"), //$NON-NLS-1$
        VAR_PROFILE("profile"),
        VAR_WSI("wsi"),
-       VAR_SHARING_PATH("sharing_path");
+       VAR_SHARING_PATH("sharing_path"),
+       VAR_IMAGE_VER("image_ver");
 
        String variable;
        OPTION_KEY(String var) {