Skip to content

Commit

Permalink
use toString instead of toOSString for paths
Browse files Browse the repository at this point in the history
  • Loading branch information
jan committed Sep 2, 2024
1 parent 11336cd commit b5db0cd
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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 05 "; //$NON-NLS-1$
private static final String FIRST_SLOEBER_LINE = "#Sloeber created file please do not modify V1.00.test 06 "; //$NON-NLS-1$
private static final IEclipsePreferences myStorageNode = InstanceScope.INSTANCE.getNode(NODE_ARDUINO);

/*
Expand Down Expand Up @@ -966,9 +966,9 @@ public Map<String, String> getEnvVars() {
String architecture = getArchitecture();
IPath coreHardwarePath = getreferencedCoreHardwarePath();
allVars.put(ENV_KEY_BUILD_ARCH, architecture.toUpperCase());
allVars.put(ENV_KEY_RUNTIME_HARDWARE_PATH, getreferencingPlatformPath().removeLastSegments(1).toOSString());
allVars.put(ENV_KEY_BUILD_SYSTEM_PATH, coreHardwarePath.append(SYSTEM).toOSString());
allVars.put(ENV_KEY_RUNTIME_PLATFORM_PATH, getreferencingPlatformPath().toOSString());
allVars.put(ENV_KEY_RUNTIME_HARDWARE_PATH, getreferencingPlatformPath().removeLastSegments(1).toString());
allVars.put(ENV_KEY_BUILD_SYSTEM_PATH, coreHardwarePath.append(SYSTEM).toString());
allVars.put(ENV_KEY_RUNTIME_PLATFORM_PATH, getreferencingPlatformPath().toString());
//ide_version is defined in pre_processing_platform_default.txt
allVars.put(ENV_KEY_RUNTIME_IDE_VERSION, makeEnvironmentVar("ide_version")); //$NON-NLS-1$
allVars.put(ENV_KEY_RUNTIME_IDE_PATH, makeEnvironmentVar(SLOEBER_HOME));
Expand All @@ -993,7 +993,7 @@ public Map<String, String> getEnvVars() {
allVars.put(ENV_KEY_BUILD_ACTUAL_CORE_PATH, getActualCoreCodePath().toString());
IPath variantPath = getActualVariantPath();
if (variantPath != null) {
allVars.put(ENV_KEY_BUILD_VARIANT_PATH, variantPath.toOSString());
allVars.put(ENV_KEY_BUILD_VARIANT_PATH, variantPath.toString());
} else {// teensy does not use variant
allVars.put(ENV_KEY_BUILD_VARIANT_PATH, EMPTY);
}
Expand Down Expand Up @@ -1123,7 +1123,7 @@ private Map<String, String> getEnvVarPlatformFileTools(IArduinoPlatformVersion p
for (ArduinoPlatformTooldDependency tool : platformVersion.getToolsDependencies()) {
IPath installPath = tool.getInstallPath();
if (installPath.toFile().exists()) {
String value = installPath.toOSString();
String value = installPath.toString();
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;
Expand Down

0 comments on commit b5db0cd

Please sign in to comment.