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/.

13 files changed, 4 insertions, 4 deletions

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index ec1416614..3e2fa63a1 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 0c32d0857..000000000
--- 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
index 8ad0f1573..8ad0f1573 100644
--- a/ports/unix/coverage-frzmpy/frzmpy1.py
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy1.py
diff --git a/ports/unix/coverage-frzmpy/frzmpy2.py b/ports/unix/variants/coverage/frzmpy/frzmpy2.py
index 1ad930db2..1ad930db2 100644
--- a/ports/unix/coverage-frzmpy/frzmpy2.py
+++ b/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
index 8c023afeb..8c023afeb 100644
--- a/ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py
+++ b/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
index a66b505bf..a66b505bf 100644
--- a/ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py
+++ b/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
index 051f2a9c1..051f2a9c1 100644
--- a/ports/unix/coverage-frzmpy/frzqstr.py
+++ b/ports/unix/variants/coverage/frzmpy/frzqstr.py
diff --git a/ports/unix/coverage-frzstr/frzstr1.py b/ports/unix/variants/coverage/frzstr/frzstr1.py
index 6e88ac38d..6e88ac38d 100644
--- a/ports/unix/coverage-frzstr/frzstr1.py
+++ b/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
index 1d1df9417..1d1df9417 100644
--- a/ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py
+++ b/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
index bafb5978b..bafb5978b 100644
--- a/ports/unix/coverage-frzstr/frzstr_pkg2/mod.py
+++ b/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 000000000..611105088
--- /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 ddb5027a9..66e694e0a 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
index 666b4c0ab..666b4c0ab 100644
--- a/ports/unix/manifest.py
+++ b/ports/unix/variants/manifest.py