From f772fdeb33bd5a476deb502cea737732908b84f2 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 3 Dec 2015 14:32:45 +0100 Subject: [PATCH] update spec files --- release/pathoc.spec | 22 +++++++--------------- release/pathod.spec | 30 +++++++----------------------- 2 files changed, 14 insertions(+), 38 deletions(-) diff --git a/release/pathoc.spec b/release/pathoc.spec index dd2c79e84..22649076f 100644 --- a/release/pathoc.spec +++ b/release/pathoc.spec @@ -1,23 +1,15 @@ # -*- mode: python -*- -from glob import glob +from PyInstaller.utils.hooks import collect_data_files -VENV = "../release/venv" - -a = Analysis(['../../pathod/pathoc'], - hiddenimports=["_cffi_backend"], +a = Analysis(['../pathoc'], + binaries=None, + datas=None, + hiddenimports=['_cffi_backend'], hookspath=None, runtime_hooks=None, - excludes=None, - ) -a.datas += Tree( - os.path.join( - VENV, - "lib/python2.7/site-packages/certifi", - ), - prefix = "certifi" -) -pyz = PYZ(a.pure) + excludes=None) +pyz = PYZ(a.pure, a.zipped_data) exe = EXE(pyz, a.scripts, a.binaries, diff --git a/release/pathod.spec b/release/pathod.spec index d94fb824b..706b6b68e 100644 --- a/release/pathod.spec +++ b/release/pathod.spec @@ -1,31 +1,15 @@ # -*- mode: python -*- -from glob import glob +from PyInstaller.utils.hooks import collect_data_files -VENV = "../release/venv" - -a = Analysis(['../../pathod/pathod'], - hiddenimports=["_cffi_backend"], +a = Analysis(['../pathod'], + binaries=None, + datas=collect_data_files("libpathod"), + hiddenimports=['_cffi_backend'], hookspath=None, runtime_hooks=None, - excludes=None, - ) -a.datas = Tree( - "../pathod/libpathod/static", - prefix="libpathod/static" -) -a.datas = Tree( - "../pathod/libpathod/templates", - prefix="libpathod/templates" -) -a.datas += Tree( - os.path.join( - VENV, - "lib/python2.7/site-packages/certifi", - ), - prefix = "certifi" -) -pyz = PYZ(a.pure) + excludes=None) +pyz = PYZ(a.pure, a.zipped_data) exe = EXE(pyz, a.scripts, a.binaries,