Skip to content

Additional build hooks #3236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2015
Merged

Additional build hooks #3236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1002e2
Add build symbols for compile time and sketch path
PaulStoffregen May 5, 2015
b11d54e
Compiler: adding hooks (custom recipes) between the main phases. New …
May 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion arduino-core/src/processing/app/debug/Compiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.Date;
import java.util.GregorianCalendar;

import cc.arduino.MyStreamPumper;
import cc.arduino.packages.BoardPort;
Expand Down Expand Up @@ -403,26 +405,44 @@ public boolean compile(boolean _verbose, boolean _save) throws RunnerException,
System.err.println();
}
}


runActions("hooks.sketch.prebuild", prefs);

// 1. compile the sketch (already in the buildPath)
progressListener.progress(20);
compileSketch(includeFolders);
sketchIsCompiled = true;

runActions("hooks.sketch.postbuild", prefs);

runActions("hooks.libraries.prebuild", prefs);

// 2. compile the libraries, outputting .o files to: <buildPath>/<library>/
// Doesn't really use configPreferences
progressListener.progress(30);
compileLibraries(includeFolders);

runActions("hooks.libraries.postbuild", prefs);

runActions("hooks.core.prebuild", prefs);

// 3. compile the core, outputting .o files to <buildPath> and then
// collecting them into the core.a library file.
progressListener.progress(40);
compileCore();

runActions("hooks.core.postbuild", prefs);

runActions("hooks.linking.prelink", prefs);

// 4. link it all together into the .elf file
progressListener.progress(50);
compileLink();

runActions("hooks.linking.postlink", prefs);

runActions("hooks.objcopy.preobjcopy", prefs);

// 5. run objcopy to generate output files
progressListener.progress(60);
List<String> objcopyPatterns = new ArrayList<String>();
Expand All @@ -435,10 +455,16 @@ public boolean compile(boolean _verbose, boolean _save) throws RunnerException,
runRecipe(recipe);
}

runActions("hooks.objcopy.postobjcopy", prefs);

// 7. save the hex file
if (saveHex) {
runActions("hooks.savehex.presavehex", prefs);

progressListener.progress(80);
saveHex();

runActions("hooks.savehex.postsavehex", prefs);
}

progressListener.progress(90);
Expand Down Expand Up @@ -554,6 +580,17 @@ private PreferencesMap createBuildPreferences(String _buildPath,
p.put("build.variant.path", "");
}

// Build Time
Date d = new Date();
GregorianCalendar cal = new GregorianCalendar();
long current = d.getTime()/1000;
long timezone = cal.get(cal.ZONE_OFFSET)/1000;
long daylight = cal.get(cal.DST_OFFSET)/1000;
p.put("extra.time.utc", Long.toString(current));
p.put("extra.time.local", Long.toString(current + timezone + daylight));
p.put("extra.time.zone", Long.toString(timezone));
p.put("extra.time.dst", Long.toString(daylight));

return p;
}

Expand Down Expand Up @@ -1124,6 +1161,7 @@ void runActions(String recipeClass, PreferencesMap prefs) throws RunnerException
void runRecipe(String recipe) throws RunnerException, PreferencesMapException {
PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + BaseNoGui.REVISION);
dict.put("sketch_path", sketch.getFolder().getAbsolutePath());

String[] cmdArray;
String cmd = prefs.getOrExcept(recipe);
Expand Down