@@ -52,24 +52,20 @@ public class BoardDescription {
5252 private static final String KEY_LAST_USED_UPLOAD_PROTOCOL = "last Used upload Protocol" ; //$NON-NLS-1$
5353 private static final String KEY_LAST_USED_BOARDS_FILE = "Last used Boards file" ; //$NON-NLS-1$
5454 private static final String KEY_LAST_USED_BOARD_MENU_OPTIONS = "last used Board custom option selections" ; //$NON-NLS-1$
55- private static final String ENV_KEY_SERIAL_PORT = ERASE_START + "serial_port" ; //$NON-NLS-1$
56- private static final String ENV_KEY_SERIAL_DOT_PORT = ERASE_START + "serial.port" ; //$NON-NLS-1$
57- private static final String ENV_KEY_SERIAL_PORT_FILE = ERASE_START + "serial.port.file" ; //$NON-NLS-1$
58- private static final String ENV_KEY_BUILD_VARIANT_PATH = ERASE_START + BUILD + DOT + VARIANT + DOT + PATH ;
59- private static final String ENV_KEY_BUILD_ACTUAL_CORE_PATH = ERASE_START + BUILD + DOT + CORE + DOT + PATH ;
60- private static final String ENV_KEY_BUILD_ARCH = ERASE_START + "build.arch" ; //$NON-NLS-1$
61- private static final String ENV_KEY_HARDWARE_PATH = ERASE_START + "runtime.hardware.path" ; //$NON-NLS-1$
62- private static final String ENV_KEY_PLATFORM_PATH = ERASE_START + "runtime.platform.path" ; //$NON-NLS-1$
63- private static final String ENV_KEY_REFERENCED_CORE_PLATFORM_PATH = ERASE_START + REFERENCED + DOT + CORE + DOT
64- + PATH ;
65- private static final String ENV_KEY_REFERENCED_VARIANT_PLATFORM_PATH = ERASE_START + REFERENCED + DOT + VARIANT
66- + DOT + PATH ;
67- private static final String ENV_KEY_REFERENCED_UPLOAD_PLATFORM_PATH = ERASE_START + REFERENCED + DOT + UPLOAD
68- + PATH ;
55+ private static final String ENV_KEY_SERIAL_PORT = "serial_port" ; //$NON-NLS-1$
56+ private static final String ENV_KEY_SERIAL_DOT_PORT = "serial.port" ; //$NON-NLS-1$
57+ private static final String ENV_KEY_SERIAL_PORT_FILE = "serial.port.file" ; //$NON-NLS-1$
58+ private static final String ENV_KEY_BUILD_VARIANT_PATH = BUILD + DOT + VARIANT + DOT + PATH ;
59+ private static final String ENV_KEY_BUILD_ACTUAL_CORE_PATH = BUILD + DOT + CORE + DOT + PATH ;
60+ private static final String ENV_KEY_BUILD_ARCH = BUILD + DOT + "arch" ; //$NON-NLS-1$
61+ private static final String ENV_KEY_HARDWARE_PATH = RUNTIME + DOT + HARDWARE + DOT + PATH ;
62+ private static final String ENV_KEY_PLATFORM_PATH = RUNTIME + DOT + PLATFORM + DOT + PATH ;
63+ private static final String ENV_KEY_REFERENCED_CORE_PLATFORM_PATH = REFERENCED + DOT + CORE + DOT + PATH ;
64+ private static final String ENV_KEY_REFERENCED_VARIANT_PLATFORM_PATH = REFERENCED + DOT + VARIANT + DOT + PATH ;
65+ private static final String ENV_KEY_REFERENCED_UPLOAD_PLATFORM_PATH = REFERENCED + DOT + UPLOAD + PATH ;
6966
7067 // preference nodes
7168 private static final String NODE_ARDUINO = Activator .NODE_ARDUINO ;
72- private static final String JANTJE_ACTION_UPLOAD = ENV_KEY_JANTJE_START + UPLOAD ; // this is actually the programmer
7369 private static final IEclipsePreferences myStorageNode = InstanceScope .INSTANCE .getNode (NODE_ARDUINO );
7470 private static final TxtFile pluginPreProcessingPlatformTxt = new TxtFile (
7571 ConfigurationPreferences .getPreProcessingPlatformFile ());
@@ -683,7 +679,7 @@ public String getUploadCommand(ICConfigurationDescription confdesc) {
683679 if (isNetworkUpload ()) {
684680 networkPrefix = DOT + NETWORK_PREFIX ;
685681 }
686- String key = A_TOOLS + upLoadTool + DOT + action + networkPrefix + DOT + PATTERN ;
682+ String key = TOOLS + DOT + upLoadTool + DOT + action + networkPrefix + DOT + PATTERN ;
687683 String ret = Common .getBuildEnvironmentVariable (confdesc , key , EMPTY );
688684 if (ret .isEmpty ()) {
689685 Common .log (new Status (IStatus .ERROR , CORE_PLUGIN_ID , key + " : not found in the platform.txt file" )); //$NON-NLS-1$
@@ -911,7 +907,7 @@ public Map<String, String> getEnvVars() {
911907 String menuID = curOption .getKey ();
912908 String SelectedMenuItemID = curOption .getValue ();
913909 KeyValueTree curSelectedMenuItem = menuData .getChild (menuID + DOT + SelectedMenuItemID );
914- allVars .putAll (curSelectedMenuItem .toKeyValues (ERASE_START , false ));
910+ allVars .putAll (curSelectedMenuItem .toKeyValues (EMPTY , false ));
915911 }
916912
917913 // add the stuff that comes with the plugin that is marked as post
@@ -956,7 +952,7 @@ private Map<String, String> getEnVarPlatformInfo() {
956952 * arduino recipes. Therefore I split the arduino recipes into parts (based on
957953 * the arduino keys) and connect them again in the plugin.xml using the CDT
958954 * keys. This code assumes that the command is in following order ${first part}
959- * ${files} ${second part} [${ARCHIVE_FILE } ${third part}] with [optional]
955+ * ${files} ${second part} [${archive_file } ${third part}] with [optional]
960956 *
961957 * Secondly The handling of the upload variables is done differently in arduino
962958 * than here. This is taken care of here. for example the output of this input
@@ -969,10 +965,10 @@ private Map<String, String> getEnVarPlatformInfo() {
969965 * are done here so no special code is needed to handle programmers
970966 *
971967 * Fourthly The build path for the core is {BUILD.PATH}/core/core in sloeber
972- * where it is {BUILD.PATH }/core/ in arduino world and used to be {BUILD.PATH }/
968+ * where it is {build.path }/core/ in arduino world and used to be {build.path }/
973969 * This only gives problems in the link command as sometimes there are hardcoded
974- * links to some sys files so ${A.BUILD.PATH }/core/sys* ${A.BUILD.PATH }/sys* is
975- * replaced with ${A.BUILD.PATH }/core/core/sys*
970+ * links to some sys files so ${build.path }/core/sys* ${build.path }/sys* is
971+ * replaced with ${build.path }/core/core/sys*
976972 *
977973 * @param contribEnv
978974 * @param confDesc
@@ -998,7 +994,7 @@ private Map<String, String> getEnvVarsPostProcessing(Map<String, String> vars) {
998994 recipe = recipe .replace (" -o " , " " ); //$NON-NLS-1$ //$NON-NLS-2$
999995 }
1000996 String recipeParts [] = recipe .split (
1001- "(\" \\ $\\ {A. object_file}\" )|(\\ $\\ {A. object_files})|(\" \\ $\\ {A. source_file}\" )|(\" [^\" ]*\\ $\\ {A. archive_file}\" )|(\" [^\" ]*\\ $\\ {A. archive_file_path}\" )" , //$NON-NLS-1$
997+ "(\" \\ $\\ {object_file}\" )|(\\ $\\ {object_files})|(\" \\ $\\ {source_file}\" )|(\" [^\" ]*\\ $\\ {archive_file}\" )|(\" [^\" ]*\\ $\\ {archive_file_path}\" )" , //$NON-NLS-1$
1002998 3 );
1003999
10041000 switch (recipeParts .length ) {
@@ -1032,19 +1028,19 @@ private Map<String, String> getEnvVarsPostProcessing(Map<String, String> vars) {
10321028 }
10331029 }
10341030 Collections .sort (objcopyCommand );
1035- extraVars .put (JANTJE_OBJCOPY , StringUtil .join (objcopyCommand , "\n \t " )); //$NON-NLS-1$
1031+ extraVars .put (SLOEBER_OBJCOPY , StringUtil .join (objcopyCommand , "\n \t " )); //$NON-NLS-1$
10361032
10371033 // handle the hooks
1038- extraVars .putAll (getEnvVarsHookBuild (vars , "A.JANTJE .pre.link" , //$NON-NLS-1$
1039- "A. recipe.hooks.linking.prelink.XX.pattern" , false )); //$NON-NLS-1$
1040- extraVars .putAll (getEnvVarsHookBuild (vars , "A.JANTJE .post.link" , //$NON-NLS-1$
1041- "A. recipe.hooks.linking.postlink.XX.pattern" , true )); //$NON-NLS-1$
1042- extraVars .putAll (getEnvVarsHookBuild (vars , "A.JANTJE. prebuild" , "A. recipe.hooks.prebuild.XX.pattern" , //$NON-NLS-1$ //$NON-NLS-2$
1034+ extraVars .putAll (getEnvVarsHookBuild (vars , "sloeber .pre.link" , //$NON-NLS-1$
1035+ "recipe.hooks.linking.prelink.XX.pattern" , false )); //$NON-NLS-1$
1036+ extraVars .putAll (getEnvVarsHookBuild (vars , "sloeber .post.link" , //$NON-NLS-1$
1037+ "recipe.hooks.linking.postlink.XX.pattern" , true )); //$NON-NLS-1$
1038+ extraVars .putAll (getEnvVarsHookBuild (vars , "sloeber. prebuild" , "recipe.hooks.prebuild.XX.pattern" , //$NON-NLS-1$ //$NON-NLS-2$
10431039 false ));
1044- extraVars .putAll (getEnvVarsHookBuild (vars , "A.JANTJE .sketch.prebuild" , //$NON-NLS-1$
1045- "A. recipe.hooks.sketch.prebuild.XX.pattern" , false )); //$NON-NLS-1$
1046- extraVars .putAll (getEnvVarsHookBuild (vars , "A.JANTJE .sketch.postbuild" , //$NON-NLS-1$
1047- "A. recipe.hooks.sketch.postbuild.XX.pattern" , false )); //$NON-NLS-1$
1040+ extraVars .putAll (getEnvVarsHookBuild (vars , "sloeber .sketch.prebuild" , //$NON-NLS-1$
1041+ "recipe.hooks.sketch.prebuild.XX.pattern" , false )); //$NON-NLS-1$
1042+ extraVars .putAll (getEnvVarsHookBuild (vars , "sloeber .sketch.postbuild" , //$NON-NLS-1$
1043+ "recipe.hooks.sketch.postbuild.XX.pattern" , false )); //$NON-NLS-1$
10481044
10491045 // add -relax for mega boards; the arduino ide way
10501046 String buildMCU = vars .get (ENV_KEY_BUILD_MCU );
0 commit comments