update Sketch menu, add Save hex option #2567
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ | |
| import java.io.FileNotFoundException; | ||
| import java.io.FileOutputStream; | ||
| import java.io.FileReader; | ||
| import java.io.FileWriter; | ||
| import java.io.IOException; | ||
| import java.io.PrintWriter; | ||
| import java.util.ArrayList; | ||
|
|
@@ -67,6 +68,7 @@ public class Compiler implements MessageConsumer { | |
| private SketchData sketch; | ||
| private PreferencesMap prefs; | ||
| private boolean verbose; | ||
| private boolean saveHex; | ||
|
|
||
| private List<File> objectFiles; | ||
|
|
||
|
|
@@ -83,7 +85,7 @@ public interface ProgressListener { | |
|
|
||
| private ProgressListener progressListener; | ||
|
|
||
| static public String build(SketchData data, String buildPath, File tempBuildFolder, ProgressListener progListener, boolean verbose, boolean save) throws RunnerException, PreferencesMapException { | ||
| if (SketchData.checkSketchFile(data.getPrimaryFile()) == null) | ||
| BaseNoGui.showError(_("Bad file selected"), | ||
| _("Bad sketch primary file or bad sketch directory structure"), null); | ||
|
|
@@ -112,7 +114,7 @@ static public String build(SketchData data, String buildPath, File tempBuildFold | |
|
|
||
| // compile the program. errors will happen as a RunnerException | ||
| // that will bubble up to whomever called build(). | ||
| if (compiler.compile(verbose, save)) { | ||
| compiler.size(compiler.getBuildPreferences()); | ||
| return primaryClassName; | ||
| } | ||
|
|
@@ -340,10 +342,11 @@ protected void size(PreferencesMap prefs) throws RunnerException { | |
| * @return true if successful. | ||
| * @throws RunnerException Only if there's a problem. Only then. | ||
| */ | ||
| public boolean compile(boolean _verbose, boolean _save) throws RunnerException, PreferencesMapException { | ||
| preprocess(prefs.get("build.path")); | ||
|
|
||
| verbose = _verbose || PreferencesData.getBoolean("build.verbose"); | ||
| saveHex = _save; | ||
| sketchIsCompiled = false; | ||
| objectFiles = new ArrayList<File>(); | ||
|
|
||
|
|
@@ -381,31 +384,37 @@ public boolean compile(boolean _verbose) throws RunnerException, PreferencesMapE | |
| } | ||
|
|
||
| // 1. compile the sketch (already in the buildPath) | ||
| progressListener.progress(20); | ||
| compileSketch(includeFolders); | ||
| sketchIsCompiled = true; | ||
|
|
||
| // 2. compile the libraries, outputting .o files to: <buildPath>/<library>/ | ||
| // Doesn't really use configPreferences | ||
| progressListener.progress(30); | ||
| compileLibraries(includeFolders); | ||
|
|
||
| // 3. compile the core, outputting .o files to <buildPath> and then | ||
| // collecting them into the core.a library file. | ||
| progressListener.progress(40); | ||
| compileCore(); | ||
|
|
||
| // 4. link it all together into the .elf file | ||
| progressListener.progress(50); | ||
| compileLink(); | ||
|
|
||
| // 5. extract EEPROM data (from EEMEM directive) to .eep file. | ||
| progressListener.progress(60); | ||
| runRecipe("recipe.objcopy.eep.pattern"); | ||
|
|
||
| // 6. build the .hex file | ||
| progressListener.progress(70); | ||
| runRecipe("recipe.objcopy.hex.pattern"); | ||
|
|
||
| // 7. save the hex file | ||
| if (saveHex) { | ||
| progressListener.progress(80); | ||
| saveHex(); | ||
| } | ||
|
|
||
| progressListener.progress(90); | ||
| return true; | ||
|
|
@@ -1042,6 +1051,37 @@ void runRecipe(String recipe) throws RunnerException, PreferencesMapException { | |
| } | ||
| execAsynchronously(cmdArray); | ||
| } | ||
|
|
||
| //7. Save the .hex file | ||
| void saveHex() throws RunnerException { | ||
| PreferencesMap dict = new PreferencesMap(prefs); | ||
| dict.put("ide_version", "" + BaseNoGui.REVISION); | ||
|
|
||
| String[] cmdArray; | ||
| try { | ||
| String tmp_file = prefs.getOrExcept("recipe.output.tmp_file"); | ||
| tmp_file = StringReplacer.replaceFromMapping(tmp_file, dict); | ||
| String save_file = prefs.getOrExcept("recipe.output.save_file"); | ||
| save_file = StringReplacer.replaceFromMapping(save_file, dict); | ||
|
|
||
| File hexFile = new File(prefs.get("build.path") + "/" + tmp_file); | ||
| File saveFile = new File(sketch.getFolder().getAbsolutePath() + "/" + save_file); | ||
|
|
||
| FileReader in = new FileReader(hexFile); | ||
| FileWriter out = new FileWriter(saveFile); | ||
|
|
||
| int c; | ||
| while ((c = in.read()) != -1) | ||
| out.write(c); | ||
|
|
||
| in.close(); | ||
| out.close(); | ||
|
|
||
|
There was a problem hiding this comment. May you add a message for verbose compile? Something like:
There was a problem hiding this comment. Also for AVR we would like to save the .eep ?? Arnav Gupta (championswimmer) On 18 February 2015 at 16:08, Cristian Maglie notifications@github.com
There was a problem hiding this comment. Yes, maybe we would like to list the files as a comma separated list? |
||
| } catch (Exception e) { | ||
| throw new RunnerException(e); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| private static String prepareIncludes(List<File> includeFolders) { | ||
| String res = ""; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FileUtils.copyFile may be used here.