Skip to content

Commit aa01546

Browse files
committed
Switched to a nonconflicting delimeter |. Compile process is working. Need to make sure that it matches 1.0 process exactly.
1 parent 67c9dfc commit aa01546

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ static private String[] getCommandCompilerS(String avrBasePath,
596596
};
597597

598598
String command = compileFormat.format( Args );
599-
String[] commandArray = command.split("\|");
599+
String[] commandArray = command.split("\\|");
600600
return commandArray;
601601
}
602602

@@ -655,7 +655,7 @@ private String[] getCommandCompilerC(String avrBasePath,
655655
};
656656

657657
String command = compileFormat.format( Args );
658-
String[] commandArray = command.split("\|");
658+
String[] commandArray = command.split("\\|");
659659
return commandArray;
660660
}
661661
/*
@@ -714,7 +714,7 @@ static private String[] getCommandCompilerCPP(String avrBasePath,
714714
};
715715

716716
String command = compileFormat.format( Args );
717-
String[] commandArray = command.split("\|");
717+
String[] commandArray = command.split("\\|");
718718

719719
/*
720720
System.out.println("command:" + command);
@@ -863,7 +863,7 @@ void compileCore (String avrBasePath, String buildPath, String corePath, String
863863
System.out.println("compileCore(...) substitute");
864864

865865
commandString = compileFormat.format( Args );
866-
String[] commandArray = commandString.split("\|");
866+
String[] commandArray = commandString.split("\\|");
867867
execAsynchronously(commandArray);
868868

869869

@@ -881,7 +881,7 @@ void compileLink(String avrBasePath, String buildPath, String corePath, ArrayLis
881881
String objectFileList = "";
882882

883883
for (File file : objectFiles) {
884-
objectFileList = objectFileList + file.getAbsolutePath() + "\|";
884+
objectFileList = objectFileList + file.getAbsolutePath() + "|";
885885
}
886886
System.out.println("objectFileList: " + objectFileList);
887887

@@ -900,7 +900,7 @@ void compileLink(String avrBasePath, String buildPath, String corePath, ArrayLis
900900
configPreferences.get("ldscript"),
901901
};
902902
commandString = compileFormat.format( Args );
903-
String[] commandArray = commandString.split("\|");
903+
String[] commandArray = commandString.split("\\|");
904904
execAsynchronously(commandArray);
905905
}
906906

@@ -922,7 +922,7 @@ void compileEep (String avrBasePath, String buildPath, ArrayList<String> include
922922
buildPath + File.separator + primaryClassName
923923
};
924924
commandString = compileFormat.format( Args );
925-
String[] commandArray = commandString.split("\|");
925+
String[] commandArray = commandString.split("\\|");
926926
execAsynchronously(commandArray);
927927
}
928928

@@ -944,7 +944,7 @@ void compileHex (String avrBasePath, String buildPath, ArrayList<String> include
944944
buildPath + File.separator + primaryClassName
945945
};
946946
commandString = compileFormat.format( Args );
947-
String[] commandArray = commandString.split("\|");
947+
String[] commandArray = commandString.split("\\|");
948948
execAsynchronously(commandArray);
949949
}
950950

@@ -1016,7 +1016,7 @@ private static String preparePaths(ArrayList<String> includePaths) {
10161016
String includes = "";
10171017
for (int i = 0; i < includePaths.size(); i++)
10181018
{
1019-
includes = includes + (" -I" + (String) includePaths.get(i)) + "\|";
1019+
includes = includes + (" -I" + (String) includePaths.get(i)) + "|";
10201020
}
10211021
//logger.debug("Paths prepared: " + includes);
10221022
return includes;

hardware/arduino/platforms.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ avr.compiler.cpp.flags=|-c|-g|-Os|-w|-fno-exceptions|-ffunction-sections|-fdata-
5151
avr.compiler.ar.cmd=avr-ar
5252
avr.compiler.ar.flags=rcs
5353
avr.compiler.objcopy.cmd=avr-objcopy
54-
avr.compiler.objcopy.eep.flags=|-O|ihex|-j|.eeprom|--set-section-flags=.eeprom=alloc|load|--no-change-warnings|--change-section-lma|.eeprom=0
54+
avr.compiler.objcopy.eep.flags=|-O|ihex|-j|.eeprom|--set-section-flags=.eeprom=alloc,load|--no-change-warnings|--change-section-lma|.eeprom=0
5555
avr.compiler.elf2hex.flags=|-O|ihex|-R|.eeprom
5656
avr.compiler.elf2hex.cmd=avr-objcopy
5757
avr.compiler.ldflags=

0 commit comments

Comments
 (0)