[Pkg-privacy-commits] [tails-installer] 02/07: Fix the pyinstaller specfile for Windows

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to tag 3.93.2
in repository tails-installer.

commit 7c408183e865f611933119d8b4d216994bda18b2
Author: Martin Bříza <m at rtinbriza.cz>
Date:   Fri Apr 22 17:02:15 2016 +0200

    Fix the pyinstaller specfile for Windows
---
 liveusb-creator.pyi.spec | 51 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/liveusb-creator.pyi.spec b/liveusb-creator.pyi.spec
index 11c3c7e..7d0dc06 100644
--- a/liveusb-creator.pyi.spec
+++ b/liveusb-creator.pyi.spec
@@ -1,9 +1,7 @@
-
-
 # -*- mode: python -*-
-from PyInstaller.utils.hooks import qt5_qml_data
 
-# removes all debug dll variants from the archive, comparing them to their regular counterparts (*d.dll vs *.dll)
+block_cipher = None
+
 def stripDebug(list):
     toRemove = []
     for dll in list:
@@ -14,7 +12,6 @@ def stripDebug(list):
                     break
     for dll in toRemove:
         list.remove(dll)
-
 def stripQml(list):
     toRemove = []
     for data in list:
@@ -22,40 +19,58 @@ def stripQml(list):
             toRemove.append(data)
     for data in toRemove:
         list.remove(data)
+def insertAngle(list):
+    list += [("libGLESv2.dll", "C:\\Tools\\Qt\\Tools\\QtCreator\\libGLESv2.dll", "DATA")]
+    list += [("libEGL.dll", "C:\\Tools\\Qt\\Tools\\QtCreator\\libEGL.dll", "DATA")]
+    list += [("d3dcompiler_47.dll", "C:\\Tools\\Qt\\Tools\\QtCreator\\d3dcompiler_47.dll", "DATA")]
 
 a = Analysis(['liveusb-creator'],
-             hiddenimports=['pyquery'],
-             hookspath=None,
-             runtime_hooks=None)
-pyz = PYZ(a.pure)
+             pathex=['C:\\Users\\m\\Code\\RH\\liveusb-creator'],
+             binaries=None,
+             datas=None,
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
 
+# yeah, hardcoded paths are much easier than to write it properly
 newqml = []
-newqml += Tree("C:\\Qt\\5.5\\mingw492_32\\qml\\QtQuick", prefix = 'QtQuick')
-newqml += Tree("C:\\Qt\\5.5\\mingw492_32\\qml\\QtQuick.2", prefix = 'QtQuick.2')
-newqml += Tree("C:\\Qt\\5.5\\mingw492_32\\qml\\QtQml", prefix = 'QtQml')
-newqml += Tree("C:\\Qt\\5.5\\mingw492_32\\qml\\Qt", prefix = 'Qt')
+newqml += Tree("C:\\Tools\\Qt\\5.6\\mingw49_32\\qml\\QtQuick", prefix = 'QtQuick')
+newqml += Tree("C:\\Tools\\Qt\\5.6\\mingw49_32\\qml\\QtQuick.2", prefix = 'QtQuick.2')
+newqml += Tree("C:\\Tools\\Qt\\5.6\\mingw49_32\\qml\\QtQml", prefix = 'QtQml')
+newqml += Tree("C:\\Tools\\Qt\\5.6\\mingw49_32\\qml\\Qt", prefix = 'Qt')
+
 
 tools = []
 tools += Tree("tools", prefix = 'tools')
 
 stripQml(a.binaries)
+stripQml(a.datas)
 stripDebug(a.binaries)
 stripDebug(newqml)
+# TODO doesn't work
+#insertAngle(a.datas)
 
 exe = EXE(pyz,
           a.scripts,
           exclude_binaries=True,
-          name='liveusb-creator.exe',
+          name='liveusb-creator',
           debug=False,
-          strip=False,
-          upx=True,
+          strip=True,
+          upx=False,
           console=False,
-          manifest='liveusb-creator.exe.manifest')
+          manifest='liveusb-creator.exe.manifest' )
 coll = COLLECT(exe,
                a.binaries,
+               a.zipfiles,
+               a.datas,
                newqml,
                tools,
                strip=False,
                upx=True,
                name='liveusb-creator')
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git