From aa01546b5599db1079aa29c25429dbe2f4ef93d5 Mon Sep 17 00:00:00 2001 From: ricklon Date: Fri, 17 Jun 2011 22:12:21 -0400 Subject: [PATCH] Switched to a nonconflicting delimeter |. Compile process is working. Need to make sure that it matches 1.0 process exactly. --- app/src/processing/app/debug/Compiler.java | 18 +++++++++--------- hardware/arduino/platforms.txt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java index a31837bcf..96cbfe7a4 100644 --- a/app/src/processing/app/debug/Compiler.java +++ b/app/src/processing/app/debug/Compiler.java @@ -596,7 +596,7 @@ public class Compiler implements MessageConsumer { }; String command = compileFormat.format( Args ); - String[] commandArray = command.split("\|"); + String[] commandArray = command.split("\\|"); return commandArray; } @@ -655,7 +655,7 @@ public class Compiler implements MessageConsumer { }; String command = compileFormat.format( Args ); - String[] commandArray = command.split("\|"); + String[] commandArray = command.split("\\|"); return commandArray; } /* @@ -714,7 +714,7 @@ public class Compiler implements MessageConsumer { }; String command = compileFormat.format( Args ); - String[] commandArray = command.split("\|"); + String[] commandArray = command.split("\\|"); /* System.out.println("command:" + command); @@ -863,7 +863,7 @@ public class Compiler implements MessageConsumer { System.out.println("compileCore(...) substitute"); commandString = compileFormat.format( Args ); - String[] commandArray = commandString.split("\|"); + String[] commandArray = commandString.split("\\|"); execAsynchronously(commandArray); @@ -881,7 +881,7 @@ public class Compiler implements MessageConsumer { String objectFileList = ""; for (File file : objectFiles) { - objectFileList = objectFileList + file.getAbsolutePath() + "\|"; + objectFileList = objectFileList + file.getAbsolutePath() + "|"; } System.out.println("objectFileList: " + objectFileList); @@ -900,7 +900,7 @@ public class Compiler implements MessageConsumer { configPreferences.get("ldscript"), }; commandString = compileFormat.format( Args ); - String[] commandArray = commandString.split("\|"); + String[] commandArray = commandString.split("\\|"); execAsynchronously(commandArray); } @@ -922,7 +922,7 @@ public class Compiler implements MessageConsumer { buildPath + File.separator + primaryClassName }; commandString = compileFormat.format( Args ); - String[] commandArray = commandString.split("\|"); + String[] commandArray = commandString.split("\\|"); execAsynchronously(commandArray); } @@ -944,7 +944,7 @@ public class Compiler implements MessageConsumer { buildPath + File.separator + primaryClassName }; commandString = compileFormat.format( Args ); - String[] commandArray = commandString.split("\|"); + String[] commandArray = commandString.split("\\|"); execAsynchronously(commandArray); } @@ -1016,7 +1016,7 @@ public class Compiler implements MessageConsumer { String includes = ""; for (int i = 0; i < includePaths.size(); i++) { - includes = includes + (" -I" + (String) includePaths.get(i)) + "\|"; + includes = includes + (" -I" + (String) includePaths.get(i)) + "|"; } //logger.debug("Paths prepared: " + includes); return includes; diff --git a/hardware/arduino/platforms.txt b/hardware/arduino/platforms.txt index 3f1d2eb7d..dbb3a4086 100755 --- a/hardware/arduino/platforms.txt +++ b/hardware/arduino/platforms.txt @@ -51,7 +51,7 @@ avr.compiler.cpp.flags=|-c|-g|-Os|-w|-fno-exceptions|-ffunction-sections|-fdata- avr.compiler.ar.cmd=avr-ar avr.compiler.ar.flags=rcs avr.compiler.objcopy.cmd=avr-objcopy -avr.compiler.objcopy.eep.flags=|-O|ihex|-j|.eeprom|--set-section-flags=.eeprom=alloc|load|--no-change-warnings|--change-section-lma|.eeprom=0 +avr.compiler.objcopy.eep.flags=|-O|ihex|-j|.eeprom|--set-section-flags=.eeprom=alloc,load|--no-change-warnings|--change-section-lma|.eeprom=0 avr.compiler.elf2hex.flags=|-O|ihex|-R|.eeprom avr.compiler.elf2hex.cmd=avr-objcopy avr.compiler.ldflags=