diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/AutoBuildCommon.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/AutoBuildCommon.java index c6af150d..5980e8dc 100644 --- a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/AutoBuildCommon.java +++ b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/AutoBuildCommon.java @@ -368,7 +368,7 @@ static public String GetNiceFileName(IFolder buildPath, IFile path) { static public String GetNiceFileName(IPath buildPath, IPath filePath) { String ret; if (buildPath.isPrefixOf(filePath) || buildPath.removeLastSegments(3).isPrefixOf(filePath)) { - ret = filePath.makeRelativeTo(buildPath).toString(); + ret = filePath.makeRelativeTo(buildPath).toOSString(); } else { ret = filePath.toString(); } diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/CDTBuildTools.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/CDTBuildTools.java index d0d001d6..ce5c929d 100644 --- a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/CDTBuildTools.java +++ b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/CDTBuildTools.java @@ -96,7 +96,7 @@ public String getPathExtension() { @Override public String getDiscoveryCommand(ToolType toolType) { - return getToolLocation().append( getCommand(toolType)).toString() + DISCOVERY_PARAMETERS; + return getToolLocation().append( getCommand(toolType)).toOSString() + DISCOVERY_PARAMETERS; } @Override diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/MinGWBuildTools.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/MinGWBuildTools.java index a14f19b1..34e94c64 100644 --- a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/MinGWBuildTools.java +++ b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/buildTools/internal/MinGWBuildTools.java @@ -92,7 +92,7 @@ public String getPathExtension() { @Override public String getDiscoveryCommand(ToolType toolType) { - return getToolLocation().append( getCommand(toolType)).toString() +DISCOVERY_PARAMETERS; + return getToolLocation().append( getCommand(toolType)).toOSString() +DISCOVERY_PARAMETERS; } @Override diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/AutoBuildMakeRule.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/AutoBuildMakeRule.java index f3f1ac5c..87a059b0 100644 --- a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/AutoBuildMakeRule.java +++ b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/AutoBuildMakeRule.java @@ -288,7 +288,7 @@ public String[] getRecipes(IFolder buildFolder, AutoBuildConfigurationDescriptio IFile file = project.getWorkspace().getRoot() .getFile(IPath.forPosix(curEntry.getValue())); includeFiles = includeFiles + WHITESPACE + DOUBLE_QUOTE + CMD_LINE_INCLUDE_FILE - + file.getLocation().toString() + DOUBLE_QUOTE; + + file.getLocation().toOSString() + DOUBLE_QUOTE; break; } case ICSettingEntry.INCLUDE_PATH: { @@ -300,7 +300,7 @@ public String[] getRecipes(IFolder buildFolder, AutoBuildConfigurationDescriptio }else { includePath = includePath + WHITESPACE + DOUBLE_QUOTE + CMD_LINE_INCLUDE_FOLDER - + path.toString() + DOUBLE_QUOTE; + + path.toOSString() + DOUBLE_QUOTE; } break; } diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/helpers/api/AutoBuildConstants.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/helpers/api/AutoBuildConstants.java index 439cf8a9..45556d07 100644 --- a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/helpers/api/AutoBuildConstants.java +++ b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/helpers/api/AutoBuildConstants.java @@ -43,6 +43,7 @@ public class AutoBuildConstants { public static final String PROCENT = "%"; public static final String SLACH = "/"; public static final String BACKSLACH = "\\"; + public static final String PATH_SEPERATOR=isWindows?BACKSLACH:SLACH; public static final String FALSE = "FALSE"; public static final String TRUE = "TRUE"; public static final String COLON = ":"; diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/schema/internal/Tool.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/schema/internal/Tool.java index 46fb4c75..61574cf9 100644 --- a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/schema/internal/Tool.java +++ b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/schema/internal/Tool.java @@ -562,7 +562,7 @@ public String[] getRecipes(IAutoBuildConfigurationDescription autoBuildConfData, IPath toolPath = buildTools.getToolLocation(); if (toolPath != null && !toolPath.toString().isBlank()) { //store the path - toolCommandVars.put(CMD_LINE_TOOL_PATH, toolPath.toString().trim() + SLACH); + toolCommandVars.put(CMD_LINE_TOOL_PATH, toolPath.toOSString().trim() + PATH_SEPERATOR); } Map toolVariables = buildTools.getToolVariables(); if (toolVariables != null && toolVariables.size() > 0) { diff --git a/io.sloeber.core/config/pre_processing_platform_default.txt b/io.sloeber.core/config/pre_processing_platform_default.txt index 6b47ace9..b27b1580 100644 --- a/io.sloeber.core/config/pre_processing_platform_default.txt +++ b/io.sloeber.core/config/pre_processing_platform_default.txt @@ -1,7 +1,7 @@ #this file contains default/fallback/rescue values software=ARDUINO archive_file=arduino.ar -archive_file_path=${build.path}/${archive_file} +archive_file_path=${build.path}${PathDelimiter}${archive_file} ide_version=20302 serial.port=${com_port} diff --git a/io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardDescription.java b/io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardDescription.java index 03da7d95..41eb6893 100644 --- a/io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardDescription.java +++ b/io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardDescription.java @@ -45,7 +45,7 @@ import io.sloeber.core.txt.TxtFile; public class BoardDescription { - private static final String FIRST_SLOEBER_LINE = "#Sloeber created file please do not modify V1.00.test 06 "; //$NON-NLS-1$ + private static final String FIRST_SLOEBER_LINE = "#Sloeber created file please do not modify V1.00.test 07 "; //$NON-NLS-1$ private static final IEclipsePreferences myStorageNode = InstanceScope.INSTANCE.getNode(NODE_ARDUINO); /* @@ -1072,7 +1072,7 @@ private Map getEnvVarPlatformFileTools(IArduinoPlatformVersion p for (ArduinoPlatformTooldDependency tool : platformVersion.getToolsDependencies()) { IPath installPath = tool.getInstallPath(); if (installPath.toFile().exists()) { - String value = installPath.toString(); + String value = installPath.toOSString(); String keyString = ENV_KEY_RUNTIME_TOOLS + tool.getName() + tool.getVersion() + DOT_PATH; vars = vars + NEWLINE + keyString + EQUAL + value; keyString = ENV_KEY_RUNTIME_TOOLS + tool.getName() + '-' + tool.getVersion() + DOT_PATH; diff --git a/io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardsManager.java b/io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardsManager.java index 6e1cc4ff..bbf3e406 100644 --- a/io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardsManager.java +++ b/io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardsManager.java @@ -416,7 +416,7 @@ private static IStatus uninstall(IArduinoPlatformVersion curPlatform) { deleteDirectory(installFolder); envVarsNeedUpdating = true; } catch (IOException e) { - return new Status(IStatus.ERROR, Activator.getId(), "Failed to remove folder" + installFolder.toString(), //$NON-NLS-1$ + return new Status(IStatus.ERROR, Activator.getId(), "Failed to remove folder" + installFolder.toOSString(), //$NON-NLS-1$ e); } diff --git a/io.sloeber.core/src/io/sloeber/arduinoFramework/api/LibraryManager.java b/io.sloeber.core/src/io/sloeber/arduinoFramework/api/LibraryManager.java index ef797ca0..09476933 100644 --- a/io.sloeber.core/src/io/sloeber/arduinoFramework/api/LibraryManager.java +++ b/io.sloeber.core/src/io/sloeber/arduinoFramework/api/LibraryManager.java @@ -174,7 +174,7 @@ public static IStatus unInstall(IArduinoLibraryVersion lib, IProgressMonitor mon deleteDirectory(lib.getInstallPath().removeLastSegments(1)); } catch (IOException e) { return new Status(IStatus.ERROR, Activator.getId(), - "Failed to remove folder" + lib.getInstallPath().toString(), //$NON-NLS-1$ + "Failed to remove folder" + lib.getInstallPath().toOSString(), //$NON-NLS-1$ e); } diff --git a/io.sloeber.core/src/io/sloeber/core/api/Common.java b/io.sloeber.core/src/io/sloeber/core/api/Common.java index f007b3fd..b29e8131 100644 --- a/io.sloeber.core/src/io/sloeber/core/api/Common.java +++ b/io.sloeber.core/src/io/sloeber/core/api/Common.java @@ -31,7 +31,7 @@ public class Common { public final static String sloeberHome = getSloeberHome(); public final static IPath sloeberHomePath = new org.eclipse.core.runtime.Path(sloeberHome); - public final static String sloeberHomePathToString = sloeberHomePath.toString(); + public final static String sloeberHomePathToString = sloeberHomePath.toOSString(); private static String getSloeberHome() { @@ -213,7 +213,7 @@ public static IPath getWorkspaceRoot() { */ public static String makePathVersionString(File file) { if(sloeberHomePath.isPrefixOf(IPath.fromFile(file))) { - return SLOEBER_HOME_VAR+SLACH+IPath.fromFile(file) .makeRelativeTo(sloeberHomePath).toString(); + return SLOEBER_HOME_VAR+SLACH+IPath.fromFile(file).makeRelativeTo(sloeberHomePath).toString(); } return file.toString(); } diff --git a/io.sloeber.core/src/io/sloeber/core/api/ConfigurationPreferences.java b/io.sloeber.core/src/io/sloeber/core/api/ConfigurationPreferences.java index 272d2f3a..c81028ab 100644 --- a/io.sloeber.core/src/io/sloeber/core/api/ConfigurationPreferences.java +++ b/io.sloeber.core/src/io/sloeber/core/api/ConfigurationPreferences.java @@ -206,12 +206,12 @@ public static File getPostProcessingBoardsFile() { } public static Path getMakePath() { - return new Path(getInstallationPath().append("tools/make").toString()); //$NON-NLS-1$ + return new Path(getInstallationPath().append("tools/make").toOSString()); //$NON-NLS-1$ } public static IPath getAwkPath() { - return new Path(getInstallationPath().append("tools/awk").toString()); //$NON-NLS-1$ + return new Path(getInstallationPath().append("tools/awk").toOSString()); //$NON-NLS-1$ } public static Instant getLatestJsonUpdateTime() { diff --git a/io.sloeber.core/src/io/sloeber/core/api/Defaults.java b/io.sloeber.core/src/io/sloeber/core/api/Defaults.java index 42c0cd32..db6c4249 100644 --- a/io.sloeber.core/src/io/sloeber/core/api/Defaults.java +++ b/io.sloeber.core/src/io/sloeber/core/api/Defaults.java @@ -49,7 +49,7 @@ public static String getPrivateLibraryPath() { if (isMac || isWindows) { homPath = homPath.append("Documents"); } - return homPath.append("Arduino").append(ARDUINO_LIBRARY_FOLDER_NAME).toString(); + return homPath.append("Arduino").append(ARDUINO_LIBRARY_FOLDER_NAME).toOSString(); } public static String getPrivateHardwarePath() { @@ -57,7 +57,7 @@ public static String getPrivateHardwarePath() { if (isMac || isWindows) { homPath = homPath.append("Documents"); } - return homPath.append("Arduino").append(ARDUINO_HARDWARE_FOLDER_NAME).toString(); + return homPath.append("Arduino").append(ARDUINO_HARDWARE_FOLDER_NAME).toOSString(); } public static String getDefaultDisconnectSerialTargets() {