arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

A bit of cleanup. Delimeter not figured out yet.

Browse Source
This commit is contained in:
ricklon
2011-06-17 00:54:58 -04:00
parent a57f35fb51
commit 67c9dfc667
2 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
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);
@ -876,13 +876,12 @@ public class Compiler implements MessageConsumer {
{
System.out.println("compileLink: start");
String baseCommandString = configPreferences.get("recipe.c.combine.pattern");
System.out.println("baseCommandstring: " + baseCommandString);
String commandString = "";
MessageFormat compileFormat = new MessageFormat(baseCommandString);
String objectFileList = "";
for (File file : objectFiles) {
objectFileList = objectFileList + file.getAbsolutePath() + ",";
objectFileList = objectFileList + file.getAbsolutePath() + "\|";
}
System.out.println("objectFileList: " + objectFileList);
@ -901,13 +900,7 @@ public class Compiler implements MessageConsumer {
configPreferences.get("ldscript"),
};
commandString = compileFormat.format( Args );
String[] commandArray = commandString.split(",");
System.out.println("commandString: " + commandString);
for (int ii = 0; ii < commandArray.length; ii++)
{
System.out.println("'" + commandArray[ii] + "'");
}
System.out.println("4. compileLink:prexec");
String[] commandArray = commandString.split("\|");
execAsynchronously(commandArray);
}
@ -929,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);
}
@ -951,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);
}
@ -1023,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;