From 27abac95d87b69f4282e2ca21ab19eff7bf6012b Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Tue, 9 Jun 2020 16:45:17 +1000 Subject: [PATCH] unix: Make manifest selection match other ports. 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/. --- ports/unix/Makefile | 2 +- ports/unix/manifest_coverage.py | 2 -- .../{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy1.py | 0 .../{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy2.py | 0 .../coverage/frzmpy}/frzmpy_pkg1/__init__.py | 0 .../coverage/frzmpy}/frzmpy_pkg2/mod.py | 0 .../{coverage-frzmpy => variants/coverage/frzmpy}/frzqstr.py | 0 .../{coverage-frzstr => variants/coverage/frzstr}/frzstr1.py | 0 .../coverage/frzstr}/frzstr_pkg1/__init__.py | 0 .../coverage/frzstr}/frzstr_pkg2/mod.py | 0 ports/unix/variants/coverage/manifest.py | 2 ++ ports/unix/variants/coverage/mpconfigvariant.mk | 2 +- ports/unix/{ => variants}/manifest.py | 0 13 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 ports/unix/manifest_coverage.py rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy1.py (100%) rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy2.py (100%) rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy_pkg1/__init__.py (100%) rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy_pkg2/mod.py (100%) rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzqstr.py (100%) rename ports/unix/{coverage-frzstr => variants/coverage/frzstr}/frzstr1.py (100%) rename ports/unix/{coverage-frzstr => variants/coverage/frzstr}/frzstr_pkg1/__init__.py (100%) rename ports/unix/{coverage-frzstr => variants/coverage/frzstr}/frzstr_pkg2/mod.py (100%) create mode 100644 ports/unix/variants/coverage/manifest.py rename ports/unix/{ => variants}/manifest.py (100%) diff --git a/ports/unix/Makefile b/ports/unix/Makefile index ec14166149..3e2fa63a16 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -14,7 +14,7 @@ include ../../py/mkenv.mk include $(VARIANT_DIR)/mpconfigvariant.mk # use FROZEN_MANIFEST for new projects, others are legacy -FROZEN_MANIFEST ?= manifest.py +FROZEN_MANIFEST ?= variants/manifest.py FROZEN_DIR = FROZEN_MPY_DIR = diff --git a/ports/unix/manifest_coverage.py b/ports/unix/manifest_coverage.py deleted file mode 100644 index 0c32d08578..0000000000 --- a/ports/unix/manifest_coverage.py +++ /dev/null @@ -1,2 +0,0 @@ -freeze_as_str('coverage-frzstr') -freeze_as_mpy('coverage-frzmpy') diff --git a/ports/unix/coverage-frzmpy/frzmpy1.py b/ports/unix/variants/coverage/frzmpy/frzmpy1.py similarity index 100% rename from ports/unix/coverage-frzmpy/frzmpy1.py rename to ports/unix/variants/coverage/frzmpy/frzmpy1.py diff --git a/ports/unix/coverage-frzmpy/frzmpy2.py b/ports/unix/variants/coverage/frzmpy/frzmpy2.py similarity index 100% rename from ports/unix/coverage-frzmpy/frzmpy2.py rename to ports/unix/variants/coverage/frzmpy/frzmpy2.py diff --git a/ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py similarity index 100% rename from ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py rename to ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py diff --git a/ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py similarity index 100% rename from ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py rename to ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py diff --git a/ports/unix/coverage-frzmpy/frzqstr.py b/ports/unix/variants/coverage/frzmpy/frzqstr.py similarity index 100% rename from ports/unix/coverage-frzmpy/frzqstr.py rename to ports/unix/variants/coverage/frzmpy/frzqstr.py diff --git a/ports/unix/coverage-frzstr/frzstr1.py b/ports/unix/variants/coverage/frzstr/frzstr1.py similarity index 100% rename from ports/unix/coverage-frzstr/frzstr1.py rename to ports/unix/variants/coverage/frzstr/frzstr1.py diff --git a/ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py similarity index 100% rename from ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py rename to ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py diff --git a/ports/unix/coverage-frzstr/frzstr_pkg2/mod.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py similarity index 100% rename from ports/unix/coverage-frzstr/frzstr_pkg2/mod.py rename to ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py diff --git a/ports/unix/variants/coverage/manifest.py b/ports/unix/variants/coverage/manifest.py new file mode 100644 index 0000000000..6111050884 --- /dev/null +++ b/ports/unix/variants/coverage/manifest.py @@ -0,0 +1,2 @@ +freeze_as_str("frzstr") +freeze_as_mpy("frzmpy") diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk index ddb5027a97..66e694e0a9 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.mk +++ b/ports/unix/variants/coverage/mpconfigvariant.mk @@ -11,7 +11,7 @@ CFLAGS += \ LDFLAGS += -fprofile-arcs -ftest-coverage -FROZEN_MANIFEST = manifest_coverage.py +FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py MICROPY_ROM_TEXT_COMPRESSION = 1 MICROPY_VFS_FAT = 1 diff --git a/ports/unix/manifest.py b/ports/unix/variants/manifest.py similarity index 100% rename from ports/unix/manifest.py rename to ports/unix/variants/manifest.py