rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-21 12:29:23 +01:00
Code Issues Releases Activity

Switched to a nonconflicting delimeter |. Compile process is working. Need to make sure that it matches 1.0 process exactly.

Browse Source
This commit is contained in:
ricklon 2011-06-17 22:12:21 -04:00
parent 67c9dfc667
commit aa01546b55
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/processing/app/debug/Compiler.java
View File

@ -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;

2
hardware/arduino/platforms.txt
View File

@ -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=