From bb4f293534c902688494605692cf6104d165ec06 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 22 Jun 2024 21:18:17 +0200 Subject: [PATCH] If not all envars could be generated retry later --- .../src/io/sloeber/core/internal/SloeberConfiguration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/io.sloeber.core/src/io/sloeber/core/internal/SloeberConfiguration.java b/io.sloeber.core/src/io/sloeber/core/internal/SloeberConfiguration.java index 67447df6..bc8cdbdd 100644 --- a/io.sloeber.core/src/io/sloeber/core/internal/SloeberConfiguration.java +++ b/io.sloeber.core/src/io/sloeber/core/internal/SloeberConfiguration.java @@ -182,8 +182,7 @@ public Map getEnvironmentVariables() { private void configureIfDirty() { if (myMemoryIsDirty) { - getEnvVarsNonExpanding(); - myMemoryIsDirty = false; + myMemoryIsDirty = getEnvVarsNonExpanding(); getEnvVarsExpanding(); } if (!ResourcesPlugin.getWorkspace().isTreeLocked()) { @@ -236,8 +235,9 @@ private void getEnvVarsExpanding() { /** * get the environment variables that do not reliy on variable expansion to get the value. + * @return true when data was missing */ - private void getEnvVarsNonExpanding() { + private boolean getEnvVarsNonExpanding() { IProject project = getProject(); myEnvironmentVariables.clear(); @@ -274,6 +274,7 @@ private void getEnvVarsNonExpanding() { myEnvironmentVariables.put("PATH", makeEnvironmentVar(ENV_KEY_COMPILER_PATH) + pathDelimiter //$NON-NLS-1$ + makeEnvironmentVar(ENV_KEY_BUILD_GENERIC_PATH) + pathDelimiter + makeEnvironmentVar("PATH")); //$NON-NLS-1$ } + return (myBoardDescription == null) || (myCompileDescription == null)|| (myOtherDesc == null); } /**