#1268 do not store uploadPort and programmer in version control files

Author: jantje

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

@@ -814,6 +814,25 @@ public Map<String, String> getEnvVarsConfig(String prefix) {
         return allVars;
     }
 
+    /**
+     * get the environment variables that need to be stored in version control
+     * 
+     * @return the minimum list of environment variables to recreate the project
+     *         from version control
+     */
+    public Map<String, String> getEnvVarsVersion(String prefix) {
+        Map<String, String> allVars = new TreeMap<>();
+        String board_txt = makePathVersionString(getReferencingBoardsFile());
+
+        allVars.put(prefix + KEY_SLOEBER_BOARD_ID, myBoardID);
+        allVars.put(prefix + KEY_SLOEBER_BOARD_TXT, board_txt);
+
+        for (Entry<String, String> curOption : myOptions.entrySet()) {
+            allVars.put(prefix + KEY_SLOEBER_MENU_SELECTION + DOT + curOption.getKey(), curOption.getValue());
+        }
+        return allVars;
+    }
+
     /**
      * This method creates environment variables based on the platform.txt and
      * boards.txt. platform.txt is processed first and then boards.txt. This way

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

@@ -188,6 +188,10 @@ public Map<String, String> getEnvVarsConfig(String prefix) {
         return ret;
     }
 
+    public Map<String, String> getEnvVarsVersion(String prefix) {
+        return getEnvVarsConfig(prefix);
+    }
+
     public CompileDescription(TxtFile configFile, String prefix) {
 
         KeyValueTree tree = configFile.getData();

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

@@ -43,6 +43,10 @@ public Map<String, String> getEnvVarsConfig(String prefix) {
         return allVars;
     }
 
+    public Map<String, String> getEnvVarsVersion(String prefix) {
+        return getEnvVarsConfig(prefix);
+    }
+
     public static OtherDescription getFromCDT(ICConfigurationDescription confDesc) {
         OtherDescription ret = new OtherDescription();
         ret.myIsVersionControlled = false;

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

@@ -308,7 +308,6 @@ private void cleanOldData(ICProjectDescription prjCDesc) {
      * @param confDesc
      *            returns true if the config needs saving otherwise false
      */
-    @SuppressWarnings("nls")
     private boolean readSloeberConfig(final ICProjectDescription prjCDesc) {
         boolean needToCreateConfigFiles = false;
         IFile file = getConfigLocalFile();
@@ -405,9 +404,9 @@ private void createSloeberConfigFiles(final ICProjectDescription prjCDesc) {
             configVars.putAll(otherDescription.getEnvVarsConfig(otherPrefix));
 
             if (otherDescription.IsVersionControlled()) {
-                versionVars.putAll(boardDescription.getEnvVarsConfig(boardPrefix));
-                versionVars.putAll(compileDescription.getEnvVarsConfig(compPrefix));
-                versionVars.putAll(otherDescription.getEnvVarsConfig(otherPrefix));
+                versionVars.putAll(boardDescription.getEnvVarsVersion(boardPrefix));
+                versionVars.putAll(compileDescription.getEnvVarsVersion(compPrefix));
+                versionVars.putAll(otherDescription.getEnvVarsVersion(otherPrefix));
             }
         }