From beec3930ae1560ab6ee339b8f80f13fc06abfdb6 Mon Sep 17 00:00:00 2001 From: donghee yang Date: Tue, 6 Aug 2013 12:16:11 +0900 Subject: [PATCH] Revert "[Title] Change file path which is installmanager performance test result file path from applocal/tizen-sdk-data to c:\tizen-sdk-data by default on Windows. [Desc.] If user change tizen-sdk-data path, result file path would be changed also. [Issue] redmine" This reverts commit 90cd399174094c7b6503e33537d640d2fe6a07ad --- .../org/tizen/installmanager/cli/CliInstall.java | 2 +- .../tizen/installmanager/core/InstallManager.java | 2 +- .../core/InstallManagerConstants.java | 38 +--------------------- .../org/tizen/installmanager/core/Installer.java | 4 +-- .../tizen/installmanager/core/OptionConstant.java | 27 --------------- .../org/tizen/installmanager/core/Performance.java | 27 --------------- .../src/org/tizen/installmanager/lib/Registry.java | 8 ++--- 7 files changed, 9 insertions(+), 99 deletions(-) diff --git a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java index f1ca990..fd8f55a 100644 --- a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java +++ b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java @@ -90,7 +90,7 @@ public class CliInstall { PackageManager pm = PackageManager.getInstance(); String targetDir = getTargetDir(); - Registry.sdkDataPath = getSDKDataPath(); + Registry.sdkWorkSpacePath = getSDKDataPath(); Config.USER_CONFIG_HOME_PATH = getSDKDataPath(); PackageSet skipPackages = pm.getPackagesByNames(Options.skipPackages); diff --git a/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java b/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java index ee75987..823b9e4 100644 --- a/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java +++ b/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java @@ -441,7 +441,7 @@ public class InstallManager { */ private void setCurrentSDKEnvironment(String targetPath) { Log.log("Set new SDK environment from old SDK."); - Registry.sdkDataPath = Config.getConfigHome(); + Registry.sdkWorkSpacePath = Config.getConfigHome(); if (targetPath == null || targetPath.isEmpty()) { Log.err("Install path is invalid: " + targetPath diff --git a/InstallManager_java/src/org/tizen/installmanager/core/InstallManagerConstants.java b/InstallManager_java/src/org/tizen/installmanager/core/InstallManagerConstants.java index 9c9fdd9..de99c59 100644 --- a/InstallManager_java/src/org/tizen/installmanager/core/InstallManagerConstants.java +++ b/InstallManager_java/src/org/tizen/installmanager/core/InstallManagerConstants.java @@ -1,35 +1,7 @@ -/* -* InstallManager -* -* Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. -* -* Contact: -* Donghee Yang -* Shihyun Kim -* Yongsung kim -* - * Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Contributors: -* - S-Core Co., Ltd -* -*/ - package org.tizen.installmanager.core; import org.tizen.installmanager.lib.ErrorController.ErrorCode; import org.tizen.installmanager.lib.Platform; -import org.tizen.installmanager.lib.Registry; import org.tizen.installmanager.util.PathUtil; public class InstallManagerConstants { @@ -82,15 +54,7 @@ public class InstallManagerConstants { if (Platform.isLinux() || Platform.isMacOS()) { return PathUtil.getFromHome(SDK_DATA_DIR_NAME); } else if (Platform.isWindows()) { - if (Options.sdkDataPath.isEmpty() && Registry.sdkDataPath == "") { - return WINDOWS_DEFAULT_DATA_PATH; - } else if (!Options.sdkDataPath.isEmpty() && Registry.sdkDataPath == "") { - return Options.sdkDataPath; - } else if (Options.sdkDataPath.isEmpty() && Registry.sdkDataPath != "") { - return Registry.sdkDataPath; - } else { - throw new IMFatalException(ErrorCode.FILE_NOT_FOUND); - } + return PathUtil.getFromAppData(SDK_DATA_DIR_NAME); } else { throw new IMFatalException(ErrorCode.UNSUPPORTED_PLATFORM); } diff --git a/InstallManager_java/src/org/tizen/installmanager/core/Installer.java b/InstallManager_java/src/org/tizen/installmanager/core/Installer.java index 636746f..6877163 100644 --- a/InstallManager_java/src/org/tizen/installmanager/core/Installer.java +++ b/InstallManager_java/src/org/tizen/installmanager/core/Installer.java @@ -267,8 +267,8 @@ public class Installer { HashMap env = new HashMap(); env.put("INSTALLED_PATH", Registry.getInstalledPath()); - env.put("SDK_DATA_PATH", Registry.sdkDataPath); - env.put("USER_DATA_PATH", Registry.sdkDataPath); + env.put("SDK_DATA_PATH", Registry.sdkWorkSpacePath); + env.put("USER_DATA_PATH", Registry.sdkWorkSpacePath); env.put("MAKESHORTCUT_PATH", InstallManager.getInstance().getMakeShortCutPath()); env.put("REMOVE_SHORTCUT", InstallManager.getInstance().getRemoveShortCutPath()); env.put("TSUDO", InstallManager.getInstance().getTSudoPath()); diff --git a/InstallManager_java/src/org/tizen/installmanager/core/OptionConstant.java b/InstallManager_java/src/org/tizen/installmanager/core/OptionConstant.java index 492645a..5c5a7b2 100644 --- a/InstallManager_java/src/org/tizen/installmanager/core/OptionConstant.java +++ b/InstallManager_java/src/org/tizen/installmanager/core/OptionConstant.java @@ -1,30 +1,3 @@ -/* -* InstallManager -* -* Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. -* -* Contact: -* Donghee Yang -* Shihyun Kim -* Yongsung kim -* - * Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Contributors: -* - S-Core Co., Ltd -* -*/ - package org.tizen.installmanager.core; public class OptionConstant { diff --git a/InstallManager_java/src/org/tizen/installmanager/core/Performance.java b/InstallManager_java/src/org/tizen/installmanager/core/Performance.java index f9326aa..24aede6 100644 --- a/InstallManager_java/src/org/tizen/installmanager/core/Performance.java +++ b/InstallManager_java/src/org/tizen/installmanager/core/Performance.java @@ -1,30 +1,3 @@ -/* -* InstallManager -* -* Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. -* -* Contact: -* Donghee Yang -* Shihyun Kim -* Yongsung kim -* - * Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* Contributors: -* - S-Core Co., Ltd -* -*/ - package org.tizen.installmanager.core; import java.io.BufferedWriter; diff --git a/InstallManager_java/src/org/tizen/installmanager/lib/Registry.java b/InstallManager_java/src/org/tizen/installmanager/lib/Registry.java index 35c5805..48903d7 100644 --- a/InstallManager_java/src/org/tizen/installmanager/lib/Registry.java +++ b/InstallManager_java/src/org/tizen/installmanager/lib/Registry.java @@ -74,7 +74,7 @@ public class Registry { private static final String REGISTRY_SEPERATOR = "="; public static String targetPath = ""; - public static String sdkDataPath = ""; + public static String sdkWorkSpacePath = ""; private static ArrayList sdkPathList = getSDKPath(); /** @@ -242,7 +242,7 @@ public class Registry { public static void setSDKinfoBySDKPath(String sdkPath) { File sdkInfoFile = new File(PathUtil.get(sdkPath, InstallManagerConstants.SDK_INFORMATION_FILE_NAME)); if (sdkInfoFile.exists()) { - sdkDataPath = getPathFromRegistryKey(sdkInfoFile.getAbsolutePath(), SDK_DATA_PATH_KEY); + sdkWorkSpacePath = getPathFromRegistryKey(sdkInfoFile.getAbsolutePath(), SDK_DATA_PATH_KEY); Log.log("sdk.info file exists. => " + sdkPath); Log.log("InstallManager can set sdk environment."); } else { @@ -451,7 +451,7 @@ public class Registry { */ public static void saveSDKInfo(String installPath) { if (installPath == null || installPath.isEmpty() || - sdkDataPath == null || sdkDataPath.isEmpty()) { + sdkWorkSpacePath == null || sdkWorkSpacePath.isEmpty()) { Log.err("Install path or workspace path is invalid: " + installPath + ". This might be a bug of IM"); throw new IMFatalException(ErrorCode.INVALID_INSTALL_PATH); @@ -459,7 +459,7 @@ 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; + String workSpace = SDK_DATA_PATH_KEY + REGISTRY_SEPERATOR + sdkWorkSpacePath; File sdkInfoFile = null; try { -- 2.7.4