Platform is now implicit when referring to other packages, e.g. 'arduino:avr:arduino' becomes 'arduino:arduino'

Author: cmaglie

app/src/processing/app/Base.java

@@ -1587,13 +1587,13 @@ static public TargetPlatform getTargetPlatform(String pack, String platform) {
   }
 
   // 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();

app/src/processing/app/debug/AvrdudeUploader.java

@@ -49,9 +49,10 @@ public boolean uploadUsingPreferences(String buildPath, String className, boolea
       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<String> params = getProgrammerCommands(targetPlatform, programmer);
@@ -91,9 +92,10 @@ public boolean burnBootloader() throws RunnerException {
     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 @@ protected boolean burnBootloader(Collection<String> params)
     List<String> bootloader = new ArrayList<String>();
     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];
-			}
-
-			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");
-		}
+    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();
+
+      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");
 

app/src/processing/app/debug/Compiler.java

@@ -135,10 +135,11 @@ public boolean compile(Sketch _sketch, String _buildPath,
       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 boolean compile(Sketch _sketch, String _buildPath,
         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();
     }