diff options
| author | Paweł Jastrzębski <[email protected]> | 2014-09-22 18:35:53 +0200 |
|---|---|---|
| committer | Paweł Jastrzębski <[email protected]> | 2014-09-22 18:35:53 +0200 |
| commit | dfe3e104708b4c2eb0c938bfd36ebdc4cb90d298 (patch) | |
| tree | 59e7da15bb693604f5e6105bf365c079eb5d6d14 | |
| parent | Updated multiple device profiles (diff) | |
| download | kcc-dfe3e104708b4c2eb0c938bfd36ebdc4cb90d298.tar.gz kcc-dfe3e104708b4c2eb0c938bfd36ebdc4cb90d298.tar.bz2 kcc-dfe3e104708b4c2eb0c938bfd36ebdc4cb90d298.zip | |
Updated setup
| -rw-r--r-- | kcc.iss | 2 | ||||
| -rwxr-xr-x | setup.py | 35 |
2 files changed, 7 insertions, 30 deletions
diff --git a/kcc.iss b/kcc.iss index 3d63f08..9697188 100644 --- a/kcc.iss +++ b/kcc.iss @@ -43,13 +43,11 @@ Name: "CB7association"; Description: "CB7"; GroupDescription: "File associations [Files] ; x64 files -Source: "dist_64\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "dist_64\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "dist_64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "dist_64\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "other\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: Is64BitInstallMode ; x86 files -Source: "dist\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "dist\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "dist\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "dist\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode diff --git a/setup.py b/setup.py index f2a2828..fa19e56 100755 --- a/setup.py +++ b/setup.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 """ -cx_Freeze/py2app build script for KCC. - -Usage (Mac OS X): - python setup.py py2app +py2exe/py2app build script for KCC. Usage (Windows): python setup.py py2exe + +Usage (Mac OS X): + python setup.py py2app """ from sys import platform, version_info if version_info[0] != 3: @@ -63,43 +63,22 @@ elif platform == "win32": suffix = '_64' else: suffix = '' - additional_files = [('imageformats', ['C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\imageformats\qgif.dll', - 'C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\imageformats\qico.dll', - 'C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\imageformats\qjpeg.dll', - 'C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\imageformats\qmng.dll', - 'C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\imageformats\qsvg.dll', - 'C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\imageformats\qtga.dll', - 'C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\imageformats\qtiff.dll', - 'C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\imageformats\qwbmp.dll']), - ('platforms', ['C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\platforms\qminimal.dll', - 'C:\Python34' + suffix + - '\Lib\site-packages\PyQt5\plugins\platforms\qoffscreen.dll', - 'C:\Python34' + suffix + + additional_files = [('platforms', ['C:\Python34' + suffix + '\Lib\site-packages\PyQt5\plugins\platforms\qwindows.dll']), ('', ['LICENSE.txt', 'other\\7za.exe', 'other\\UnRAR.exe', 'other\\Additional-LICENSE.txt', - 'other\\7za.exe', 'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libEGL.dll'])] extra_options = dict( - options={'py2exe': {"bundle_files": 2, + options={'py2exe': {"bundle_files": 1, "dll_excludes": ["tcl85.dll", "tk85.dll"], "dist_dir": "dist" + suffix, "compressed": True, "includes": ["sip"], "excludes": ["tkinter"], "optimize": 2}}, - windows=[{"script": "kcc.py", + windows=[{"script": MAIN, "dest_base": "KCC", "version": VERSION, "copyright": "Ciro Mattia Gonano, Pawel Jastrzebski © 2014", |