#1339 fix build.system.path environment var

Author: jantje

io.sloeber.core/config/pre_processing_platform_default.txt

@@ -4,7 +4,6 @@ recipe.objcopy.hex.pattern=${recipe.objcopy.bin.pattern}
 archive_file=arduino.ar
 archive_file_path=${build.path}/${archive_file}
 runtime.ide.version=10812
-build.system.path=${runtime.platform.path}${DirectoryDelimiter}system
 serial.port=${com_port}
 build.project_name=${ProjName}
 

io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java

@@ -45,6 +45,7 @@ public class BoardDescription {
     private static final String ENV_KEY_SERIAL_DOT_PORT = "serial.port"; //$NON-NLS-1$
     private static final String ENV_KEY_SERIAL_PORT_FILE = "serial.port.file"; //$NON-NLS-1$
     private static final String ENV_KEY_BUILD_VARIANT_PATH = BUILD + DOT + VARIANT + DOT + PATH;
+    private static final String ENV_KEY_BUILD_SYSTEM_PATH = BUILD + DOT + SYSTEM + DOT + PATH;
     private static final String ENV_KEY_BUILD_ACTUAL_CORE_PATH = BUILD + DOT + CORE + DOT + PATH;
     private static final String ENV_KEY_BUILD_ARCH = BUILD + DOT + "arch"; //$NON-NLS-1$
     private static final String ENV_KEY_HARDWARE_PATH = RUNTIME + DOT + HARDWARE + DOT + PATH;
@@ -611,10 +612,9 @@ public String getUploadPatternKey() {
     public IPath getreferencedHardwarePath() {
         updateWhenDirty();
         if (myReferencedPlatformCore == null) {
-            return new Path(myBoardTxtFile.getLoadedFile().toString()).removeLastSegments(2);
+            return new Path(myBoardTxtFile.getLoadedFile().toString()).removeLastSegments(1);
         }
-        IPath platformPath = myReferencedPlatformCore.getInstallPath();
-        return platformPath.removeLastSegments(1);
+        return myReferencedPlatformCore.getInstallPath();
     }
 
     /*
@@ -773,8 +773,10 @@ public Map<String, String> getEnvVars() {
         allVars.putAll(pluginPreProcessingBoardsTxt.getBoardEnvironVars(getBoardID()));
 
         String architecture = getArchitecture();
+        IPath coreHardwarePath = getreferencedHardwarePath();
         allVars.put(ENV_KEY_BUILD_ARCH, architecture.toUpperCase());
-        allVars.put(ENV_KEY_HARDWARE_PATH, getreferencedHardwarePath().toOSString());
+        allVars.put(ENV_KEY_HARDWARE_PATH, coreHardwarePath.removeLastSegments(1).toOSString());
+        allVars.put(ENV_KEY_BUILD_SYSTEM_PATH, coreHardwarePath.append(SYSTEM).toOSString());
         allVars.put(ENV_KEY_PLATFORM_PATH, getreferencingPlatformPath().toOSString());
 
         allVars.put(ENV_KEY_SERIAL_PORT, getActualUploadPort());
@@ -845,7 +847,7 @@ private Map<String, String> getEnVarPlatformInfo() {
 
         if (referencingPlatform == null) {
             // This is the case for private hardware
-            //there is no need to specidy tool path as they do not use them
+            //there is no need to specify tool path as they do not use them
             return ret;
         }
         ArduinoPlatformVersion latestArduinoPlatform = BoardsManager.getNewestInstalledPlatform(Const.ARDUINO,
@@ -885,13 +887,16 @@ private Map<String, String> getEnVarPlatformInfo() {
     private static Map<String, String> getEnvVarPlatformFileTools(ArduinoPlatformVersion platformVersion) {
         HashMap<String, String> vars = new HashMap<>();
         for (ArduinoPlatformTooldDependency tool : platformVersion.getToolsDependencies()) {
-            String installPath = tool.getInstallPath().toOSString();
-            String keyString = RUNTIME_TOOLS + tool.getName() + tool.getVersion() + DOT_PATH;
-            vars.put(keyString, installPath);
-            keyString = RUNTIME_TOOLS + tool.getName() + '-' + tool.getVersion() + DOT_PATH;
-            vars.put(keyString, installPath);
-            keyString = RUNTIME_TOOLS + tool.getName() + DOT_PATH;
-            vars.put(keyString, installPath);
+            IPath installPath = tool.getInstallPath();
+            if (installPath.toFile().exists()) {
+                String value = installPath.toOSString();
+                String keyString = RUNTIME_TOOLS + tool.getName() + tool.getVersion() + DOT_PATH;
+                vars.put(keyString, value);
+                keyString = RUNTIME_TOOLS + tool.getName() + '-' + tool.getVersion() + DOT_PATH;
+                vars.put(keyString, value);
+                keyString = RUNTIME_TOOLS + tool.getName() + DOT_PATH;
+                vars.put(keyString, value);
+            }
         }
         return vars;
     }

io.sloeber.core/src/io/sloeber/core/common/Const.java

@@ -50,6 +50,7 @@ public class Const {
     public static final String AUTH = "auth";
     public static final String RECIPE = "recipe";
     public static final String BUILD = "build";
+    public static final String SYSTEM = "system";
     public static final String COM_PORT = "com_port";
     public static final String ARDUINO = "arduino";
     public static final String PATH = "path";