Skip to content

Commit a2d6d99

Browse files
committed
Issue #34 also causes due no longer to build. ENV_KEY_build_variant_path is set with the resource link and that fails. Replaced the defenition of the env var with the fqn
1 parent df29d4f commit a2d6d99

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ArduinoHelpers.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,12 @@ private static void setTheEnvironmentVariablesSetTheDefaults(IContributedEnviron
574574
var = new EnvironmentVariable(ENV_KEY_archive_file, "arduino.ar");
575575
contribEnv.addVariable(var, confDesc);
576576

577+
IPathVariableManager pathMan = confDesc.getProjectDescription().getProject().getPathVariableManager();
578+
URI buildVariantURI = pathMan.getURIValue(ArduinoConst.PATH_VARIABLE_NAME_ARDUINO_PINS);
579+
buildVariantURI = pathMan.resolveURI(buildVariantURI);
580+
String buildVariantPath = buildVariantURI.getPath() + "/${" + ArduinoConst.ENV_KEY_build_variant + "}";
581+
var = new EnvironmentVariable(ENV_KEY_build_variant_path, buildVariantPath);
582+
contribEnv.addVariable(var, confDesc);
577583
// IPath platformPath = new Path(arduinoProperties.getPlatformFolder());
578584
// IPath PinPath = platformPath.append(ArduinoConst.VARIANTS_FOLDER);
579585

@@ -773,18 +779,11 @@ public static void setTheEnvironmentVariables(IProject project, ICConfigurationD
773779
* @param confDesc
774780
*/
775781
private static void setTheEnvironmentVariablesPostProcessing(IContributedEnvironment contribEnv, ICConfigurationDescription confDesc) {
776-
IPathVariableManager pathMan = confDesc.getProjectDescription().getProject().getPathVariableManager();
777-
778-
// TODO consider moving this to the set defaults (not sure why this is here. If it needs to be here document why
779-
IEnvironmentVariable var = new EnvironmentVariable(ENV_KEY_build_variant_path, pathMan.getURIValue(
780-
ArduinoConst.PATH_VARIABLE_NAME_ARDUINO_PINS).getPath()
781-
+ "/${" + ArduinoConst.ENV_KEY_build_variant + "}");
782-
contribEnv.addVariable(var, confDesc);
783782

784783
String recipes[] = { ENV_KEY_recipe_c_o_pattern, ENV_KEY_recipe_cpp_o_pattern, ENV_KEY_recipe_S_o_pattern,
785784
ENV_KEY_recipe_objcopy_hex_pattern, ENV_KEY_recipe_objcopy_eep_pattern, ENV_KEY_recipe_size_pattern, ENV_KEY_recipe_AR_pattern,
786785
ENV_KEY_recipe_c_combine_pattern };
787-
var = null;
786+
IEnvironmentVariable var = null;
788787
for (int curRecipe = 0; curRecipe < recipes.length; curRecipe++) {
789788
String recipe = getBuildEnvironmentVariable(confDesc, recipes[curRecipe], "", false);
790789

0 commit comments

Comments
 (0)