1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-11 22:24:13 +01:00
Commit Graph

774 Commits

Author SHA1 Message Date
Matthijs Kooijman
cc773fb1e0 Take into account --curdir for all relative paths
In a lot of places, (potentially) relative paths were passed to File
without any processing, making them be resolved without taking into
account --curdir. By passing them through Base.absoluteFile instead,
these paths are resolved relative to the working directory before
starting arduino (at least on Linux, which is currently the only
platform supporting --curdir).

This applies --curdir to the --preferences-file option and the
build.path, settings.path, sketchbook.path preferences.

For example, this now works as expected:

  arduino --pref build.path=build_dir --verify Blink.ino
2014-08-19 09:16:49 +02:00
Matthijs Kooijman
4f33d0851c Fix opening a non-primary .ino file
When a sketch looks like this:

    Blink/
        Blink.ino
        Foo.ino

The idea is that opening Foo.ino should open up the sketch. However,
before this would show an error stating "The file Foo.ino needs to be
inside a sketch folder named Foo" instead.

This turned out to be due to a typo, which seems to have been present
for a long time. Note that when the main sketch file was a .pde file,
everything already worked as expected.
2014-08-19 09:16:48 +02:00
Matthijs Kooijman
f96d71f32d Fix --curdir on Windows
On Windows, files are canonicalized to prevent issues with legacy 8.3
filenames. However, this canonicalization includes making the path
absolute and this happened before applying --curdir to the path, making
the latter a noop.

By reversing the operations, this should allow both of them to do their
work.
2014-08-19 09:16:48 +02:00
Matthijs Kooijman
31fe4ac0c2 Add Base.absoluteFile method
This method takes filenames as specified on the commandline and turns
them into the right File object, taking into account the current
directory passed through --curdir by the wrapper script.
2014-08-19 09:16:48 +02:00
Matthijs Kooijman
0798e1cf6f Pass around sketch File objects instead of filenames
This saves a few conversions from File object to String and is generally
cleaner.
2014-08-19 09:16:48 +02:00
Matthijs Kooijman
87bdaa88cd Parse --curdir in Base.main()
This shouldn't change any behaviour, but prepares for upcoming changes.
2014-08-19 09:16:48 +02:00
Matthijs Kooijman
cf4fb7d0e3 Don't re-parse arguments to --preferences-file
Previously, the argument to --preferences-file would be interpreted as a
filename, but then also checked as an option as well (in the next loop
iteration). This didn't really matter in practice (unless you would be
using a file called "--preferences-file"), but better skip the argument
anyway.
2014-08-19 09:16:48 +02:00
Matthijs Kooijman
9e17e52f63 Parse --preferences-file in main instead of Preferences.init
Parsing commandline arguments inside Preferences isn't very elegant,
this is better suited for the main function. Also, this change prepares
for taking --curdir into account for --preferences-file as well.
2014-08-19 09:16:48 +02:00
Matthijs Kooijman
e494f39255 Add --get-pref option
This allows reading specific preferences from the commandline.
2014-08-19 09:16:47 +02:00
Matthijs Kooijman
f745fff50b Add --noop option
This option causes the IDE to process its commandline arguments and then
quit. This allows setting preferences uses --pref, without having to
also load the GUI or compile a sketch.
2014-08-19 09:16:47 +02:00
Matthijs Kooijman
7cb99ad7b8 Ensure --verbose is never saved to preferences.txt
Previously, --verbose would be processed after the preferences were
saved, which should usually mean that it should never influence the
saved preferences. However, if for whatever reason Preferences.save()
would be called later, the verbosity preferences would still be messed
up.

Since we now have a Preferences.setDoSave() method, we can make sure
that these verbosity preferences (and any other preferences that are
changed after the build started) are never saved.
2014-08-19 09:16:47 +02:00
Matthijs Kooijman
d6333f8f37 Don't save a new preferences file in Preferences.init
Preferences.init would write out the default preferences when no
preference file previously existed. This would cause a default
preferences file to be written even when --no-save-prefs was passed, due
to the ordering of things.

However, since the Base constructor now already calls
Preferences.save(), there is no need for Preferences.init to also do
this. Since Base calls this after parsing the commandline, the
--no-save-prefs option is now also properly respected.
2014-08-19 09:16:47 +02:00
Matthijs Kooijman
4452eb3850 Add --no-save-prefs option
This allows setting preferences for the current run only, without
remembering them for the next run. This is especially useful when
combined with --verify or --upload.
2014-08-19 09:16:47 +02:00
Matthijs Kooijman
bbd0128664 Explicitely save preferences on startup
Before, the preferences were saved as a side effect of loading files in
the Editor, but it seems better to explicitely save them as well (this
should prevent problems later on, if the Editor class is no longer used
in --verify or --upload mode).
2014-08-19 09:16:47 +02:00
Matthijs Kooijman
e0c599d733 Error when passing --verbose without --verify or --upload
Since the handling of these options defaults to non-verbose (instead of
the current preference), they make no sense when starting the IDE
normally. Previously, these options would just be ignored in this case,
now an error is shown.
2014-08-19 09:16:47 +02:00
Matthijs Kooijman
d3e2208c01 Process some commandline arguments earlier
Previously, the --board and --port arguments were stored in a variable
first and only processed later. Now, the arguments are processed right
away.

