From f48b49281a42bf8f6e7db2cca98f0a8e90dfd20f Mon Sep 17 00:00:00 2001 From: "yongsung1.kim" Date: Tue, 15 Oct 2013 15:44:37 +0900 Subject: [PATCH] [Title] Fix bug that 'tizen-sdk-data' is wrong position under local app. Change-Id: Iba7a5551646f444c006e4bbb11d09bd40453ca7b --- .../src/org/tizen/installmanager/cli/CliInstall.java | 1 + InstallManager_java/src/org/tizen/installmanager/lib/Registry.java | 7 ++++--- package/install-manager.install.windows | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java index 918b3ea..359dd85 100644 --- a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java +++ b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java @@ -97,6 +97,7 @@ public class CliInstall { if (packageNames.contains("all")) { if (checkAvailableSize(getAllPackages(), targetDir)) { + Log.log("Select all installable packages. installmanager package will make sdk.info using install script."); return installPackages(pm.diff(getAllPackages(), skipPackages), targetDir); } } else if (!validateInstallPkgs(pm, packageNames)) { diff --git a/InstallManager_java/src/org/tizen/installmanager/lib/Registry.java b/InstallManager_java/src/org/tizen/installmanager/lib/Registry.java index 484ed99..b0bd66c 100644 --- a/InstallManager_java/src/org/tizen/installmanager/lib/Registry.java +++ b/InstallManager_java/src/org/tizen/installmanager/lib/Registry.java @@ -471,6 +471,10 @@ public class Registry { String sdkInfoPath = PathUtil.get(installPath, InstallManagerConstants.SDK_INFORMATION_FILE_NAME); String target = INSTALLED_PATH_KEY + REGISTRY_SEPERATOR + installPath; String workSpace = SDK_DATA_PATH_KEY + REGISTRY_SEPERATOR + sdkDataPath; + + Log.log("sdk.info file configuration."); + Log.log("Target directory : " + installPath); + Log.log("SDK data path : " + sdkDataPath); File sdkInfoFile = null; try { @@ -492,16 +496,13 @@ public class Registry { bw.newLine(); bw.write(workSpace); bw.flush(); - } catch (IOException e) { Log.err("Cannot register to file. " + sdkInfoFile.getAbsolutePath()); throw new IMFatalException(ErrorCode.CANNOT_REGISTER_TARGET_DIR); - } finally { if (bw != null) { try { bw.close(); - } catch (IOException e) { Log.ExceptionLog(e); } diff --git a/package/install-manager.install.windows b/package/install-manager.install.windows index e17f041..b07158a 100644 --- a/package/install-manager.install.windows +++ b/package/install-manager.install.windows @@ -23,5 +23,5 @@ if exist %CONFIG_FILE% ( ) else ( echo %CONFIG_FILE% does not exists. echo TIZEN_SDK_INSTALLED_PATH=%INSTALLED_PATH%>> %CONFIG_FILE% - echo TIZEN_SDK_DATA_PATH=%localappdata%\tizen-sdk-data>> %CONFIG_FILE% + echo TIZEN_SDK_DATA_PATH=c:\tizen-sdk-data>> %CONFIG_FILE% ) -- 2.7.4