Merge remote-tracking branch 'upstream/mz'

chipKIT32 · Mar 19, 2014 · 5e5d501 · 5e5d501
2 parents e26a7e7 + 547889f
commit 5e5d501
Show file tree

Hide file tree

Showing 26 changed files with 695 additions and 428 deletions.
diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java
@@ -687,59 +687,60 @@ void compileCore (String avrBasePath, String buildPath, String corePath, String
 
 	// 4. link it all together into the .elf file
 	void compileLink(String avrBasePath, String buildPath, String corePath, ArrayList<String> includePaths, HashMap<String, String> configPreferences) 
-			throws RunnerException 
-			{	
-		logger.debug("compileLink: start");
-		String baseCommandString = configPreferences.get("recipe.c.combine.pattern");
-		String commandString = "";
-		MessageFormat compileFormat = new MessageFormat(baseCommandString);	
-		String objectFileList = "";
-
-		for (File file : objectFiles) {
-			objectFileList = objectFileList + file.getAbsolutePath() + "::";
-		}
-
-        String variant = configPreferences.get("build.variant");
-        Target t;
-        String variantPath;
-        if (variant.indexOf(':') == -1) {
-            t = Base.getTarget();
-            variantPath = t.getVariantFolder(variant).getAbsolutePath();
-        } else {
-            t = Base.targetsTable.get(variant.substring(0, variant.indexOf(':')));
-            variantPath = t.getVariantFolder(variant.substring(0, variant.indexOf(':'))).getAbsolutePath();
-		}
-
-        String ldscript = configPreferences.get("ldscript");
+		throws RunnerException 
+		{	
+			logger.debug("compileLink: start");
+			String baseCommandString = configPreferences.get("recipe.c.combine.pattern");
+			String commandString = "";
+			MessageFormat compileFormat = new MessageFormat(baseCommandString);	
+			String objectFileList = "";
+
+			for (File file : objectFiles) {
+				objectFileList = objectFileList + file.getAbsolutePath() + "::";
+			}
 
-        String foundPath = null;
-        if (ldscript != null) {
-            File testFile = null;
+			String variant = configPreferences.get("build.variant");
+			logger.debug("variant: " + variant);
+			Target t;
+			String variantPath;
+			if (variant.indexOf(':') == -1) {
+				t = Base.getTarget();
+				variantPath = t.getVariantFolder(variant).getAbsolutePath();
+			} else {
+				t = Base.targetsTable.get(variant.substring(0, variant.indexOf(':')));
+				variantPath = t.getVariantFolder(variant.substring(0, variant.indexOf(':'))).getAbsolutePath();
+			}
 
-            testFile = new File(variantPath, ldscript);
-            logger.debug("Searching for " + variantPath + "/" + ldscript + "...");
-            if (testFile.exists()) {
-              logger.debug("... found");
-              foundPath = variantPath;
-            } else {
-              logger.debug("Searching for " + corePath + "/" + ldscript + "...");
-              testFile = new File(corePath, ldscript);
-              if (testFile.exists()) {
-                logger.debug("... found");
-                foundPath = corePath;
-              }
-            }
+			String ldscript = configPreferences.get("ldscript");
+
+			String foundPath = null;
+			if (ldscript != null) {
+				File testFile = null;
+
+				testFile = new File(variantPath, ldscript);
+				logger.debug("Searching for " + variantPath + "/" + ldscript + "...");
+				if (testFile.exists()) {
+					logger.debug("... found");
+					foundPath = variantPath;
+				} else {
+					logger.debug("Searching for " + corePath + "/" + ldscript + "...");
+					testFile = new File(corePath, ldscript);
+					if (testFile.exists()) {
+						logger.debug("... found");
+						foundPath = corePath;
+					}
+				}
 
-            if (foundPath == null) {
-                System.out.println("Linker script not found: " + ldscript);
-                return;
-            }
-        } else {
-            ldscript = "";
-            foundPath = "";
-        }
+				if (foundPath == null) {
+					System.out.println("Linker script not found: " + ldscript);
+					return;
+				}
+			} else {
+				ldscript = "";
+				foundPath = "";
+			}
 
-		Object[] Args = {
+			Object[] Args = {
 				avrBasePath,
 				configPreferences.get("compiler.c.elf.cmd"),
 				configPreferences.get("compiler.c.elf.flags"),
@@ -754,11 +755,11 @@ void compileLink(String avrBasePath, String buildPath, String corePath, ArrayLis
 				configPreferences.get("ldscript") != null ? configPreferences.get("ldscript")  : "",
                 corePath,
 				configPreferences.get("ldcommon") != null ? configPreferences.get("ldcommon")  : "",
-		};
-		commandString = compileFormat.format(  Args );
-        logger.debug("Link command: " + commandString);
-		execAsynchronously(commandString);
-			}
+			};
+			commandString = compileFormat.format(  Args );
+			logger.debug("Link command: " + commandString);
+			execAsynchronously(commandString);
+		}
 
 	// 5. extract EEPROM data (from EEMEM directive) to .eep file.
 	void compileEep (String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences) 

diff --git a/build/upload.properties b/build/upload.properties
@@ -1,8 +1,8 @@
-#Tue, 21 Jan 2014 23:22:46 -0500
+#Fri, 07 Mar 2014 21:43:18 -0500
 aws.access_key=
 aws.secret_key=
 
 extension=dmg
 
-uploadversion=0023-macosx-20140121-test
+uploadversion=0023-macosx-20140307-test
 
diff --git a/build/windows/dist/drivers/Arduino MEGA 2560.inf b/build/windows/dist/drivers/Arduino MEGA 2560.inf
diff --git a/build/windows/dist/drivers/Arduino UNO.inf b/build/windows/dist/drivers/Arduino UNO.inf
diff --git a/build/windows/dist/drivers/Old_Arduino_Drivers.zip b/build/windows/dist/drivers/Old_Arduino_Drivers.zip
diff --git a/build/windows/dist/drivers/README.txt b/build/windows/dist/drivers/README.txt
@@ -0,0 +1,7 @@
+
+With this version of Arduino a new all-in-one driver (with
+security signature for Windows 8) is supplied.
+
+The old (deprected) drivers are still available in the
+Old_Arduino_Drivers.zip
+
diff --git a/build/windows/dist/drivers/arduino.cat b/build/windows/dist/drivers/arduino.cat