From 27abac95d87b69f4282e2ca21ab19eff7bf6012b Mon Sep 17 00:00:00 2001
From: Jim Mussared
Date: Tue, 9 Jun 2020 16:45:17 +1000
Subject: 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/coverage-frzmpy/frzmpy1.py                       | 1 -
 ports/unix/coverage-frzmpy/frzmpy2.py                       | 1 -
 ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py          | 3 ---
 ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py               | 4 ----
 ports/unix/coverage-frzmpy/frzqstr.py                       | 3 ---
 ports/unix/coverage-frzstr/frzstr1.py                       | 1 -
 ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py          | 3 ---
 ports/unix/coverage-frzstr/frzstr_pkg2/mod.py               | 4 ----
 ports/unix/manifest.py                                      | 2 --
 ports/unix/manifest_coverage.py                             | 2 --
 ports/unix/variants/coverage/frzmpy/frzmpy1.py              | 1 +
 ports/unix/variants/coverage/frzmpy/frzmpy2.py              | 1 +
 ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py | 3 +++
 ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py      | 4 ++++
 ports/unix/variants/coverage/frzmpy/frzqstr.py              | 3 +++
 ports/unix/variants/coverage/frzstr/frzstr1.py              | 1 +
 ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py | 3 +++
 ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py      | 4 ++++
 ports/unix/variants/coverage/manifest.py                    | 2 ++
 ports/unix/variants/coverage/mpconfigvariant.mk             | 2 +-
 ports/unix/variants/manifest.py                             | 2 ++
 22 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 ports/unix/coverage-frzmpy/frzmpy1.py
 delete mode 100644 ports/unix/coverage-frzmpy/frzmpy2.py
 delete mode 100644 ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py
 delete mode 100644 ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py
 delete mode 100644 ports/unix/coverage-frzmpy/frzqstr.py
 delete mode 100644 ports/unix/coverage-frzstr/frzstr1.py
 delete mode 100644 ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py
 delete mode 100644 ports/unix/coverage-frzstr/frzstr_pkg2/mod.py
 delete mode 100644 ports/unix/manifest.py
 delete mode 100644 ports/unix/manifest_coverage.py
 create mode 100644 ports/unix/variants/coverage/frzmpy/frzmpy1.py
 create mode 100644 ports/unix/variants/coverage/frzmpy/frzmpy2.py
 create mode 100644 ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
 create mode 100644 ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
 create mode 100644 ports/unix/variants/coverage/frzmpy/frzqstr.py
 create mode 100644 ports/unix/variants/coverage/frzstr/frzstr1.py
 create mode 100644 ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
 create mode 100644 ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
 create mode 100644 ports/unix/variants/coverage/manifest.py
 create mode 100644 ports/unix/variants/manifest.py

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/coverage-frzmpy/frzmpy1.py b/ports/unix/coverage-frzmpy/frzmpy1.py
deleted file mode 100644
index 8ad0f1573..000000000
--- a/ports/unix/coverage-frzmpy/frzmpy1.py
+++ /dev/null
@@ -1 +0,0 @@
-print('frzmpy1')
diff --git a/ports/unix/coverage-frzmpy/frzmpy2.py b/ports/unix/coverage-frzmpy/frzmpy2.py
deleted file mode 100644
index 1ad930db2..000000000
--- a/ports/unix/coverage-frzmpy/frzmpy2.py
+++ /dev/null
@@ -1 +0,0 @@
-raise ZeroDivisionError
diff --git a/ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py b/ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py
deleted file mode 100644
index 8c023afeb..000000000
--- a/ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# test frozen package with __init__.py
-print('frzmpy_pkg1.__init__')
-x = 1
diff --git a/ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py b/ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py
deleted file mode 100644
index a66b505bf..000000000
--- a/ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# test frozen package without __init__.py
-print('frzmpy_pkg2.mod')
-class Foo:
-    x = 1
diff --git a/ports/unix/coverage-frzmpy/frzqstr.py b/ports/unix/coverage-frzmpy/frzqstr.py
deleted file mode 100644
index 051f2a9c1..000000000
--- a/ports/unix/coverage-frzmpy/frzqstr.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Checks for regression on MP_QSTR_NULL
-def returns_NULL():
-    return "NULL"
diff --git a/ports/unix/coverage-frzstr/frzstr1.py b/ports/unix/coverage-frzstr/frzstr1.py
deleted file mode 100644
index 6e88ac38d..000000000
--- a/ports/unix/coverage-frzstr/frzstr1.py
+++ /dev/null
@@ -1 +0,0 @@
-print('frzstr1')
diff --git a/ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py b/ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py
deleted file mode 100644
index 1d1df9417..000000000
--- a/ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# test frozen package with __init__.py
-print('frzstr_pkg1.__init__')
-x = 1
diff --git a/ports/unix/coverage-frzstr/frzstr_pkg2/mod.py b/ports/unix/coverage-frzstr/frzstr_pkg2/mod.py
deleted file mode 100644
index bafb5978b..000000000
--- a/ports/unix/coverage-frzstr/frzstr_pkg2/mod.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# test frozen package without __init__.py
-print('frzstr_pkg2.mod')
-class Foo:
-    x = 1
diff --git a/ports/unix/manifest.py b/ports/unix/manifest.py
deleted file mode 100644
index 666b4c0ab..000000000
--- a/ports/unix/manifest.py
+++ /dev/null
@@ -1,2 +0,0 @@
-freeze_as_mpy('$(MPY_DIR)/tools', 'upip.py')
-freeze_as_mpy('$(MPY_DIR)/tools', 'upip_utarfile.py', opt=3)
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/variants/coverage/frzmpy/frzmpy1.py b/ports/unix/variants/coverage/frzmpy/frzmpy1.py
new file mode 100644
index 000000000..8ad0f1573
--- /dev/null
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy1.py
@@ -0,0 +1 @@
+print('frzmpy1')
diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy2.py b/ports/unix/variants/coverage/frzmpy/frzmpy2.py
new file mode 100644
index 000000000..1ad930db2
--- /dev/null
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy2.py
@@ -0,0 +1 @@
+raise ZeroDivisionError
diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
new file mode 100644
index 000000000..8c023afeb
--- /dev/null
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
@@ -0,0 +1,3 @@
+# test frozen package with __init__.py
+print('frzmpy_pkg1.__init__')
+x = 1
diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
new file mode 100644
index 000000000..a66b505bf
--- /dev/null
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
@@ -0,0 +1,4 @@
+# test frozen package without __init__.py
+print('frzmpy_pkg2.mod')
+class Foo:
+    x = 1
diff --git a/ports/unix/variants/coverage/frzmpy/frzqstr.py b/ports/unix/variants/coverage/frzmpy/frzqstr.py
new file mode 100644
index 000000000..051f2a9c1
--- /dev/null
+++ b/ports/unix/variants/coverage/frzmpy/frzqstr.py
@@ -0,0 +1,3 @@
+# Checks for regression on MP_QSTR_NULL
+def returns_NULL():
+    return "NULL"
diff --git a/ports/unix/variants/coverage/frzstr/frzstr1.py b/ports/unix/variants/coverage/frzstr/frzstr1.py
new file mode 100644
index 000000000..6e88ac38d
--- /dev/null
+++ b/ports/unix/variants/coverage/frzstr/frzstr1.py
@@ -0,0 +1 @@
+print('frzstr1')
diff --git a/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
new file mode 100644
index 000000000..1d1df9417
--- /dev/null
+++ b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
@@ -0,0 +1,3 @@
+# test frozen package with __init__.py
+print('frzstr_pkg1.__init__')
+x = 1
diff --git a/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
new file mode 100644
index 000000000..bafb5978b
--- /dev/null
+++ b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
@@ -0,0 +1,4 @@
+# test frozen package without __init__.py
+print('frzstr_pkg2.mod')
+class Foo:
+    x = 1
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/variants/manifest.py b/ports/unix/variants/manifest.py
new file mode 100644
index 000000000..666b4c0ab
--- /dev/null
+++ b/ports/unix/variants/manifest.py
@@ -0,0 +1,2 @@
+freeze_as_mpy('$(MPY_DIR)/tools', 'upip.py')
+freeze_as_mpy('$(MPY_DIR)/tools', 'upip_utarfile.py', opt=3)
-- 
cgit v1.2.3