From e9d16b8860bf19016936f03a80e669630a9f4a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 2 Mar 2018 14:29:56 +0100
Subject: [PATCH] Bundle missing merge-exr.blend, required for progressive
rendering
---
CHANGELOG.md | 1 +
flamenco-worker.spec | 3 ++-
setup.py | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a69f94ca..12df3979 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ changed functionality, fixed bugs).
## Version 2.1.1 (in development)
- Always log the version of Flamenco Manager.
+- Include missing merge-exr.blend, required for progressive rendering, in the distribution bundle.
## Version 2.1.0 (2018-01-04)
diff --git a/flamenco-worker.spec b/flamenco-worker.spec
index 3a097704..69ff31ae 100644
--- a/flamenco-worker.spec
+++ b/flamenco-worker.spec
@@ -13,7 +13,8 @@ a = Analysis(['flamenco-worker.py'],
datas=[('flamenco-worker.cfg', '.'),
('README.md', '.'),
('CHANGELOG.md', '.'),
- ('LICENSE.txt', '.')],
+ ('LICENSE.txt', '.'),
+ ('flamenco_worker/merge-exr.blend', 'flamenco_worker')],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
diff --git a/setup.py b/setup.py
index cb59a0ca..93a51e81 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,7 @@ class ZipCommand(Command):
add_to_root(Path('LICENSE.txt'))
add_to_root(Path('README.md'))
add_to_root(Path('CHANGELOG.md'))
+ add_to_root(Path('flamenco_worker/merge-exr.blend'))
paths = collections.deque([Path('system-integration')])
while paths:
--
GitLab