Skip to content
This repository
Browse code

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 2 changed files with 18 additions and 17 deletions. Show diff stats Hide diff stats

  1. +17 16 app/src/processing/app/debug/Compiler.java
  2. +1 1  build/build.xml
33 app/src/processing/app/debug/Compiler.java
@@ -245,7 +245,7 @@ public boolean compile(Sketch sketch, String buildPath,String primaryClassName,
245 245 private void execAsynchronously(String command) throws RunnerException
246 246 {
247 247 {
248   - //logger.debug("execAsynchronously: start");
  248 + logger.debug("execAsynchronously: start");
249 249 String[] commandArray = command.split("::");
250 250
251 251 List<String> stringList = new ArrayList<String>();
@@ -265,16 +265,12 @@ private void execAsynchronously(String command) throws RunnerException
265 265 {
266 266 //System.out.print(command);
267 267 //System.out.println();
268   - // if(logger.isDebugEnabled()) {
269   - /*
270   - for (int i = 0; i < commandArray.length; i++)
271   - {
272   - logger.debug("commandArray: " + commandArray[i]);
  268 + if(logger.isDebugEnabled()) {
  269 + for (int i = 0; i < commandArray.length; i++) {
  270 + logger.debug("commandArray[" + i + "]: " + commandArray[i]);
273 271 }
274   -
275 272 logger.debug("Command: " + command.replace(":"," "));
276   - */
277   - // }
  273 + }
278 274 }
279 275
280 276 firstErrorFound = false; // haven't found any errors yet
@@ -398,7 +394,7 @@ static private String getCommandCompilerS(String avrBasePath,
398 394 ArrayList<String> includePaths, String sourceName, String objectName,
399 395 HashMap<String, String> configPreferences)
400 396 {
401   -
  397 + logger.debug("getCommandCompilerS: start");
402 398 String baseCommandString = configPreferences.get("recipe.cpp.o.pattern");
403 399 MessageFormat compileFormat = new MessageFormat(baseCommandString);
404 400 //getIncludes to String
@@ -420,14 +416,14 @@ static private String getCommandCompilerS(String avrBasePath,
420 416 };
421 417
422 418 return compileFormat.format( Args );
423   -
424   -
425 419 }
  420 +
426 421 //removed static
427 422 private String getCommandCompilerC(String avrBasePath,
428 423 ArrayList<String> includePaths, String sourceName, String objectName,
429 424 HashMap<String, String> configPreferences)
430 425 {
  426 + logger.debug("getCommandCompilerC: start");
431 427 String baseCommandString = configPreferences.get("recipe.c.o.pattern");
432 428 MessageFormat compileFormat = new MessageFormat(baseCommandString);
433 429 //getIncludes to String
@@ -454,7 +450,7 @@ static private String getCommandCompilerCPP(String avrBasePath,
454 450 ArrayList<String> includePaths, String sourceName, String objectName,
455 451 HashMap<String, String> configPreferences)
456 452 {
457   -
  453 + logger.debug("getCommandCompilerCPP: start");
458 454 String baseCommandString = configPreferences.get("recipe.cpp.o.pattern");
459 455 MessageFormat compileFormat = new MessageFormat(baseCommandString);
460 456 //getIncludes to String
@@ -542,6 +538,7 @@ public boolean accept(File dir, String name) {
542 538 void compileSketch(String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
543 539 throws RunnerException
544 540 {
  541 + logger.debug("compileSketch: start");
545 542 this.objectFiles.addAll(compileFiles(avrBasePath, buildPath, includePaths,
546 543 findFilesInPath(buildPath, "S", false),
547 544 findFilesInPath(buildPath, "c", false),
@@ -554,6 +551,7 @@ void compileSketch(String avrBasePath, String buildPath, ArrayList<String> inclu
554 551 void compileLibraries (String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
555 552 throws RunnerException
556 553 {
  554 + logger.debug("compileLibraries: start");
557 555 for (File libraryFolder : sketch.getImportedLibraries())
558 556 {
559 557 File outputFolder = new File(buildPath, libraryFolder.getName());
@@ -585,6 +583,8 @@ void compileLibraries (String avrBasePath, String buildPath, ArrayList<String> i
585 583 void compileCore (String avrBasePath, String buildPath, String corePath, HashMap<String, String> configPreferences)
586 584 throws RunnerException
587 585 {
  586 + logger.debug("compileCore(...) start");
  587 +
588 588 ArrayList<String> includePaths = new ArrayList();
589 589 includePaths.add(corePath); //include core path only
590 590 String baseCommandString = configPreferences.get("recipe.ar.pattern");
@@ -623,14 +623,14 @@ void compileCore (String avrBasePath, String buildPath, String corePath, HashMap
623 623 void compileLink(String avrBasePath, String buildPath, String corePath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
624 624 throws RunnerException
625 625 {
626   -
  626 + logger.debug("compileLink: start");
627 627 String baseCommandString = configPreferences.get("recipe.c.combine.pattern");
628 628 String commandString = "";
629 629 MessageFormat compileFormat = new MessageFormat(baseCommandString);
630 630 String objectFileList = "";
631 631
632 632 for (File file : objectFiles) {
633   - objectFileList = objectFileList + file.getAbsolutePath() + " ";
  633 + objectFileList = objectFileList + file.getAbsolutePath() + "::";
634 634 }
635 635
636 636 Object[] Args = {
@@ -655,6 +655,7 @@ void compileLink(String avrBasePath, String buildPath, String corePath, ArrayLis
655 655 void compileEep (String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
656 656 throws RunnerException
657 657 {
  658 + logger.debug("compileEep: start");
658 659 String baseCommandString = configPreferences.get("recipe.objcopy.eep.pattern");
659 660 String commandString = "";
660 661 MessageFormat compileFormat = new MessageFormat(baseCommandString);
@@ -676,7 +677,7 @@ void compileEep (String avrBasePath, String buildPath, ArrayList<String> include
676 677 void compileHex (String avrBasePath, String buildPath, ArrayList<String> includePaths, HashMap<String, String> configPreferences)
677 678 throws RunnerException
678 679 {
679   -
  680 + logger.debug("compileHex: start");
680 681 String baseCommandString = configPreferences.get("recipe.objcopy.hex.pattern");
681 682 String commandString = "";
682 683 MessageFormat compileFormat = new MessageFormat(baseCommandString);
2  build/build.xml
@@ -221,7 +221,7 @@
221 221 </target>
222 222
223 223 <target name="macosx-run" depends="macosx-build" description="Run Mac OS X version">
224   - <exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="false"/>
  224 + <exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="true"/>
225 225 </target>
226 226
227 227 <target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a .dmg of the Mac OS X version">

0 comments on commit 4ecc6e4

Please sign in to comment.
Something went wrong with that request. Please try again.