From a417455d5a551ff40b407e9ebc850de1e516e0eb Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sat, 31 Dec 2011 15:23:54 +0100 Subject: [PATCH] Platform is now implicit when referring to other packages, e.g. 'arduino:avr:arduino' becomes 'arduino:arduino' --- app/src/processing/app/Base.java | 14 +++--- .../processing/app/debug/AvrdudeUploader.java | 47 ++++++++++--------- app/src/processing/app/debug/Compiler.java | 14 +++--- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 2e769eb82..ddd9e881f 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -1587,13 +1587,13 @@ public class Base { } // Get a specific platform preferences inside actual package - static public PreferencesMap getPlatformPreferences(String platformName) { - if (platformName == null) - platformName = Preferences.get("platform"); - TargetPackage pack = targetsTable.get(Preferences.get("target_package")); - TargetPlatform target = pack.get(platformName); - return target.getPlatform(); - } + static public PreferencesMap getPlatformPreferences(String platformName) { + if (platformName == null) + platformName = Preferences.get("platform"); + TargetPackage pack = targetsTable.get(Preferences.get("target_package")); + TargetPlatform target = pack.get(platformName); + return target.getPlatform(); + } static public PreferencesMap getBoardPreferences() { TargetPlatform target = getTarget(); diff --git a/app/src/processing/app/debug/AvrdudeUploader.java b/app/src/processing/app/debug/AvrdudeUploader.java index eea81649b..136d8935d 100755 --- a/app/src/processing/app/debug/AvrdudeUploader.java +++ b/app/src/processing/app/debug/AvrdudeUploader.java @@ -49,9 +49,10 @@ public class AvrdudeUploader extends Uploader { TargetPlatform targetPlatform = Base.getTarget(); if (programmer.contains(":")) { - String[] split = programmer.split(":"); - targetPlatform = Base.getTargetPlatform(split[0], split[1]); - programmer = split[2]; + String[] split = programmer.split(":", 2); + targetPlatform = Base.getTargetPlatform(split[0], Preferences + .get("target_platform")); + programmer = split[1]; } Collection params = getProgrammerCommands(targetPlatform, programmer); @@ -91,9 +92,10 @@ public class AvrdudeUploader extends Uploader { String programmer = Preferences.get("programmer"); TargetPlatform targetPlatform = Base.getTarget(); if (programmer.contains(":")) { - String[] split = programmer.split(":"); - targetPlatform = Base.getTargetPlatform(split[0], split[1]); - programmer = split[2]; + String[] split = programmer.split(":", 2); + targetPlatform = Base.getTargetPlatform(split[0], Preferences + .get("target_platform")); + programmer = split[1]; } return burnBootloader(getProgrammerCommands(targetPlatform, programmer)); } @@ -146,24 +148,25 @@ public class AvrdudeUploader extends Uploader { List bootloader = new ArrayList(); String bootloaderPath = boardPreferences.get("bootloader.path"); - if (bootloaderPath != null) { - TargetPlatform targetPlatform; - if (bootloaderPath.contains(":")) { - // the current target (associated with the board) - targetPlatform = Base.getTarget(); - } else { - String[] split = bootloaderPath.split(":", 3); - targetPlatform = Base.getTargetPlatform(split[0], split[1]); - bootloaderPath = split[2]; - } + if (bootloaderPath != null) { + TargetPlatform targetPlatform; + if (bootloaderPath.contains(":")) { + // the current target (associated with the board) + targetPlatform = Base.getTarget(); + } else { + String[] split = bootloaderPath.split(":", 2); + targetPlatform = Base.getTargetPlatform(split[0], Preferences + .get("target_platform")); + bootloaderPath = split[1]; + } - File bootloadersFile = new File(targetPlatform.getFolder(), "bootloaders"); - File bootloaderFile = new File(bootloadersFile, bootloaderPath); - bootloaderPath = bootloaderFile.getAbsolutePath(); + File bootloadersFile = new File(targetPlatform.getFolder(), "bootloaders"); + File bootloaderFile = new File(bootloadersFile, bootloaderPath); + bootloaderPath = bootloaderFile.getAbsolutePath(); - bootloader.add("-Uflash:w:" + bootloaderPath + File.separator - + boardPreferences.get("bootloader.file") + ":i"); - } + bootloader.add("-Uflash:w:" + bootloaderPath + File.separator + + boardPreferences.get("bootloader.file") + ":i"); + } if (boardPreferences.get("bootloader.lock_bits") != null) bootloader.add("-Ulock:w:" + boardPreferences.get("bootloader.lock_bits") + ":m"); diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java index 7a56c96e3..5fd4ad2c3 100644 --- a/app/src/processing/app/debug/Compiler.java +++ b/app/src/processing/app/debug/Compiler.java @@ -135,10 +135,11 @@ public class Compiler implements MessageConsumer { coreFolder = new File(t.getFolder(), "cores"); coreFolder = new File(coreFolder, core); } else { - String[] split = core.split(":", 3); - TargetPlatform t = Base.getTargetPlatform(split[0], split[1]); + String[] split = core.split(":", 2); + TargetPlatform t = Base.getTargetPlatform(split[0], Preferences + .get("target_platform")); coreFolder = new File(t.getFolder(), "cores"); - coreFolder = new File(coreFolder, split[2]); + coreFolder = new File(coreFolder, split[1]); } String corePath = coreFolder.getAbsolutePath(); @@ -151,10 +152,11 @@ public class Compiler implements MessageConsumer { variantFolder = new File(t.getFolder(), "variants"); variantFolder = new File(variantFolder, variant); } else { - String[] split = variant.split(":"); - TargetPlatform t = Base.getTargetPlatform(split[0], split[1]); + String[] split = variant.split(":", 2); + TargetPlatform t = Base.getTargetPlatform(split[0], Preferences + .get("target_platform")); variantFolder = new File(t.getFolder(), "variants"); - variantFolder = new File(variantFolder, split[2]); + variantFolder = new File(variantFolder, split[1]); } variantPath = variantFolder.getAbsolutePath(); }