djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b83e09858f
circuitpython/ports/unix/variants/coverage/mpconfigvariant.mk

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

56 lines
1.8 KiB
Makefile
Raw Normal View History

unix: Rename unix binaries to micropython-variant (not _variant). For consistency with mpy-cross, and other unix tools in general.
2019-10-30 02:00:09 -04:00
PROG ?= micropython-coverage
unix: Add build variants, analogous to boards on bare-metal. Invoking "make" will still build the standard "micropython" executable, but other variants are now build using, eg, "make VARIANT=minimal". This follows how bare-metal ports specify a particular board, and allows running any make target (eg clean, test) with any variant. Convenience targets (eg "make coverage") are provided to retain the old behaviour, at least for now. See issue #3043.
2019-10-22 20:20:07 -04:00
unix: Fix behaviour of COPT/NDEBUG for unix variants. Based on eg 1e6fd9f2b4072873f5d6846b19b2ef0ccc5e4e52, it's understood that the intention for unix builds is that regular builds disable assert, but the coverage build should set -O0 and enable asserts. It looks like this didn't work (even before variants were introduced, eg at v1.11) -- coverage always built with -Os and -DNDEBUG. This commit makes it possible for variants to have finer-grained control over COPT flags, and enables assert() and -O0 on coverage builds. Other variants already match the defaults so they have been updated.
2020-04-02 21:55:14 -04:00
# Disable optimisations and enable assert() on coverage builds.
DEBUG ?= 1
unix: Add build variants, analogous to boards on bare-metal. Invoking "make" will still build the standard "micropython" executable, but other variants are now build using, eg, "make VARIANT=minimal". This follows how bare-metal ports specify a particular board, and allows running any make target (eg clean, test) with any variant. Convenience targets (eg "make coverage") are provided to retain the old behaviour, at least for now. See issue #3043.
2019-10-22 20:20:07 -04:00
unix/Makefile: Reserve CFLAGS_EXTRA/LDFLAGS_EXTRA for external use. When CFLAGS_EXTRA/LDFLAGS_EXTRA (or anything) is set on the command line of a make invocation then it will completely override any setting or appending of these variables in the makefile(s). This means builds like the coverage variant will have their mpconfigvariant.mk settings overridden. Fix this by using CFLAGS/LDFLAGS exclusively in the makefile(s), reserving the CFLAGS_EXTRA/LDFLAGS_EXTRA variables for external command-line use only.
2020-01-23 19:51:21 -05:00
CFLAGS += \
unix: Add build variants, analogous to boards on bare-metal. Invoking "make" will still build the standard "micropython" executable, but other variants are now build using, eg, "make VARIANT=minimal". This follows how bare-metal ports specify a particular board, and allows running any make target (eg clean, test) with any variant. Convenience targets (eg "make coverage") are provided to retain the old behaviour, at least for now. See issue #3043.
2019-10-22 20:20:07 -04:00
-fprofile-arcs -ftest-coverage \
all: Enable extra conversion warnings where applicable. Add -Wdouble-promotion and -Wfloat-conversion for most ports to ban out implicit floating point conversions, and add extra Travis builds using MICROPY_FLOAT_IMPL_FLOAT to uncover warnings which weren't found previously. For the unix port -Wsign-comparison is added as well but only there since only clang supports this but gcc doesn't.
2020-04-09 07:59:11 -04:00
-Wformat -Wmissing-declarations -Wmissing-prototypes \
unix: Add build variants, analogous to boards on bare-metal. Invoking "make" will still build the standard "micropython" executable, but other variants are now build using, eg, "make VARIANT=minimal". This follows how bare-metal ports specify a particular board, and allows running any make target (eg clean, test) with any variant. Convenience targets (eg "make coverage") are provided to retain the old behaviour, at least for now. See issue #3043.
2019-10-22 20:20:07 -04:00
-Wold-style-definition -Wpointer-arith -Wshadow -Wuninitialized -Wunused-parameter \
examples: Add example code for user C modules, both C and C++. Add working example code to provide a starting point for users with files that they can just copy, and include the modules in the coverage test to verify the complete user C module build functionality. The cexample module uses the code originally found in cmodules.rst, which has been updated to reflect this and partially rewritten with more complete information.
2020-10-21 05:13:47 -04:00
-DMICROPY_UNIX_COVERAGE \
-DMODULE_CEXAMPLE_ENABLED=1 -DMODULE_CPPEXAMPLE_ENABLED=1
unix: Add build variants, analogous to boards on bare-metal. Invoking "make" will still build the standard "micropython" executable, but other variants are now build using, eg, "make VARIANT=minimal". This follows how bare-metal ports specify a particular board, and allows running any make target (eg clean, test) with any variant. Convenience targets (eg "make coverage") are provided to retain the old behaviour, at least for now. See issue #3043.
2019-10-22 20:20:07 -04:00
unix/Makefile: Reserve CFLAGS_EXTRA/LDFLAGS_EXTRA for external use. When CFLAGS_EXTRA/LDFLAGS_EXTRA (or anything) is set on the command line of a make invocation then it will completely override any setting or appending of these variables in the makefile(s). This means builds like the coverage variant will have their mpconfigvariant.mk settings overridden. Fix this by using CFLAGS/LDFLAGS exclusively in the makefile(s), reserving the CFLAGS_EXTRA/LDFLAGS_EXTRA variables for external command-line use only.
2020-01-23 19:51:21 -05:00
LDFLAGS += -fprofile-arcs -ftest-coverage
unix: Add build variants, analogous to boards on bare-metal. Invoking "make" will still build the standard "micropython" executable, but other variants are now build using, eg, "make VARIANT=minimal". This follows how bare-metal ports specify a particular board, and allows running any make target (eg clean, test) with any variant. Convenience targets (eg "make coverage") are provided to retain the old behaviour, at least for now. See issue #3043.
2019-10-22 20:20:07 -04:00
examples: Add example code for user C modules, both C and C++. Add working example code to provide a starting point for users with files that they can just copy, and include the modules in the coverage test to verify the complete user C module build functionality. The cexample module uses the code originally found in cmodules.rst, which has been updated to reflect this and partially rewritten with more complete information.
2020-10-21 05:13:47 -04:00
USER_C_MODULES = $(TOP)/examples/usercmodule
unix: Add build variants, analogous to boards on bare-metal. Invoking "make" will still build the standard "micropython" executable, but other variants are now build using, eg, "make VARIANT=minimal". This follows how bare-metal ports specify a particular board, and allows running any make target (eg clean, test) with any variant. Convenience targets (eg "make coverage") are provided to retain the old behaviour, at least for now. See issue #3043.
2019-10-22 20:20:07 -04:00
MICROPY_VFS_FAT = 1
MICROPY_VFS_LFS1 = 1
MICROPY_VFS_LFS2 = 1
Merge MicroPython 1.13 into CircuitPython
2021-05-04 14:40:55 -04:00
FROZEN_DIR=variants/coverage/frzstr
FROZEN_MPY_DIR=variants/coverage/frzmpy
Merge MicroPython 1.14 into CircuitPython
2021-05-10 18:20:47 -04:00
enable qrio in unix coverage build, and add a test
2021-08-05 12:12:07 -04:00
SRC_QRIO := $(patsubst ../../%,%,$(wildcard ../../shared-bindings/qrio/*.c ../../shared-module/qrio/*.c ../../lib/quirc/lib/*.c))
SRC_C += $(SRC_QRIO)
CFLAGS += -DCIRCUITPY_QRIO=1
$(BUILD)/lib/quirc/lib/%.o: CFLAGS += -Wno-shadow -Wno-sign-compare -include shared-module/qrio/quirc_alloc.h
Add displayio bitmaps to unix build
2021-11-12 11:30:40 -05:00
SRC_BITMAP := \
$(patsubst ../../%,%,$(wildcard ../../shared-bindings/gifio/*.c ../../shared-module/gifio/*.c)) \
shared/runtime/context_manager_helpers.c \
displayio_min.c \
add aesio to unix coverage build
2021-11-28 16:14:47 -05:00
shared-bindings/aesio/aes.c \
shared-bindings/aesio/__init__.c \
enable rainbowio on unix coverage port
2021-11-12 18:07:00 -05:00
shared-bindings/bitmaptools/__init__.c \
Add displayio bitmaps to unix build
2021-11-12 11:30:40 -05:00
shared-bindings/displayio/Bitmap.c \
enable rainbowio on unix coverage port
2021-11-12 18:07:00 -05:00
shared-bindings/rainbowio/__init__.c \
shared-bindings/util.c \
add aesio to unix coverage build
2021-11-28 16:14:47 -05:00
shared-module/aesio/aes.c \
shared-module/aesio/__init__.c \
enable rainbowio on unix coverage port
2021-11-12 18:07:00 -05:00
shared-module/bitmaptools/__init__.c \
Add displayio bitmaps to unix build
2021-11-12 11:30:40 -05:00
shared-module/displayio/area.c \
shared-module/displayio/Bitmap.c \
shared-module/displayio/ColorConverter.c \
enable rainbowio on unix coverage port
2021-11-12 18:07:00 -05:00
shared-module/displayio/ColorConverter.c \
shared-module/rainbowio/__init__.c \
Add displayio bitmaps to unix build
2021-11-12 11:30:40 -05:00
$(info $(SRC_BITMAP))
SRC_C += $(SRC_BITMAP)
add aesio to unix coverage build
2021-11-28 16:14:47 -05:00
CFLAGS += -DCIRCUITPY_GIFIO=1 -DCIRCUITPY_DISPLAYIO_UNIX=1 -DCIRCUITPY_BITMAPTOOLS=1 -DCIRCUITPY_RAINBOWIO=1 -DCIRCUITPY_AESIO=1
Implement gifio.GifWriter This involves: * Adding a new "L8" colorspace for colorconverters * factoring out displayio_colorconverter_convert_pixel * Making a minimal "colorspace only" version of displayio for the unix port (testing purposes) * fixing an error message I only tested writing B&W animated images, with the following script: ```python import displayio import gifio with gifio.GifWriter("foo.gif", 64, 64, displayio.Colorspace.L8) as g: for i in range(0, 256, 14): data = bytes([i, 255-i] * 32 + [255-i, i] * 32) * 32 print("add_frame") g.add_frame(data) # expected to raise an error, buffer is not big enough with gifio.GifWriter("/dev/null", 64, 64, displayio.Colorspace.L8) as g: g.add_frame(bytes([3,3,3])) ```
2021-10-21 12:45:11 -04:00
unix/Makefile: Move coverage.c and coveragecpp.cpp to coverage variant. So that g++ is not needed to build a non-coverage unix variant. Signed-off-by: Damien George <damien@micropython.org>
2020-10-29 02:33:34 -04:00
SRC_C += coverage.c
SRC_CXX += coveragecpp.cpp
Reference in New Issue Copy Permalink