fea85506ec
lift find_device_pid_vid to builder
4 years ago
1f227a0d72
move get-arduino-pref out of the config file
4 years ago
3c7a1312c1
Revert "remove obsolete? build-all target"
...
still need it for testing
This reverts commit 237d01df9e28c51bdccb3e1e123e3662d66dcdda.
4 years ago
bb9de38354
remove obsolete? build-all target
4 years ago
651d0bc5b4
remove obsolete compile-all target
4 years ago
c6ff455c12
did I break the compiler path prop?
4 years ago
c375b8bf3f
remove a debugging echo
4 years ago
f7995a6d9b
Remove local_LIBS which I believe to be obsolete
4 years ago
64b989660c
turn ccache back on
4 years ago
57a076b5e3
switch getting prefs to use arduino-cli instead of arudino-builder
4 years ago
ea0a0c3dd6
try a hacky workaround for the fact that arduino-cli doesn't seem to let us put doublequotes in build-props
4 years ago
1b7ff0793b
ARDUINO_CFLAGS is, as far as I can tell, historical
4 years ago
60ac839eb4
try another compiler.cpp.extra_flags line
4 years ago
bb3465d102
do a better job of mirrroing our older config
4 years ago
bca9ec9625
add debugging output for test
4 years ago
bc66579214
don't force reinstall of our kaleidoscope core
4 years ago
b3fed574d9
turn off default verbose in builder
4 years ago
3bf986a8ab
slightly closer to building with -cli
4 years ago
493a10b16e
switch which to command to make shellcheck happy
4 years ago
912118e3c1
Start to be able to use the system arduino cli
4 years ago
0b99c52178
don't package up arduino-cli when trying to run in docker
4 years ago
f8c297d19b
Revert "remove a pair of obsolete make targets"
...
This reverts commit d33d61d5029d03ceb20e37a7930d694e04bcf720.
4 years ago
a93361486b
remove build-all from docs
4 years ago
98851c0728
move more of make clean out into the makefile, leaving the "make clean" target in builder so it works for sketches
4 years ago
2104f4db78
remove a pair of obsolete make targets
4 years ago
5c0edd9b69
"make clean" needs to clear out build and output paths
...
It previously did not. Also, try -not- to clean out google test if the build dir doesn't even exist
4 years ago
de45646c9d
extract out a variable for ARDUINO_BUILDER_TOOLS_PATH to make it easier to
...
get up and running on arch
4 years ago
34b428c4a9
Simplify conditional building
4 years ago
5bea41f630
reduce a bit of code duplication
4 years ago
6e8d1d020a
Switch to a less verbose way to set defaults for environment variables
...
By reducing duplication, we improve readability and reduce errors
4 years ago
a91c6a556e
refactor config file list to all be in one place
4 years ago
25c8a8a180
Refactor the "SKETCH" environment variable and friends.
...
Functionality should be the same, but code should be clearer.
4 years ago
e96902a9df
Switch from locally defining a "DIR" for every bin, to setting a global Kaleidoscope bin directory var
4 years ago
660747c916
Rename ROOT to KALEIDOSCOPE_DIR, which is what it appears to actually be.
4 years ago
ea0abc8833
inline a single-use cunction
4 years ago
19f728ca56
lift find_bootloader_path' out of the config file into the program.
...
as it isn't something that's platform specific
'
4 years ago
52a5265b9b
ROOT is defined automatically and not overridable. Remove the lines in the comments and docs
4 years ago
12e59b8684
lift up BUILD_FILE_PATH to somewhere reusable.
4 years ago
45bafe9bf5
SOURCEDIR was not actually used or honored. It was always set to pwd
4 years ago
dfadd32400
Removeo outdated and unused 'LIBRARY' env variable
4 years ago
a278efc21e
Absolute path to sized elf
4 years ago
afc8388cd1
Move a bunch of makefile targets from the generic sketch makefile
4 years ago
383a29d3e3
move run-tests out to the Makefile
4 years ago
bbc84f6f33
move build-gtest-gmock into the Makefile
4 years ago
1865e33426
Lift duplication of command to a var
4 years ago
08bb9c5a14
Our previous conditional building was really wrong. It never built if any .hex existed.
...
This new version is still wrong, but less so. It at least checks the timestamp on the sketch
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
4 years ago
6d00c6d7af
add "prepare-ccache" as a tool for travis
...
also bullet-proof setting up ccache against parallelization race conditions
4 years ago
919f7753ff
We no longer need this, since we do it above. (But also, this was always a repeated call)
4 years ago
d4a14fa7c9
expose the function that finds all the buildable sketches as "find_all_sketches"
4 years ago
6bf70a2fdc
Don't strip out the path from the sketch before we can make use of it
4 years ago
e378f9cd17
Switch find_sketch to set an env variable, rather than return a value, to reduce the number of times we need to call it. Also, begin to add better support for:
...
kaleidoscope-builder examples/Foo/Bar compile
4 years ago
8150eec669
Switch from naming our cache directories based on inode to naming them based on the absolute path, so we don't blow the cache 100% of the time on travis
4 years ago
b9bca2cf7f
remove a bit of unused info from the compilation step reporting
4 years ago
fad1b7e051
Add a googletest-based test harness & tests
...
This adds a googletest-based test harness (with googletest pulled into
`testing/googletest`, so we have a fixed state of it), and a few test
cases that demonstrate its use.
Original work by Eric Paniagua in #898 , with minor cleanups by Gergely
Nagy.
Signed-off-by: Eric Paniagua <epaniagua@google.com>
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
4 years ago
57814671a5
kaleidoscope-builder: Support building lib-only variants of the sketch
...
Originally by Eric Paniagua <epaniagua@google.com>.
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
4 years ago
352a3fe547
kaleidoscope-builder: Allow overriding CXX, CC, AR, etc
...
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
4 years ago
fff5dce199
kaleidoscope-builder: Whitespace cleanup
...
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
4 years ago
63fa886d9b
symlink generation for hex file with bootloader wasn't quite right. It added an extra output path
4 years ago
476cbe1785
Add a new MANUAL_RESET feature to Kaleidoscope builder
...
Some devices, like those coming from QMK don't have an automated reset
feature
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
5 years ago
e997d8c495
allow overriding filename paths
...
Signed-off-by: Les Aker <me@lesaker.org>
5 years ago
c0163c83f2
make sure SKETCH_DIR is set before we use it
5 years ago
0264e77396
bash warns on -gt, demanding two brackets
5 years ago
bb00c27de1
maybe_bulid depends on filling the hex path first
5 years ago
680aac9818
refactor kaleidoscope-builder to make shellcheck happy
5 years ago
16b2404ab9
Attempt to simplify output of the build and flash process, along with
...
more verbose verbose output
5 years ago
559d210eed
slightly tweak sleep times and reformat our avrdude command to flash the
...
keyboard
5 years ago
9a41d1cfa9
Make avrdude more verbose to help make sure customers can tell whether
...
their keyboards got flashed
5 years ago
56a9b60d27
On linux (and possibly other operating systems), detect when the
...
keyboard is in bootloader mode already and skip the prompt to get to
bootloader mode.
5 years ago
1b117b9eb0
Extract the compilation step from the flashing preparation step
5 years ago
09da0477d9
Fix typo in flashing message
5 years ago
b2977894f9
Move the build instructions into the arduino boards.txt file
5 years ago
1a721f190e
Moved build flags and C++ language version setting to platform.txt
...
Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
12876f9a90
Fixed builds on msys2
...
This adds some quotes to various paths used in Kaleidoscope's build system.
This fixes builds on msys2 that failed due to whitespaces in system paths.
Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
bab32fcc9d
Shellcheck flags -n as a better replacement -f ! -z
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
5 years ago
c0e0ca1034
Enable compiler specification via env. var. CC/CXX
...
Many build systems allow C and C++ compilers to be specified
via environment variables C and CXX.
This commit enables this for kaleidoscope-builder.
Furtheron, on unixoid systems virtual builds are possible through a
command line similar to
CXX=<path to C++ compiler> C=<path to C compiler> ARCH=virtual make
Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
0462230060
Fix whitespace inconsistencies
...
Signed-off-by: Dan Bjorge <dan@dbjorge.net>
5 years ago
d33bdf53e3
Add Windows+Cygwin support for kaleidoscope-builder
...
Signed-off-by: Dan Bjorge <dan@dbjorge.net>
5 years ago
1672f55945
kaleidoscope-builder: Pull the bootloader file from boards.txt
...
Fixes #697 .
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
5 years ago
d14405541a
Without the -built-in-libraries option passed in to arduino-builder, it
...
can't find ctags. Which suggests to me that it's doing a lot more than
just finding libraries
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
5 years ago
0ac7c191dc
Renamed virtual architecture "virtual"
...
Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
7326be589f
kaleidoscope-builder fixed for builds of virtual hardware
...
This commit induces the following changes:
bin/kaleidoscope-builder
* ccache dummy compiler and executables are now generated in a way
that allows using the same CCACHE_WRAPPER_PATH for virtual and
non-virtual builds
* virtual builds are now triggered by either specifying the full FQBN with x86
as architecture or by defining ARCH=x86
etc/kaleidoscope-builder.conf
* COMPILER_PREFIX and COMPILER_PATH are now determined (if not predefined)
based on ARCH or FQBN
Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
2cad17b07b
Fixed Kaleidoscope Builder for Arduino paths containing whitespaces
...
Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
6 years ago
01e3793d39
Add a 'compile-all target, so that smoke output can get to a single line
...
per sucessful compile
6 years ago
8ab5aa52dd
Slightly tighten up compilation output so that the smoke output is more readable
6 years ago
b8d4e90f23
realpath isn't installed by default on travis' vms AND it's not
...
necessary if we're looking up by inode
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
ab91a04142
More recent shellcheck doesn't like "which" for finding a binary
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
a6a23380ab
make shellcheck happy, maybe?
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
67d0c6bd73
shellcheck fixes
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
02faf0d842
Refactor our directory environment variables to make it easier to set a
...
global place to stash your compiled output
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
02635d691a
Use the sketch directory's inode as part of its unique id
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
8cdd058d9e
CCACHE_WRAPPER_DIR->CCACHE_WRAPPER_PATH
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
e9668d36ab
STABLE_TEMP_DIR to KALEIDOSCOPE_TEMP_PATH
...
1. Better matches other _PATH env variables
2. Since it's something that might reasonably get set in the
environment, prefix it with KALEIDOSCOPE
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
7b27d9e2f9
default STABLE_TEMP_DIR to $TMPDIR if it's available
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
a33d797310
shellcheck fixes
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
b4dd906294
Switch to stashing our build artifacts in the stable kaleidoscope temp dir, rather than the source dir
...
This is particularly important for in-kaleidoscope-tree artifacts like
the examples.
If we build the examples and move the compiled artifacts into the
Kaleidoscope tree, even under examples, it busts arduino's core
compilation cache, adding an extra 10s to the next compilation.
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
f87d7bce64
Initial implementation of ccache caching for builds
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
6e9ee55552
move sketches into a subdir
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
59bb9a63f8
Switch back to stable build paths to take advantage of Arduino's build caching
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
9e45f9e7b2
Enable use of the Arduino core cache, stashing our cached prebuilt cores in /tmp
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
2ec7f83073
Break out setting our build paths into its own function
...
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
38b4663f00
When building a sketch that's not in a git directory, don't die.
...
We only cared because we were trying to get a nice version number
That doesn't matter as much as being able to build at all
Signed-off-by: Jesse Vincent <jesse@keyboard.io>
6 years ago
7172571685
kaleidoscope-builder: Make shellcheck happy
...
Apparently, the shellcheck on Travis does not like comments after a disable
command, while the one I used locally didn't have a problem with it. Lets make
the one on Travis happy.
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
75dab2c65e
kaleidoscope-builder: Fix the avr-size invocation
...
When calling avr-size, we want to expand ${AVR_SIZE_FLAGS}, not pass it as a
single argument, hence, we do not need to - and do not want to! - quote it.
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
39d1f70812
Add rules and scripts for building on FreeBSD.
...
* Uses usbconfig to determine the Model 01's USB modem port.
* Works around incompatibe avrsize flags.
You need to be able to run usbconfig to flash the firmware from the
buildtools. This can be accomplished with appropriate groups and devfs
rules.
Requires gmake, perl, avrdude, and (probably) arduino18 from ports.
The version of avrdude in ports uses an avr-size command that doesn't
understand the -C or --mcu flags. From what I can tell, these flags
are uneccessary, as the size computed with them is the same as what
you get from adding up the appropriate segments from the standard
output of avr-size without any flags. However, since the size is only
informative, I've opted to simply check to see if the command
succeeded, and if not, output a string saying it could not be.
It would probably be better to:
* Determine appropriate flags based on build tools, or,
* Just not use the flags at all, and grab the .text, etc., segment
sizes from the standard output and add them up via `dc` for
display.
I've been using this toolchain to build successfully on FreeBSD 12 for
the Model 01 without issue. It should work with earlier versions of
FreeBSD as well.
Signed-off-by: Brian Cully <bjc@kublai.com>
6 years ago
f27a2127ac
kaleidoscope-builder: Support examples in subdirs
...
For better organisation, we're putting examples in subdirectories of
`examples/`. The builder should support that.
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
0462ae141d
kaleidoscope-builder: Support config files in the sketch dir too
...
If there's a config file in the sketch dir, load BOARD & FQBN from it, so we can
compile for different boards from within the same repo.
Fixes #425 .
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
2e4012fa71
disable an incorrect shellcheck check
6 years ago
d97b2060ba
The previous factoring just didn't work
6 years ago
8a33793a1c
Improve the 'port unwritable' error message
6 years ago
3a3281cb54
Clean up our flashing and warning messages.
...
Refactor the 'no bootloader port' message to only show up once, rather
than twice
6 years ago
00a6b6045b
License clarificataion & copyright headers
...
After talking with Jesse, this changes the license to GPLv3 (only), where
appropriate, and adds copyright headers to all files that were missing them.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
6 years ago
4f20009782
Add double quotes to keep shellcheck happy
6 years ago
22363ac572
Add a LIB_PROPERTIES_PATH option to the build system
...
Add a variable to specify where the "library.properties" file can be
found so that the build can include a user-define version number.
6 years ago
d292b371e8
Revert "kaleidoscope-builder: Use a stable build directory"
7 years ago
8c814a87fa
kaleidoscope-builder: Use a stable build directory
...
Use ./_build/ for the build path by default, and do not delete it at the end of
compilation, only when doing a clean.
Fixes #315 .
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
7a4f0bac85
kaleidoscope-builder: Do not hardcode the max program size
...
Instead of hardcoding the max program size, pick it out of boards.txt, like we
pick the device VID and PID.
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
81a1cd004e
kaleidoscope-builder: add `preFlash_HOOKS` and `postFlash_HOOKS`
...
Fixes #225 .
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
39601fcba2
kaleidoscope-builder: Improved pre-flash prompt
...
Based on #306 , with slightly improved text. Thanks to Ross Donaldson
(@Gastove) for the original pull request!
Closes #306 .
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
14fe42f5b3
kaleidoscope-builder: Disable another ShellCheck false-positive
...
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
24407185d5
kaleidoscope-builder: Add SellCheck disables
...
There are a number of false-positives, where ShellCheck warns about behaviour we
do want, or are otherwise intentional.
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
22636bd768
kaleidoscope-builder: Quote what needs to be quoted
...
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
ca492e91f6
kaleidoscope-builder: Fix a typo.
...
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
5c9b3d6799
kaleidoscope-builder: Clear trailing whitespace
...
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
ce3ad7bc7d
Fix indent in here doc of usage() in bin/kaleidoscope-builder, part 2.
...
Issue #299 .
7 years ago
96f3f18aaf
Indent here doc in usage() of bin/kaledoscope-builder. Issue #299 .
7 years ago
f094bdaa4e
Remove uneccesary unused variable in prepare_to_flash() of
...
bin/kaleidoscoper-builder to conform with shellcheck. Issue #299 .
7 years ago
6ca9da073d
Quote parameter expansions in hex_with_bootloader() of
...
bin/kaleidoscope-builder. Issue #299 .
7 years ago
03bdc34001
Quote expansions in firmware_size() of bin/kaleidoscope-builder. I left
...
line 35 (the "output" variable) alone. Issue #299 .
7 years ago
bc5abd63ab
Add option delimiter to rm command in clean() of
...
bin/kaleidoscope-builder. Issue #299 .
7 years ago
d254dc6b7f
Quote parameter substitutions and command substitutions in
...
build_version() of bin/kaleidoscope-builder. Issue #299 .
7 years ago
dd96cbcf8b
Change shebang of bin/kaleidoscope-builder to invoke bash. Issue #299 .
7 years ago
6356154bc3
add check for DEVICE_PORT being writable
...
If the user has missed the step about setting up their account
with the right group membership, they would get a cryptic failure
from stty, so catch this and explain the problem.
7 years ago
084679d2d1
Deal with the device port containing unexpected whitespace
...
This should never happen, but could if something goes badly wrong
in the device detection code, e.g. someone changing it in a way
which caused extra output on STDOUT.
7 years ago
b02fb08234
Merge pull request #296 from gedankenexperimenter/f/print-size-before-flash
...
Run size target when flashing
7 years ago
5fd8bce342
Print size_map in decimal instead of hex
...
It's easier for most people to interpret numbers in decimal than hexadecimal; adding this
option to avr-nm prints out the sizes in the size_map in a more intuitive format.
7 years ago
e126be95fa
Run size target when flashing
7 years ago
217fde56f9
Check for missing bootloader port
7 years ago
be4fdd5432
Indented kaleidoscope-builder consistently
7 years ago
0dd1f49841
"disassembly" -> "disassemble" to better match the phrasing of other targets.
...
(also, fixed the usage)
7 years ago
0fc79af6b2
Added name demangling in disassemblies
7 years ago
75770b8cf6
If you do a verbose build, don't throw away the build artifacts
7 years ago
a2cee84455
kaleidoscope-builder: Remove extraneous whitespace
...
Drop a bunch of empty lines, trailing spaces, and similar things.
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
7 years ago
eb9164ddaa
refactor device reset code
7 years ago
110b2795f0
move the verbose stuff out of the config file
7 years ago
3556727657
Move two functions from the kaleidoscope-builder.conf to the builder
7 years ago
b729a2e291
Use a safer sed command to avoid locale issues
...
On some locales awk will generate commas instead of dots in the percentage. This will mess up the sed command. Instead of forcing awk to always generate dots we can simply cange the sed command to treat commas as regular text.
7 years ago
d05c3cacf8
Back out part of 374a3e136c because it breaks our ability to pass -D defines into code
...
We need this to pass the built version into the sketch when doing
official builds
7 years ago
5c7eb2427a
Don't flash the device unless we successfully detected the device
...
Nicer error messages are nicer.
7 years ago
54771ad718
fix the package path to be less platform dependent
7 years ago
a3318ea92a
only add the packages path if it exists
7 years ago
Jesse Vincent
Eric Paniagua
Gergely Nagy
Jason Koh
Les Aker
Andre Arko
Florian Fleissner
Dan Bjorge
Brian Cully
Gergely Nagy
Alessio Di Mauro
Gergely Nagy
Chris King-Parra
Adam Spiers
Jesse Vincent
Michael Richters
Jonathan Wakely
noseglasses
Ole Krüger
John SJ Anderson