Merge pull request #1440 from Sloeber/#1410_Prefer_programmersTXT_to_boardsTXT

#1410 uploads seem to work except for #1437

Author: jantje

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

@@ -815,15 +815,6 @@ public Map<String, String> getEnvVars() {
         // put in the installed tools info
         allVars.putAll(getEnVarPlatformInfo());
 
-        Programmers localProgrammers[] = Programmers.fromBoards(this);
-        String programmer = getProgrammer();
-        for (Programmers curProgrammer : localProgrammers) {
-            String programmerID = curProgrammer.getIDFromNiceName(programmer);
-            if (programmerID != null) {
-                allVars.putAll(curProgrammer.getAllEnvironVars(programmerID));
-            }
-        }
-
         // boards settings not coming from menu selections
         allVars.putAll(myBoardTxtFile.getBoardEnvironVars(getBoardID()));
 
@@ -838,6 +829,16 @@ public Map<String, String> getEnvVars() {
             allVars.putAll(curSelectedMenuItem.toKeyValues(EMPTY, false));
         }
 
+        //This moved last. See github issue 1410
+        Programmers localProgrammers[] = Programmers.fromBoards(this);
+        String programmer = getProgrammer();
+        for (Programmers curProgrammer : localProgrammers) {
+            String programmerID = curProgrammer.getIDFromNiceName(programmer);
+            if (programmerID != null) {
+                allVars.putAll(curProgrammer.getAllEnvironVars(programmerID));
+            }
+        }
+
         // add the stuff that comes with the plugin that is marked as post
         allVars.putAll(pluginPostProcessingPlatformTxt.getAllEnvironVars(EMPTY));
         allVars.putAll(pluginPostProcessingBoardsTxt.getBoardEnvironVars(getBoardID()));