From b021782ca062804ed2b7540ac3fa89c8cd72e51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 27 Jun 2022 15:58:45 +0200 Subject: [PATCH] Get the `make package` command to work To create a single ZIP file that contains the Manager, Worker, and add-on, just run `make package`. --- .gitignore | 1 + Makefile | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bb316020..0b06583f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ __pycache__ web/manager-api/dist/ web/static/ +/dist/ diff --git a/Makefile b/Makefile index 412b3529..27f262a2 100644 --- a/Makefile +++ b/Makefile @@ -144,12 +144,15 @@ clean: @go clean -i -x rm -f flamenco*-v* flamenco-manager flamenco-worker *.exe flamenco-*_race addon-packer -package: flamenco-manager flamenco-worker +package: flamenco-manager flamenco-worker addon-packer + rm -rf dist-build + mkdir -p dist-build + cp -a flamenco-manager flamenco-worker dist-build/ + cp -a web/static/flamenco-addon.zip dist-build/ + cp -a README.md LICENSE dist-build/ + cd dist-build; zip -r -9 flamenco-${VERSION}.zip * mkdir -p dist - rsync -a flamenco-manager flamenco-worker dist/ - rsync -a addon/flamenco dist/ --exclude __pycache__ --exclude '*.pyc' --prune-empty-dirs --exclude .mypy_cache --exclude manager/docs --delete --delete-excluded - cd dist; zip -r -9 flamenco-${VERSION}-addon.zip flamenco - rm -rf dist/flamenco - + mv dist-build/flamenco-${VERSION}.zip dist + rm -rf dist-build .PHONY: application version flamenco-manager flamenco-worker flamenco-manager_race flamenco-worker_race webapp webapp-static generate generate-go generate-py with-deps swagger-ui list-embedded test clean