Skip to content

Commit ebd5fda

Browse files
author
jantje
committed
#423 Support for variant and core redirection
There is no need for upload redirection so I guess this is the end of it (except for bugs that is)
1 parent ad3c767 commit ebd5fda

File tree

4 files changed

+109
-106
lines changed

4 files changed

+109
-106
lines changed

‎it.baeyens.arduino.common/src/it/baeyens/arduino/common/Const.java

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -101,48 +101,52 @@ public class Const {
101101
public static final String KEY_OPEN_SERIAL_WITH_MONITOR = "Open serial connections with the monitor";
102102
public static final String KEY_AUTO_IMPORT_LIBRARIES = "Automatically import libraries";
103103

104-
public static final String ENV_KEY_BOARD_START = "A" + DOT;
104+
public static final String ERASE_START = "A" + DOT;
105105

106-
public static final String ENV_KEY_PROGRAMMERS_START = ENV_KEY_BOARD_START + "PROGRAMMERS.";
106+
public static final String ENV_KEY_PROGRAMMERS_START = ERASE_START + "PROGRAMMERS.";
107107
public static final String WORKSPACE_LIB_FOLDER = LIBRARY_PATH_SUFFIX + "/";
108108
public static final String ARDUINO_IDE_VERSION = "ArduinoIDEVersion";
109-
public static final String ENV_KEY_NAME = ENV_KEY_BOARD_START + "NAME";
110-
public static final String ENV_KEY_VERSION = ENV_KEY_BOARD_START + "VERSION";
111-
112-
public static final String ENV_KEY_BUILD_VARIANT = ENV_KEY_BOARD_START + "BUILD.VARIANT";
113-
public static final String ENV_KEY_COMPILER_PATH = ENV_KEY_BOARD_START + "COMPILER.PATH";
114-
public static final String ENV_KEY_BUILD_SYSTEM_PATH = ENV_KEY_BOARD_START + "BUILD.SYSTEM.PATH";
115-
public static final String ENV_KEY_BUILD_GENERIC_PATH = ENV_KEY_BOARD_START + "BUILD.GENERIC.PATH";
116-
public static final String ENV_KEY_SOFTWARE = ENV_KEY_BOARD_START + "SOFTWARE";
117-
public static final String ENV_KEY_ARCHITECTURE = ENV_KEY_BOARD_START + "ARCHITECTURE";
118-
public static final String ENV_KEY_BUILD_ARCH = ENV_KEY_BOARD_START + "BUILD.ARCH";
119-
public static final String ENV_KEY_HARDWARE_PATH = ENV_KEY_BOARD_START + "RUNTIME.HARDWARE.PATH";
120-
public static final String ENV_KEY_PLATFORM_PATH = ENV_KEY_BOARD_START + "RUNTIME.PLATFORM.PATH";
121-
122-
public static final String ENV_KEY_BUILD_PATH = ENV_KEY_BOARD_START + "BUILD.PATH";
123-
public static final String ENV_KEY_BUILD_PROJECT_NAME = ENV_KEY_BOARD_START + "BUILD.PROJECT_NAME";
124-
public static final String ENV_KEY_BUILD_VARIANT_PATH = ENV_KEY_BOARD_START + "BUILD.VARIANT.PATH";
125-
public static final String ENV_KEY_UPLOAD_USE_1200BPS_TOUCH = ENV_KEY_BOARD_START + "UPLOAD.USE_1200BPS_TOUCH";
126-
public static final String ENV_KEY_UPLOAD_DISABLE_FLUSHING = ENV_KEY_BOARD_START + "UPLOAD.DISABLE_FLUSHING";
127-
public static final String ENV_KEY_WAIT_FOR_UPLOAD_PORT = ENV_KEY_BOARD_START + "UPLOAD.WAIT_FOR_UPLOAD_PORT";
128-
public static final String ENV_KEY_RESET_BEFORE_UPLOAD = ENV_KEY_BOARD_START + "UPLOAD.FORCE_RESET_BEFORE_UPLOAD";
129-
public static final String ENV_KEY_NETWORK_PORT = ENV_KEY_BOARD_START + "NETWORK.PORT";
130-
public static final String ENV_KEY_NETWORK_AUTH = ENV_KEY_BOARD_START + "NETWORK.AUTH";
131-
132-
public static final String ENV_KEY_BUILD_CORE = ENV_KEY_BOARD_START + "BUILD.CORE";
133-
public static final String ENV_KEY_BUILD_CORE_PATH = ENV_KEY_BOARD_START + "BUILD.CORE.PATH";
134-
public static final String ENV_KEY_USE_ARCHIVER = ENV_KEY_BOARD_START + "BUILD.USE_ARCHIVER";
135-
public static final String ENV_KEY_SERIAL_PORT = ENV_KEY_BOARD_START + "SERIAL.PORT";
136-
public static final String ENV_KEY_SERIAL_PORT_FILE = ENV_KEY_BOARD_START + "SERIAL.PORT.FILE";
109+
public static final String ENV_KEY_NAME = ERASE_START + "NAME";
110+
public static final String ENV_KEY_VERSION = ERASE_START + "VERSION";
111+
112+
public static final String ENV_KEY_BUILD_VARIANT = ERASE_START + "BUILD.VARIANT";
113+
public static final String ENV_KEY_COMPILER_PATH = ERASE_START + "COMPILER.PATH";
114+
public static final String ENV_KEY_BUILD_SYSTEM_PATH = ERASE_START + "BUILD.SYSTEM.PATH";
115+
public static final String ENV_KEY_BUILD_GENERIC_PATH = ERASE_START + "BUILD.GENERIC.PATH";
116+
public static final String ENV_KEY_SOFTWARE = ERASE_START + "SOFTWARE";
117+
public static final String ENV_KEY_ARCHITECTURE = ERASE_START + "ARCHITECTURE";
118+
public static final String ENV_KEY_BUILD_ARCH = ERASE_START + "BUILD.ARCH";
119+
public static final String ENV_KEY_HARDWARE_PATH = ERASE_START + "RUNTIME.HARDWARE.PATH";
120+
public static final String ENV_KEY_PLATFORM_PATH = ERASE_START + "RUNTIME.PLATFORM.PATH";
121+
122+
public static final String ENV_KEY_BUILD_PATH = ERASE_START + "BUILD.PATH";
123+
public static final String ENV_KEY_BUILD_PROJECT_NAME = ERASE_START + "BUILD.PROJECT_NAME";
124+
public static final String ENV_KEY_UPLOAD_USE_1200BPS_TOUCH = ERASE_START + "UPLOAD.USE_1200BPS_TOUCH";
125+
public static final String ENV_KEY_UPLOAD_DISABLE_FLUSHING = ERASE_START + "UPLOAD.DISABLE_FLUSHING";
126+
public static final String ENV_KEY_WAIT_FOR_UPLOAD_PORT = ERASE_START + "UPLOAD.WAIT_FOR_UPLOAD_PORT";
127+
public static final String ENV_KEY_RESET_BEFORE_UPLOAD = ERASE_START + "UPLOAD.FORCE_RESET_BEFORE_UPLOAD";
128+
public static final String ENV_KEY_NETWORK_PORT = ERASE_START + "NETWORK.PORT";
129+
public static final String ENV_KEY_NETWORK_AUTH = ERASE_START + "NETWORK.AUTH";
130+
131+
public static final String ENV_KEY_BUILD_CORE = ERASE_START + "BUILD.CORE";
132+
133+
public static final String ENV_KEY_USE_ARCHIVER = ERASE_START + "BUILD.USE_ARCHIVER";
134+
public static final String ENV_KEY_SERIAL_PORT = ERASE_START + "SERIAL.PORT";
135+
public static final String ENV_KEY_SERIAL_PORT_FILE = ERASE_START + "SERIAL.PORT.FILE";
136+
137+
public static final String ENV_KEY_JANTJE_REFERENCED_PLATFORM_FILE = ERASE_START
138+
+ "JANTJE.REFERENCED_PLATFORM_FILE";
139+
public static final String ENV_KEY_JANTJE_REFERENCED_CORE = ERASE_START + "JANTJE.REFERENCED.CORE.FILE";
140+
public static final String ENV_KEY_JANTJE_REFERENCED_VARIANT_PATH = ERASE_START + "JANTJE.BUILD.VARIANT.PATH";
141+
public static final String ENV_KEY_JANTJE_BUILD_CORE = ERASE_START + "JANTJE.BUILD_CORE";
142+
public static final String ENV_KEY_JANTJE_BUILD_VARIANT = ERASE_START + "JANTJE.BUILD_VARIANT";
137143

138144
public static final String ENV_KEY_JANTJE_START = "JANTJE.";
139145
public static final String ENV_KEY_JANTJE_WARNING_LEVEL = ENV_KEY_JANTJE_START + "WARNING_LEVEL";
140-
public static final String ENV_KEY_JANTJE_SIZE_COMMAND = ENV_KEY_BOARD_START + "ALT_SIZE_COMMAND";
146+
public static final String ENV_KEY_JANTJE_SIZE_COMMAND = ERASE_START + "ALT_SIZE_COMMAND";
141147
public static final String ENV_KEY_JANTJE_SIZE_SWITCH = ENV_KEY_JANTJE_START + "SIZE.SWITCH";
142148
public static final String ENV_KEY_JANTJE_BOARDS_FILE = ENV_KEY_JANTJE_START + "BOARDS_FILE";
143149
public static final String ENV_KEY_JANTJE_PLATFORM_FILE = ENV_KEY_JANTJE_START + "PLATFORM_FILE";
144-
public static final String ENV_KEY_JANTJE_REFERENCED_PLATFORM_FILE = ENV_KEY_JANTJE_START
145-
+ "REFERENCED_PLATFORM_FILE";
146150
public static final String ENV_KEY_JANTJE_COM_PORT = ENV_KEY_JANTJE_START + "COM_PORT";
147151
public static final String ENV_KEY_JANTJE_BOARD_NAME = ENV_KEY_JANTJE_START + "BOARD_NAME";
148152

@@ -153,8 +157,6 @@ public class Const {
153157
public static final String ENV_KEY_JANTJE_PACKAGE_ID = ENV_KEY_JANTJE_START + "PACKAGE_ID";
154158
public static final String ENV_KEY_JANTJE_ARCITECTURE_ID = ENV_KEY_JANTJE_START + "ARCHITECTURE_ID";
155159
public static final String ENV_KEY_JANTJE_BOARD_ID = ENV_KEY_JANTJE_START + "BOARD_ID";
156-
public static final String ENV_KEY_JANTJE_BUILD_CORE = ENV_KEY_JANTJE_START + "BUILD_CORE";
157-
public static final String ENV_KEY_JANTJE_BUILD_VARIANT = ENV_KEY_JANTJE_START + "BUILD_VARIANT";
158160
public static final String ENV_KEY_JANTJE_PACKAGE_NAME = ENV_KEY_JANTJE_START + "PACKAGE.NAME";
159161
public static final String ENV_KEY_JANTJE_MAKE_LOCATION = ENV_KEY_JANTJE_START + "MAKE_LOCATION";
160162
//
@@ -195,7 +197,7 @@ public class Const {
195197
* @return the environment variable key to find the protocol
196198
*/
197199
public static String get_ENV_KEY_PROTOCOL(String action) {
198-
return ENV_KEY_BOARD_START + action.toUpperCase() + DOT + ENV_PROTOCOL;
200+
return ERASE_START + action.toUpperCase() + DOT + ENV_PROTOCOL;
199201
}
200202

201203
/**
@@ -205,7 +207,7 @@ public static String get_ENV_KEY_PROTOCOL(String action) {
205207
* @return the environment variable key to find the tool
206208
*/
207209
public static String get_ENV_KEY_TOOL(String action) {
208-
return ENV_KEY_BOARD_START + action.toUpperCase() + DOT + ENV_TOOL;
210+
return ERASE_START + action.toUpperCase() + DOT + ENV_TOOL;
209211
}
210212

211213
/**
@@ -215,7 +217,7 @@ public static String get_ENV_KEY_TOOL(String action) {
215217
* @return he environment variable key to find the recipe
216218
*/
217219
public static String get_ENV_KEY_RECIPE(String action) {
218-
return ENV_KEY_BOARD_START + action.toUpperCase() + DOT + ENV_PATTERN;
220+
return ERASE_START + action.toUpperCase() + DOT + ENV_PATTERN;
219221
}
220222

221223
/**
@@ -226,8 +228,7 @@ public static String get_ENV_KEY_RECIPE(String action) {
226228
* @return he environment variable key to find the recipe
227229
*/
228230
public static String get_ENV_KEY_RECIPE(String tool, String action) {
229-
return ENV_KEY_BOARD_START + "TOOLS" + DOT + tool.toUpperCase() + DOT + action.toUpperCase() + DOT
230-
+ ENV_PATTERN;
231+
return ERASE_START + "TOOLS" + DOT + tool.toUpperCase() + DOT + action.toUpperCase() + DOT + ENV_PATTERN;
231232
}
232233

233234
public static String get_Jantje_KEY_PROTOCOL(String action) {

‎it.baeyens.arduino.core/src/it/baeyens/arduino/managers/ArduinoPlatform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public Path getInstallPath() {
183183
public List<Path> getIncludePath() {
184184
Path installPath = getInstallPath();
185185
return Arrays.asList(installPath.resolve("cores/{build.core}"), //$NON-NLS-1$
186-
installPath.resolve("variants/{build.variant}")); //$NON-NLS-1$
186+
installPath.resolve(Const.VARIANTS_FOLDER_NAME + "/{build.variant}")); //$NON-NLS-1$
187187
}
188188

189189
public IStatus remove(IProgressMonitor monitor) {

‎it.baeyens.arduino.core/src/it/baeyens/arduino/managers/Manager.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,22 @@ public static List<ArduinoPlatform> getPlatforms() {
323323
return platforms;
324324
}
325325

326+
public static IPath getPlatformFile(String vendor, String architecture) {
327+
328+
for (PackageIndex index : packageIndices) {
329+
for (Package pkg : index.getPackages()) {
330+
for (ArduinoPlatform curPlatform : pkg.getInstalledPlatforms()) {
331+
if (architecture.equalsIgnoreCase(curPlatform.getArchitecture())
332+
&& (vendor.equalsIgnoreCase(pkg.getMaintainer()))) {
333+
ArduinoPlatform latestPlatform = pkg.getLatestPlatform(curPlatform.getName());
334+
return new org.eclipse.core.runtime.Path(latestPlatform.getPlatformFile().toString());
335+
}
336+
}
337+
}
338+
}
339+
return null;
340+
}
341+
326342
public static ArduinoPlatform getPlatform(String platformTxt) {
327343
String searchString = new File(platformTxt).toString();
328344
for (PackageIndex index : packageIndices) {

0 commit comments

Comments
 (0)