From: Atanas Gegov <[email protected]>
Extracted a method that gets the full path of the
environment-setup-* file.
---
.../src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git
a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
index 287de15..01b1288 100644
--- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
+++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
@@ -210,21 +210,25 @@ public class YoctoSDKUtils {
}
- public static void setEnvironmentVariables(IProject project,
YoctoUIElement elem) throws YoctoGeneralException{
- String sFileName;
- ICProjectDescription cpdesc =
CoreModel.getDefault().getProjectDescription(project, true);
-
+ private static String getEnvironmentSetupFileFullPath(YoctoUIElement
elem) {
+ String envSetupFile = "";
if (elem.getEnumPokyMode() ==
YoctoUIElement.PokyMode.POKY_SDK_MODE) {
- sFileName = elem.getStrToolChainRoot()+"/" +
YoctoSDKUtilsConstants.DEFAULT_ENV_FILE_PREFIX + elem.getStrTarget();
- }
- else {
+ envSetupFile = elem.getStrToolChainRoot() + "/";
+ } else {
//POKY TREE Mode
- sFileName = elem.getStrToolChainRoot() +
YoctoSDKUtilsConstants.DEFAULT_TMP_PREFIX +
-
YoctoSDKUtilsConstants.DEFAULT_ENV_FILE_PREFIX + elem.getStrTarget();
+ envSetupFile = elem.getStrToolChainRoot() +
YoctoSDKUtilsConstants.DEFAULT_TMP_PREFIX;
}
+ envSetupFile += YoctoSDKUtilsConstants.DEFAULT_ENV_FILE_PREFIX
+ elem.getStrTarget();
+ return envSetupFile;
+ }
+
+ public static void setEnvironmentVariables(IProject project,
YoctoUIElement elem) throws YoctoGeneralException {
+ ICProjectDescription cpdesc =
CoreModel.getDefault().getProjectDescription(project, true);
+ String sFileName = getEnvironmentSetupFileFullPath(elem);
HashMap<String, String> envMap = parseEnvScript(sFileName);
+
setEnvVars(cpdesc, elem, envMap);
try {
--
1.7.9.5
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
