noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up some of the code. Need to focus getting the 1.0 code compilation changes double checked.

This commit is contained in:
ricklon 2011-06-18 23:44:32 -04:00
parent aa01546b55
commit 43a11be3c9
1 changed files with 3 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,21 +178,14 @@ public class Compiler implements MessageConsumer {
// 1. compile the sketch (already in the buildPath) // 1. compile the sketch (already in the buildPath)
System.out.println("1. compileSketch"); System.out.println("1. compileSketch");
compileSketch(avrBasePath, buildPath, includePaths, configPreferences); compileSketch(avrBasePath, buildPath, includePaths, configPreferences);
/*
objectFiles.addAll(
compileFiles(avrBasePath, buildPath, includePaths,
findFilesInPath(buildPath, "S", false),
findFilesInPath(buildPath, "c", false),
findFilesInPath(buildPath, "cpp", false),
boardPreferences));
*/
// 2. compile the libraries, outputting .o files to: <buildPath>/<library>/ // 2. compile the libraries, outputting .o files to: <buildPath>/<library>/
// 2. compile the libraries, outputting .o files to: // 2. compile the libraries, outputting .o files to:
// <buildPath>/<library>/ // <buildPath>/<library>/
//Doesn't really use configPreferences //Doesn't really use configPreferences
System.out.println("2. compileLibraries"); System.out.println("2. compileLibraries");
compileLibraries(avrBasePath, buildPath, includePaths, configPreferences); compileLibraries(avrBasePath, buildPath, includePaths, configPreferences);
/* /*
for (File libraryFolder : sketch.getImportedLibraries()) { for (File libraryFolder : sketch.getImportedLibraries()) {
@ -315,53 +308,6 @@ public class Compiler implements MessageConsumer {
*/ */
return true; return true;
/*
logger.debug("corePaths: " + this.corePath);
this.objectFiles = new ArrayList<File>();
// 0. include paths for core + all libraries
logger.debug("0. getIncludes");
this.includePaths = getIncludes(this.corePath);
// 1. compile the sketch (already in the buildPath)
logger.debug("1. compileSketch");
compileSketch(avrBasePath, buildPath, includePaths, configPreferences);
// 2. compile the libraries, outputting .o files to:
// <buildPath>/<library>/
//Doesn't really use configPreferences
logger.debug("2. compileLibraries");
compileLibraries(avrBasePath, buildPath, includePaths, configPreferences);
// 3. compile the core, outputting .o files to <buildPath> and then
// collecting them into the core.a library file.
logger.debug("3. compileCore");
compileCore(avrBasePath, buildPath, this.corePath, configPreferences);
// 4. link it all together into the .elf file
logger.debug("4. compileLink");
compileLink(avrBasePath, buildPath, this.corePath, includePaths, configPreferences);
// 5. extract EEPROM data (from EEMEM directive) to .eep file.
logger.debug("5. compileEep");
compileEep(avrBasePath, buildPath, includePaths, configPreferences);
// 6. build the .hex file
logger.debug("6. compileHex");
compileHex(avrBasePath, buildPath, includePaths, configPreferences);
//done
logger.debug("7. compile done");
return true;
*/
} }