Fix platform-specific preferences in some cases #2012
Merged
Conversation
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
In preferences files, platform-specific versions can be indicated by a .linux, .windows or .macos suffix on the key name. Previously, these keys were loaded as normal and then afterwards, all keys were scanned after loading them and any platform-specific versions replaced the regular ones. However, this means that these platform-specific versions get an unexpected form of priority. Normally, when a single key is set twice, the latter overrides the first. However, the platform-specific values could override the regular versions, even when the regular version occurs later in the file. This problem was particularly confusing when using the new platform.local.txt: a regular preference in platform.local.txt did not override a platform-specific preference in platform.txt. This commit changes behaviour to process these suffixes directly as they are read from the preference files. If a suffix for the current platform is found, the line is processed as if the suffix was not present. If a suffix for another platform is found, the line is ignored altogether. This can slightly change the way preferences files are parsed, but as long as platform-specific preferences are defined after the corresponding regular preferences, the behaviour should be the same.
Previously, preferences suffixed with .macos were treated specially, but the default preferences.txt used .macosx. I couldn't find when or how this was broken exactly - it seems Processing used .macosx but this code was reimplemented for Arduino in commit 33f5c53 (Implemented OS specific preferences) using .macos. The effects of this have not been tested on OSX, but this might fix some problems caused by wrong defaults on OSX.
cmaglie
added a commit
that referenced
this pull request
Apr 14, 2014
…ferences Fix platform-specific preferences in some cases
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
While working with the new platform.local.txt support, I stumbled upon a problem (or at least something unexpected) in the way platform-specific preferences are handled, which is fixed by the first commit. The second commit addresses platform-specific preferences for macosx, which were not working at all AFAICS.