From f4ffd311e0c9c4918344b2999d47da7aca3e5a9b Mon Sep 17 00:00:00 2001 From: "donghyuk.yang" Date: Mon, 10 Jun 2013 17:28:34 +0900 Subject: [PATCH] [Title] Applied changing installer for multi-SDK --- .../nativeplatform/rootstrap/RootstrapManager.java | 16 ++++++++++++---- .../org/tizen/nativeplatform/util/InstallerUtil.java | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/InstallerUtil.java diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/RootstrapManager.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/RootstrapManager.java index b179194..2eeebb7 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/RootstrapManager.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/rootstrap/RootstrapManager.java @@ -66,6 +66,7 @@ import org.tizen.nativeplatform.build.PlatformConfigurationManager; import org.tizen.nativeplatform.preferences.PreferencesManager; import org.tizen.nativeplatform.repository.RepoManager; import org.tizen.nativeplatform.util.CommandLauncher; +import org.tizen.nativeplatform.util.InstallerUtil; import org.tizen.nativeplatform.views.model.PlatformRootstrap; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -831,9 +832,16 @@ public class RootstrapManager { } private static String getRootstrapPathOfXml(String path) { - return path.replaceAll(String.format("%s/", InstallPathConfig.getSDKPath()), - "#{SBI_HOME}/../../").replaceAll( - String.format("%s/", InstallPathConfig.getUserDataPath()), - "#{HOME}/tizen-sdk-data/"); + if (InstallerUtil.isSupportedMultipleSDK()) { + return path.replaceAll(String.format("%s/", InstallPathConfig.getSDKPath()), + "#{SDK_INSTALLED_PATH}/").replaceAll( + String.format("%s/", InstallPathConfig.getUserDataPath()), + "#{SDK_DATA_PATH}/"); + } else { + return path.replaceAll(String.format("%s/", InstallPathConfig.getSDKPath()), + "#{SBI_HOME}/../../").replaceAll( + String.format("%s/", InstallPathConfig.getUserDataPath()), + "#{HOME}/tizen-sdk-data/"); + } } } diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/InstallerUtil.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/InstallerUtil.java new file mode 100644 index 0000000..9c8d7a7 --- /dev/null +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/util/InstallerUtil.java @@ -0,0 +1,17 @@ +package org.tizen.nativeplatform.util; + +import java.io.File; + +import org.tizen.common.core.application.InstallPathConfig; + +public class InstallerUtil { + + private final static String SDK_INFO_FILE = "sdk.info"; + + public static boolean isSupportedMultipleSDK() { + String sdkPath = InstallPathConfig.getSDKPath(); + String sdkInfoFile = sdkPath + File.separator + SDK_INFO_FILE; + File file = new File(sdkInfoFile); + return file.exists(); + } +} -- 2.7.4