add new pyinstaller spec files

4 files changed, 34 insertions, 90 deletions

diff --git a/release/mitmdump.spec b/release/mitmdump.spec
index e3a6905d..c3b5ecd0 100644
--- a/release/mitmdump.spec
+++ b/release/mitmdump.spec
@@ -1,31 +1,15 @@
 # -*- mode: python -*-
 
-from glob import glob
+from PyInstaller.utils.hooks import collect_data_files
 
-VENV = "../release/venv"
-
-a = Analysis(['../../mitmproxy/mitmdump'],
+a = Analysis(['../mitmdump'],
+             binaries=None,
+             datas=collect_data_files("libmproxy.onboarding"),
              hiddenimports=[],
              hookspath=None,
              runtime_hooks=None,
-             excludes=None,
-          )
-a.datas = Tree(
-  "../mitmproxy/libmproxy/onboarding/templates",
-  prefix="libmproxy/onboarding/templates"
-)
-a.datas += Tree(
-  "../mitmproxy/libmproxy/onboarding/static",
-  prefix="libmproxy/onboarding/static"
-)
-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/mitmproxy.spec b/release/mitmproxy.spec
index 1f0a515b..2666828a 100644
--- a/release/mitmproxy.spec
+++ b/release/mitmproxy.spec
@@ -1,31 +1,15 @@
 # -*- mode: python -*-
-import os.path
-from glob import glob
 
-VENV = "../release/venv"
+from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../../mitmproxy/mitmproxy'],
+a = Analysis(['../mitmproxy'],
+             binaries=None,
+             datas=collect_data_files("libmproxy.onboarding"),
              hiddenimports=[],
              hookspath=None,
              runtime_hooks=None,
-             excludes=None,
-          )
-a.datas = Tree(
-  "../mitmproxy/libmproxy/onboarding/templates",
-  prefix="libmproxy/onboarding/templates"
-)
-a.datas += Tree(
-  "../mitmproxy/libmproxy/onboarding/static",
-  prefix="libmproxy/onboarding/static"
-)
-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/mitmweb.spec b/release/mitmweb.spec
new file mode 100644
index 00000000..e1fea1a3
--- /dev/null
+++ b/release/mitmweb.spec
@@ -0,0 +1,22 @@
+# -*- mode: python -*-
+
+from PyInstaller.utils.hooks import collect_data_files
+
+a = Analysis(['../mitmweb'],
+             binaries=None,
+             datas=collect_data_files("libmproxy"),
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None,
+             excludes=None)
+pyz = PYZ(a.pure, a.zipped_data)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='mitmweb',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )
diff --git a/release/mitmweb.spec.disabled b/release/mitmweb.spec.disabled
deleted file mode 100644
index 21ae2890..00000000
--- a/release/mitmweb.spec.disabled
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- mode: python -*-
-
-from glob import glob
-
-VENV = "../release/venv"
-
-a = Analysis(['../mitmproxy/mitmweb'],
-             hiddenimports=[],
-             hookspath=None,
-             runtime_hooks=None,
-             excludes=None,
-          )
-a.datas = Tree(
-  "../mitmproxy/libmproxy/onboarding/templates",
-  prefix="libmproxy/onboarding/templates"
-)
-a.datas += Tree(
-  "../mitmproxy/libmproxy/onboarding/static",
-  prefix="libmproxy/onboarding/static"
-)
-a.datas += Tree(
-  "../mitmproxy/libmproxy/web/templates",
-  prefix="libmproxy/web/templates"
-)
-a.datas += Tree(
-  "../mitmproxy/libmproxy/web/static",
-  prefix="libmproxy/web/static"
-)
-a.datas += Tree(
-    os.path.join(
-        VENV,
-        "lib/python2.7/site-packages/certifi",
-    ),
-    prefix = "certifi"
-)
-pyz = PYZ(a.pure)
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
-          name='mitmweb',
-          debug=False,
-          strip=None,
-          upx=True,
-          console=True )