Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Turn macosx debugging off. Fixed the issue of object files not being …

…in seperated array entries.

Former-commit-id: 010cff0
  • Loading branch information...
commit 4ecc6e44c7a4a14a4d9b8543fb01177808f75cb3 1 parent faabec3
Ricklon ricklon authored
Showing with 18 additions and 17 deletions.
  1. +17 −16 app/src/processing/app/debug/Compiler.java
  2. +1 −1  build/build.xml
33 app/src/processing/app/debug/Compiler.java
View
@@ -245,7 +245,7 @@ public boolean compile(Sketch sketch, String buildPath,String primaryClassName,
private void execAsynchronously(String command) throws RunnerException
{
{
- //logger.debug("execAsynchronously: start");
+ logger.debug("execAsynchronously: start");
String[] commandArray = command.split("::");
List<String> stringList = new ArrayList<String>();
@@ -265,16 +265,12 @@ private void execAsynchronously(String command) throws RunnerException
{
//System.out.print(command);
//System.out.println();
- // if(logger.isDebugEnabled()) {
- /*
- for (int i = 0; i < commandArray.length; i++)
- {
- logger.debug("commandArray: " + commandArray[i]);
+ if(logger.isDebugEnabled()) {
+ for (int i = 0; i < commandArray.length; i++) {
+ logger.debug("commandArray[" + i + "]: " + commandArray[i]);
}
-
logger.debug("Command: " + command.replace(":"," "));
- */
- // }
+ }
}
firstErrorFound = false; // haven't found any errors yet
@@ -398,7 +394,7 @@ static private String getCommandCompilerS(String avrBasePath,
ArrayList<String> includePaths, String sourceName, String objectName,
HashMap<String, String> configPreferences)
{
-
+ logger.debug("getCommandCompilerS: start");
String baseCommandString = configPreferences.get("recipe.cpp.o.pattern");
MessageFormat compileFormat = new MessageFormat(baseCommandString);
//getIncludes to String
@@ -420,14 +416,14 @@ static private String getCommandCompilerS(String avrBasePath,
};
return compileFormat.format( Args );
-
-
}
+
//removed static
private String getCommandCompilerC(String avrBasePath,
ArrayList<String> includePaths, String sourceName, String objectName,
HashMap<String, String> configPreferences)
{
+ logger.debug("getCommandCompilerC: start");
String baseCommandString = configPreferences.get("recipe.c.o.pattern");
MessageFormat compileFormat = new MessageFormat(baseCommandString);
//getIncludes to String
@@ -454,7 +450,7 @@ static private String getCommandCompilerCPP(String avrBasePath,
ArrayList<String> includePaths, String sourceName, String objectName,
HashMap<String, String> configPreferences)
{
-
+ logger.debug("getCommandCompilerCPP: start");
String baseCommandString = configPreferences.get("recipe.cpp.o.pattern");
MessageFormat compileFormat = new MessageFormat(baseCommandString);
//getIncludes to String
@@ -542,6 +538,7 @@ public boolean accept(File dir, String name) {
void compileSketch(String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
throws RunnerException
{
+ logger.debug("compileSketch: start");
this.objectFiles.addAll(compileFiles(avrBasePath, buildPath, includePaths,
findFilesInPath(buildPath, "S", false),
findFilesInPath(buildPath, "c", false),
@@ -554,6 +551,7 @@ void compileSketch(String avrBasePath, String buildPath, ArrayList<String> inclu
void compileLibraries (String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
throws RunnerException
{
+ logger.debug("compileLibraries: start");
for (File libraryFolder : sketch.getImportedLibraries())
{
File outputFolder = new File(buildPath, libraryFolder.getName());
@@ -585,6 +583,8 @@ void compileLibraries (String avrBasePath, String buildPath, ArrayList<String> i
void compileCore (String avrBasePath, String buildPath, String corePath, HashMap<String, String> configPreferences)
throws RunnerException
{
+ logger.debug("compileCore(...) start");
+
ArrayList<String> includePaths = new ArrayList();
includePaths.add(corePath); //include core path only
String baseCommandString = configPreferences.get("recipe.ar.pattern");
@@ -623,14 +623,14 @@ void compileCore (String avrBasePath, String buildPath, String corePath, HashMap
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() + " ";
+ objectFileList = objectFileList + file.getAbsolutePath() + "::";
}
Object[] Args = {
@@ -655,6 +655,7 @@ void compileLink(String avrBasePath, String buildPath, String corePath, ArrayLis
void compileEep (String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
throws RunnerException
{
+ logger.debug("compileEep: start");
String baseCommandString = configPreferences.get("recipe.objcopy.eep.pattern");
String commandString = "";
MessageFormat compileFormat = new MessageFormat(baseCommandString);
@@ -676,7 +677,7 @@ void compileEep (String avrBasePath, String buildPath, ArrayList<String> include
void compileHex (String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
throws RunnerException
{
-
+ logger.debug("compileHex: start");
String baseCommandString = configPreferences.get("recipe.objcopy.hex.pattern");
String commandString = "";
MessageFormat compileFormat = new MessageFormat(baseCommandString);
2  build/build.xml
View
@@ -221,7 +221,7 @@
</target>
<target name="macosx-run" depends="macosx-build" description="Run Mac OS X version">
- <exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="false"/>
+ <exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="true"/>
</target>
<target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a .dmg of the Mac OS X version">
Please sign in to comment.
Something went wrong with that request. Please try again.