Skip to content

Commit f9542cb

Browse files
author
jantje
committed
1 parent 9087623 commit f9542cb

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

io.sloeber.core/config/pre_processing_platform_default.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ A.RECIPE.OBJCOPY.HEX.PATTERN={A.RECIPE.OBJCOPY.BIN.PATTERN}
44
A.ARCHIVE_FILE=arduino.ar
55
A.ARCHIVE_FILE_PATH={A.BUILD.PATH}/{A.ARCHIVE_FILE}
66
A.ALT_SIZE_COMMAND="{A.COMPILER.PATH}{A.COMPILER.SIZE.CMD}" --format=avr --mcu={A.BUILD.MCU} "{A.BUILD.PATH}/{A.BUILD.PROJECT_NAME}.elf"
7-
A.BUILD.VARIANT.PATH={A.RUNTIME.PLATFORM.PATH}/variants/{A.BUILD.VARIANT}
87
A.BUILD.CORE.PATH={A.RUNTIME.PLATFORM.PATH}/cores/{A.BUILD.CORE}
98
A.archive_file_path={A.BUILD.PATH}/{A.ARCHIVE_FILE}
109
A.runtime.IDE.version=10802

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public class BoardDescriptor {
7979
public static final String ENV_KEY_JANTJE_BOARD_ID = Const.ENV_KEY_JANTJE_START + "BOARD_ID";
8080
public static final String ENV_KEY_SERIAL_PORT = Const.ERASE_START + "SERIAL.PORT";
8181
public static final String ENV_KEY_SERIAL_PORT_FILE = Const.ERASE_START + "SERIAL.PORT.FILE";
82+
private static final String ENV_KEY_BUILD_VARIANT_PATH = Const.ERASE_START + "BUILD.VARIANT.PATH";
8283

8384
// preference nodes
8485
private static final String NODE_ARDUINO = Activator.NODE_ARDUINO;
@@ -87,6 +88,7 @@ public class BoardDescriptor {
8788
private static final String JANTJE_ACTION_UPLOAD = "JANTJE.UPLOAD";
8889
private static final IEclipsePreferences myStorageNode = InstanceScope.INSTANCE.getNode(NODE_ARDUINO);
8990

91+
9092
/*
9193
* This is the basic info contained in the descriptor
9294
*/
@@ -649,6 +651,9 @@ public boolean saveConfiguration(ICConfigurationDescription confDesc, IContribut
649651
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_SERIAL_PORT, this.myUploadPort);
650652
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_SERIAL_PORT_FILE,
651653
this.myUploadPort.replace("/dev/", new String()));
654+
655+
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_BUILD_VARIANT_PATH,getActualVariantPath().toOSString());
656+
652657
}
653658

654659
// Also save last used values

0 commit comments

Comments
 (0)