This does mean that the arguments are processed when the GUI is not yet
initialized, which caused problems with calling onBoardOrPortChange and
friends from selectBoard. However, since the GUI is not initialized,
there is no real reason to call them either - if we just set the
preferences to the right values, the GUI will be initialized correctly
later. For this reason, selectBoard no longer calls the GUI update
methods. Instead, those are called from the GUI code when the board is
changed through the menu instead (e.g., after calling selectBoard).

This commit slightly changes behaviour. Previously, --board and --port
only worked in combination with --verify and --upload, but were ignored
when just starting the IDE. Now, these are processed regardless of the
other options present.

Additionally, this commit causes all changed preferences to be saved.
Previously, only changes with --pref were saved, --board and --port
options were only active for the current run. This was caused because
the saving of the preferences happened as a side effect of loading the
file in the Editor, but only the --pref option was processed at that
time.

Note that the --verbose options are still only active for the current
run and are only valid combined with --verify or --upload (since they
default to non-verbose instead of the current preference).
2014-08-19 09:16:47 +02:00
Matthijs Kooijman
c0ab536b7b Add Base.selectSerialPort
This method takes care of setting the serial.port preference to the
given value, as well as deriving the serial.port.file preference. This
should prevent duplicate code in the future.

Note that a second copy of this code lives in SerialUploader, but that
doesn't write to the global Preferences but a local prefs map. Since the
global Preferences are currently static, there is no way to share code
between these two copies.
2014-08-19 09:16:46 +02:00
Matthijs Kooijman
7548591d51 Improve commandline handling control flow
This uses a switch on the action value, which makes it more clear what
code runs when. No actual behaviour is changed, most of the changes in
this commit are indentation changes.
2014-08-19 09:16:46 +02:00
Matthijs Kooijman
f3565a1bda Invert decision on when to show the GUI
Previously, the code showed an error when the given action was not
upload or verify. This is now reversed: the GUI is shown when the action
is "GUI" (which is the default when no action specified). Since the
action enum only contains these three values, there is no change in
behaviour, but this makes it easier to add new actions later.
2014-08-19 09:16:46 +02:00
Matthijs Kooijman
6a09ee5eb6 Use an "action" enum when processing commandline arguments
Previously, two separate booleans (doUpload and doVerify) were used.
However, since it always makes sense to specify only one of them, it
makes more sense to keep a single action enum variable, which slightly
simplifies the code (especially when more actions are added later).

Additionally, an error is now shown when both --verify and --upload are
specified on the commandline.
2014-08-19 09:16:46 +02:00
Cristian Maglie
11cfe2b81e Updated eclipse project classpath 2014-08-18 16:09:03 +02:00
Cristian Maglie
a6c80364da FileUtils: added function to recursively find files with given extension 2014-08-08 15:01:53 +02:00
Cristian Maglie
7819374955 Removed unused variables 2014-08-08 15:01:53 +02:00
Cristian Maglie
dcc1020a6e Better check for programmers configuration when uploading using programmer 2014-08-06 15:20:53 +02:00
Cristian Maglie
1a167b7a6f Allow to run empty recipes in platform.txt 2014-07-28 18:40:53 +02:00
Cristian Maglie
82401c84bb Fix indent and typos on FindReplace.java 2014-07-25 12:10:42 +02:00
Fulvio Ieva
cd75cc24a2 Fix search and replace #2106 2014-07-25 12:01:43 +02:00
Fulvio Ieva
6efbecd3cc Do not replace textbox in Find/Replace dialog if no text is selected
See #2070
2014-07-25 11:56:08 +02:00
Fulvio Ieva
13321e3c1b Change layout in Find/Replace dialog to render correctly on Linux
see #2070
2014-07-25 11:38:34 +02:00
Fulvio Ieva
064fc45ba5 Merge branch 'feature/Search_and_replace_improved_dialog' of github.com:eried/Arduino into eried-feature/Search_and_replace_improved_dialog 2014-07-25 11:34:54 +02:00
Cristian Maglie
b36beeb4c0 Fixed NullPointerException with i18n.
i18n class may not be initialized during init time.
2014-07-03 13:01:18 +02:00
Cristian Maglie
2a71073c32 Re-enabled serial port detection on Windows
Fixes #1573
2014-07-02 13:20:16 +02:00
Cristian Maglie
e5f34e5a83 Merge branch 'ide-1.5.x-timer-variant' of github.com:matthijskooijman/Arduino into matthijskooijman-ide-1.5.x-timer-variant 2014-07-01 18:29:07 +02:00
Cristian Maglie
d52e75ff38 Merge branch 'osx-app-bundler' into ide-1.5.x
Conflicts:
	build/build.xml
