Skip to content

New preprocessor #2729

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

Closed
wants to merge 15 commits into from
Closed

New preprocessor #2729

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
187db5d
Introducing new preprocessor, based on coan2 and ctags
Jan 20, 2015
db15c22
New preprocessor: removed useless AbstractPreprocessor class
Jan 27, 2015
b551305
Added ignored ctags parser test: we now how to call ctags to output s…
Jan 27, 2015
8cc159e
CTags now emits kind: prefix and line numbers: this allows to know wh…
Jan 28, 2015
116fef3
Updated coan binary for mac, new zip uploaded
Jan 29, 2015
eea7a24
Added support to sketches with multiple files: #line preproc commands…
Jan 29, 2015
8876de3
Fixed #line offset
Jan 29, 2015
8d43a67
Added compile_every_example.sh script
Jan 30, 2015
789d18d
Moving coan and ctags definitions into a parent platform.txt: this ge…
Feb 12, 2015
a814ac3
ctags and coan: fixed failing tests
Feb 12, 2015
ea5f8f7
TargetPlatform.getTool() does not guarantee to return a tool, for exa…
Feb 12, 2015
d633d5f
Windows: fixed command line arguments quoting
Feb 13, 2015
b65f986
When loading sketchbook defined hardware, generic platform.txt
Feb 16, 2015
71826c0
Fixed properties loading order
Feb 16, 2015
b1de253
Default args values are removed from the prototype. See https://githu…
Mar 10, 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
Prev Previous commit
Next Next commit
Fixed properties loading order
  • Loading branch information
Federico Fissore committed Mar 25, 2015
commit 71826c0f1b4df5b4269497ef638bbb78b75f1886
2 changes: 1 addition & 1 deletion arduino-core/src/processing/app/debug/TargetPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public TargetPackage(String _id, File _folder, PreferencesMap hardwarePlatformTx
id = _id;

PreferencesMap packagePlatformTxt = PreferencesMap.safeLoad(new File(_folder, "platform.txt"));
packagePlatformTxt = packagePlatformTxt.merge(hardwarePlatformTxt);
packagePlatformTxt = hardwarePlatformTxt.merge(packagePlatformTxt);

File[] folders = _folder.listFiles(new OnlyDirs());
if (folders == null)
Expand Down
2 changes: 1 addition & 1 deletion arduino-core/src/processing/app/debug/TargetPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public TargetPlatform(String _name, File _folder, TargetPackage parent, Preferen
boardsFile.getAbsolutePath()), e);
}

this.preferences = new PreferencesMap().merge(packagePlatformTxt);
this.preferences = new PreferencesMap(packagePlatformTxt);

File platformsFile = new File(folder, "platform.txt");
try {
Expand Down