From 8fef52191a218e69b7a3b38ca8433f869f965888 Mon Sep 17 00:00:00 2001
From: Michael Hansen <mike@rhasspy.org>
Date: Fri, 29 Apr 2022 11:46:12 -0400
Subject: [PATCH] Build plugin dist

---
 tests/Dockerfile.plugin => Dockerfile.plugin           |  8 +++++++-
 ...ugin.dockerignore => Dockerfile.plugin.dockerignore |  9 +++++++++
 Makefile                                               | 10 +++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)
 rename tests/Dockerfile.plugin => Dockerfile.plugin (95%)
 rename tests/Dockerfile.plugin.dockerignore => Dockerfile.plugin.dockerignore (75%)

diff --git a/tests/Dockerfile.plugin b/Dockerfile.plugin
similarity index 95%
rename from tests/Dockerfile.plugin
rename to Dockerfile.plugin
index 5d66d92..340af14 100644
--- a/tests/Dockerfile.plugin
+++ b/Dockerfile.plugin
@@ -16,7 +16,7 @@
 # -----------------------------------------------------------------------------
 # Dockerfile for Mimic 3 (https://github.com/MycroftAI/mimic3)
 #
-# Tests TTS plugin with Mycroft.
+# Builds and tests TTS plugin with Mycroft.
 #
 # Requires Docker buildx: https://docs.docker.com/buildx/working-with-buildx/
 # -----------------------------------------------------------------------------
@@ -47,6 +47,12 @@ COPY build-dist.sh ./
 # Create sdists
 RUN ./build-dist.sh
 
+# Build plugin sdist
+COPY plugin-tts-mimic3 ./plugin-tts-mimic3/
+RUN cd plugin-tts-mimic3 && \
+    python3 setup.py sdist && \
+    cp plugin-tts-mimic3/dist/*.tar.gz dist/
+
 # -----------------------------------------------------------------------------
 
 FROM debian:bullseye as test
diff --git a/tests/Dockerfile.plugin.dockerignore b/Dockerfile.plugin.dockerignore
similarity index 75%
rename from tests/Dockerfile.plugin.dockerignore
rename to Dockerfile.plugin.dockerignore
index abd58fb..dfb29e0 100644
--- a/tests/Dockerfile.plugin.dockerignore
+++ b/Dockerfile.plugin.dockerignore
@@ -7,6 +7,15 @@
 !wheels/
 !debian/control.in.*
 
+# plugin-tts-mimic3
+!plugin-tts-mimic3/setup.py
+!plugin-tts-mimic3/LICENSE
+!plugin-tts-mimic3/MANIFEST.in
+!plugin-tts-mimic3/requirements.txt
+!plugin-tts-mimic3/plugin_tts_mimic3/*.py
+!plugin-tts-mimic3/plugin_tts_mimic3/VERSION
+!plugin-tts-mimic3/plugin_tts_mimic3/py.typed
+
 # opentts-abc
 !opentts-abc/setup.py
 !opentts-abc/LICENSE
diff --git a/Makefile b/Makefile
index 9cb5ef1..1e3df60 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-.PHONY: dist install docker docker-gpu debian sample plugin-test
+.PHONY: dist install docker docker-gpu debian sample plugin-dist
 
 SHELL := bash
 
@@ -64,11 +64,11 @@ debian:
             docker buildx build . -f Dockerfile.debian --platform $(DOCKER_PLATFORM) --output "type=local,dest=dist/"; \
         done
 
-# Tests TTS plugin with Mycroft.
+# Build TTS plugin distribution package.
 # https://github.com/MycroftAI/plugin-tts-mimic3
-# Enable local --output to get generated sample and log.
-plugin-test:
+# Also tests with latest Mycroft.
+plugin-dist:
 	echo "$(DOCKER_PLATFORM)" | sed -e 's/,/\n/g' | \
         while read -r platform; do \
-            docker buildx build . -f tests/Dockerfile.plugin --platform $(DOCKER_PLATFORM); \
+            docker buildx build . -f Dockerfile.plugin --platform $(DOCKER_PLATFORM) --output "type=local,dest/dist/"; \
         done