djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix: Make manifest selection match other ports.

Browse Source 
Changes are:
- The default manifest.py is moved to the variants directory (it's in
  "boards" in other ports).
- The coverage variant now uses a custom manifest in its variant directory
  to add frzmpy/frzstr.
- The frzmpy/frzstr tests are moved to variants/coverage/.
This commit is contained in:
Jim Mussared 2020-06-09 16:45:17 +10:00 committed by Damien George
parent 07f181a216
commit 27abac95d8
13 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/unix/Makefile
View File

@ -14,7 +14,7 @@ include ../../py/mkenv.mk
include $(VARIANT_DIR)/mpconfigvariant.mk include $(VARIANT_DIR)/mpconfigvariant.mk
# use FROZEN_MANIFEST for new projects, others are legacy # use FROZEN_MANIFEST for new projects, others are legacy
FROZEN_MANIFEST ?= manifest.py FROZEN_MANIFEST ?= variants/manifest.py
FROZEN_DIR = FROZEN_DIR =
FROZEN_MPY_DIR = FROZEN_MPY_DIR =

2
ports/unix/manifest_coverage.py
View File

@ -1,2 +0,0 @@
freeze_as_str('coverage-frzstr')
freeze_as_mpy('coverage-frzmpy')

0
ports/unix/coverage-frzmpy/frzmpy1.py → ports/unix/variants/coverage/frzmpy/frzmpy1.py
View File

0
ports/unix/coverage-frzmpy/frzmpy2.py → ports/unix/variants/coverage/frzmpy/frzmpy2.py
View File

0
ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py → ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
View File

0
ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py → ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
View File

0
ports/unix/coverage-frzmpy/frzqstr.py → ports/unix/variants/coverage/frzmpy/frzqstr.py
View File

0
ports/unix/coverage-frzstr/frzstr1.py → ports/unix/variants/coverage/frzstr/frzstr1.py
View File

0
ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py → ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
View File

0
ports/unix/coverage-frzstr/frzstr_pkg2/mod.py → ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
View File

2
ports/unix/variants/coverage/manifest.py Normal file
View File

@ -0,0 +1,2 @@
freeze_as_str("frzstr")
freeze_as_mpy("frzmpy")

2
ports/unix/variants/coverage/mpconfigvariant.mk
View File

@ -11,7 +11,7 @@ CFLAGS += \
LDFLAGS += -fprofile-arcs -ftest-coverage LDFLAGS += -fprofile-arcs -ftest-coverage
FROZEN_MANIFEST = manifest_coverage.py FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
MICROPY_ROM_TEXT_COMPRESSION = 1 MICROPY_ROM_TEXT_COMPRESSION = 1
MICROPY_VFS_FAT = 1 MICROPY_VFS_FAT = 1

0
ports/unix/manifest.py → ports/unix/variants/manifest.py
View File