2014-06-27 16:08:20 +02:00
Matthijs Kooijman
4eb686673f Don't include .o files from the variant in core.a
If a variant supplied source files, these would be included in core.a
before. However, object files from core.a would only actually be
included in the build if they supplied a symbol for a strong reference
that was still missing.

In practice, this meant that a variant source file that only defines
interrupt handlers, or only defines strong versions of functions that
already had weak versions available, was not included.

By moving the variant .o files out of core.a and including them in the
build directly, this problem is solved.

Furthermore, the compilation of variant files is moved to after the
generation of core.a, to make it clearer in the code and verbose output
what is now happening.
2014-06-25 16:56:17 +02:00
Matthijs Kooijman
7d71b84ae2 Unconfuse error message
When a core directory without boards.txt file was encountered, the IDE
would show:

	Could not find boards.txt in /path/to/core/boards.txt.  Is it pre-1.5?

Which appears confusing: Is it looking inside a directory called
boards.txt? Now this is improved to:

	Could not find boards.txt in /path/to/core/.  Is it pre-1.5?

which makes a lot more sense.
2014-06-25 16:56:13 +02:00
Cristian Maglie
6b5a99b7b5 Version bumped to 1.5.7. Updated revision log. 2014-06-25 11:21:15 +02:00
Federico Fissore
fdffb2de26 Setting CYGWIN=nodosfilewarning env variable on windows 2014-06-25 10:14:35 +02:00
David A. Mellis
fcd633686f Don't wrap a RunnerException in a redundant RunnerException. 2014-06-11 12:21:52 -04:00
David A. Mellis
b5fe1b1eb5 Proceed with upload even if port can't be found. (Issue #1791) 2014-06-11 12:07:46 -04:00
Cristian Maglie
ab1ee51d68 MacOSX: switched to appbundler for building distribution files (Haavar Valeur)
See #1665
2014-05-29 12:28:42 +02:00
Matthijs Kooijman
726f2ba931 Unescape special characters in dependency files
When a path contains spaces (or other special characters, probably), gcc
escapes them with a \ in the generated .d files. This previously caused
problems when parsing these files, causing recompiles to happen even
when not needed.

This applies a rather simple approach to unescaping these strings, which
seems to be sufficient because the file format of the .d files is so
predictable (e.g., we don't actually split on colons or spaces when
parsing it).
2014-05-13 16:52:14 +02:00
Erwin Ried
401f9e1634 FindReplace dialog now search and replaces in all the opened tabs. Also pre-fill the find field with selected text 2014-05-13 03:21:36 -04:00
Cristian Maglie
d025638c61 Merge pull request #1775 from ribbons/memory-usage
Improve low free memory reporting
2014-05-03 10:59:37 +02:00
Matthijs Kooijman
aa46fdb978 Change the MacOS preference suffix to .macosx
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.
2014-04-14 15:35:34 +02:00
Matthijs Kooijman
d2505a08f6 Process platform-specific suffixes immediately
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.
2014-04-14 15:35:33 +02:00
Matthijs Kooijman
a89f5e68cf Explicitly define compiler.path in avr/platform.txt
Previously, this relied on an (ugly, avr-specific) magic default for the
compiler.path variable, set by the IDE. This allowed the IDE to fall
back to a system-wide toolchain when no bundled toolchain was found (by
making compiler.path empty).

However,
 - this only worked for avr, not sam,
 - this worked only for gcc, a system-wide avrdude would break on the
   avrdude.conf path in platform.txt, and

This would mean that automatic system-wide fallback didn't work in all
situations, so you'd still have to modify platform.txt (or create
platform.local.txt). Since doing that explictly is the most reliable
way, this commit removes the partial-working ability to do this
automatically.

Note that the code to automatically set compiler.path is still kept
around, in case third-party hardware still relies on this. At some
point, this code should be removed, but for now it just shows a warning
message.
2014-04-10 12:19:43 +02:00
Matthijs Kooijman
a46e503a30 Allow overriding platform.txt using platform.local.txt
This helps advanced users that want to change options (e.g. to use a
different toolchain or enable warnings), without having to change
platform.txt (which could make git report changed files all the time).
2014-04-04 10:35:32 +02:00
Cristian Maglie
c192d689bc Better checks for library metadata
See #1765
2014-03-16 12:54:04 +01:00
Cristian Maglie
f50ec335fe Removing the magic baudrate is no longer needed with JSSC
Fixes #1203.

The original patch was introduced to workaround a problem with ArduinoISP reported
in #995. After some debugging it seems caused by a glitch in RXTX library,
more discussion here: https://github.com/arduino/Arduino/issues/1203
2014-03-16 12:17:25 +01:00