[yocto] [PATCH 3/7] plugins/sdk.ide: Decoupled launcher creation from environment setting

[Atanas Gegov]

From: Atanas Gegov <atanas.gegov at bmw-carit.de>

The creation of the remote debug and qemu
launchers is now decoupled from the method
setEnvironmentVariables(...). This also fixes a
bug where the remote debug launcher is not
correctly created because at the time of the call
not all relevant Yocto natures are added to the
project.
---
 .../src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java |    5 ++---
 .../ide/wizard/NewYoctoProjectTemplateProcess.java |    2 ++
 2 files changed, 4 insertions(+), 3 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 76bac26..5400a42 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
@@ -223,15 +223,13 @@ public class YoctoSDKUtils {
 		return envSetupFile;
 	}
 
-	public static void setEnvironmentVariables(IProject project, YoctoUIElement elem) throws YoctoGeneralException {
+	public static void setEnvironmentVariables(IProject project, YoctoUIElement elem) {
 		ICProjectDescription cpdesc = CoreModel.getDefault().getProjectDescription(project, true);
 
 		String sFileName = getEnvironmentSetupFileFullPath(elem);
 		HashMap<String, String> envMap = parseEnvScript(sFileName);
 
 		setEnvVars(cpdesc, elem, envMap);
-
-		createRemoteDebugAndQemuLaunchers(project, elem);
 		try {
 			CoreModel.getDefault().setProjectDescription(project,cpdesc);
 		} catch (CoreException e) {
@@ -461,6 +459,7 @@ public class YoctoSDKUtils {
 
 		try {
 			setEnvironmentVariables(project, elem);
+			createRemoteDebugAndQemuLaunchers(project, elem);
 
 			if (project.hasNature(YoctoSDKAutotoolsProjectNature.YoctoSDK_AUTOTOOLS_NATURE_ID)) {
 				YoctoSDKAutotoolsProjectNature.configureAutotoolsOptions(project);
diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java
index 9c6dca4..3ea7e33 100644
--- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java
+++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java
@@ -232,6 +232,8 @@ public class NewYoctoProjectTemplateProcess extends ProcessRunner {
 			YoctoSDKNatureUtils.addNature(project, YoctoSDKCMakeProjectNature.YoctoSDK_CMAKE_NATURE_ID, monitor);
 			YoctoSDKCMakeProjectNature.extendProjectEnvironmentForCMake(project);
 		}
+
+		YoctoSDKUtils.createRemoteDebugAndQemuLaunchers(project, elem);
 	}
 
 	protected final void turnOffAutoBuild(IWorkspace workspace) throws CoreException {
-- 
1.7.9.5