Skip to content

Commit f8a4d19

Browse files
authored
Version 2.0.1 (#23)
* Fixing broken exe, requiring console for time being
1 parent 44636c9 commit f8a4d19

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

CHANGES

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
---------
33

4+
Version 2.0.1
5+
~~~~~~~~~~~~~
6+
7+
* Fixing broken exe, requiring console for time being
8+
49
Version 2.0.0
510
~~~~~~~~~~~~~
611

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ build_script:
3939
- ps: 'New-Item -Path Env: -Name VERSION -Value $(C:\Python36-x64\python.exe scripts\get_version.py)'
4040
- cmd: echo %VERSION% > build_version
4141
- ps: 'echo "Building branch $env:APPVEYOR_REPO_BRANCH - version $env:VERSION"'
42-
- cmd: if %APPVEYOR_REPO_BRANCH% == master ( C:\Python36-x64\Scripts\pyinstaller --add-data "bundled;." --add-data "plugins.7z;extra" --add-data "data\rotations\*;data\rotations" --add-data "data\icon.ico;data" --add-data "binary-files\executables\windows\svt-av1\svt-1.0.549.7z;extra" --add-data "docs\build-licenses.txt;docs" --add-data "binary-files\executables\windows\7-zip\1900\x64\*;extra" --add-data "binary-files\executables\windows\ffmpeg\lgpl\N-93214-g7e4d3dbe18\x86_64\ffmpeg_lgpl.7z;extra" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile --noconsole )
43-
- cmd: IF NOT %APPVEYOR_REPO_BRANCH% == master ( C:\Python36-x64\Scripts\pyinstaller --add-data "bundled;." --add-data "plugins.7z;extra" --add-data "build_version;." --add-data "data\rotations\*;data\rotations" --add-data "data\icon.ico;data" --add-data "binary-files\executables\windows\svt-av1\svt-1.0.549.7z;extra" --add-data "docs\build-licenses.txt;docs" --add-data "binary-files\executables\windows\7-zip\1900\x64\*;extra" --add-data "binary-files\executables\windows\ffmpeg\lgpl\N-93214-g7e4d3dbe18\x86_64\ffmpeg_lgpl.7z;extra" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile )
42+
- cmd: C:\Python36-x64\Scripts\pyinstaller --add-data "bundled;." --add-data "plugins.7z;extra" --add-data "data\rotations\*;data\rotations" --add-data "data\icon.ico;data" --add-data "binary-files\executables\windows\svt-av1\svt-1.0.549.7z;extra" --add-data "docs\build-licenses.txt;docs" --add-data "binary-files\executables\windows\7-zip\1900\x64\*;extra" --add-data "binary-files\executables\windows\ffmpeg\lgpl\N-93214-g7e4d3dbe18\x86_64\ffmpeg_lgpl.7z;extra" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile
43+
# - cmd: IF NOT %APPVEYOR_REPO_BRANCH% == build ( C:\Python36-x64\Scripts\pyinstaller --add-data "bundled;." --add-data "plugins.7z;extra" --add-data "build_version;." --add-data "data\rotations\*;data\rotations" --add-data "data\icon.ico;data" --add-data "binary-files\executables\windows\svt-av1\svt-1.0.549.7z;extra" --add-data "docs\build-licenses.txt;docs" --add-data "binary-files\executables\windows\7-zip\1900\x64\*;extra" --add-data "binary-files\executables\windows\ffmpeg\lgpl\N-93214-g7e4d3dbe18\x86_64\ffmpeg_lgpl.7z;extra" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile --noconsole )
4444
- cmd: move dist\*.exe .
4545

4646
test: off

flix/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env python
2-
__version__ = '2.0.0'
2+
__version__ = '2.0.1'
33
__author__ = 'Chris Griffith'

flix/widgets/container.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self, data_path, **kwargs):
1919
main = Main(self, data_path, **kwargs)
2020
self.setCentralWidget(main)
2121
self.setMinimumSize(1200, 600)
22-
self.setWindowIcon(QtGui.QIcon(str(Path("data", "icon.ico"))))
22+
self.setWindowIcon(QtGui.QIcon(str(Path(base_path, "data", "icon.ico"))))
2323

2424
def init_menu(self):
2525
exit_action = QtWidgets.QAction('&Exit', self)

0 commit comments

Comments
 (0)