Skip to content

Commit

Permalink
small updates to fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
oskros committed Aug 20, 2019
1 parent fce4492 commit b78d8c4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build_exe/create_exe_dict.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ rmdir /S /Q "C:\Users\oskro\PycharmProjects\MF_counter_releases\dist"
rmdir /S /Q "C:\Users\oskro\PycharmProjects\MF_counter_releases\dict_release"
cd "C:\Users\oskro\PycharmProjects\MF_counter_releases"
path=C:\Users\oskro\Downloads\WPy-3701\python-3.7.0.amd64;C:\Users\oskro\Downloads\WPy-3701\python-3.7.0.amd64\Scripts
pyinstaller "C:\Users\oskro\PycharmProjects\MF_counter_releases\build_exe\mf_timer_dict.spec" --windowed --clean --icon="C:\Users\oskro\PycharmProjects\MF_counter_releases\icon.ico"
pyinstaller "C:\Users\oskro\PycharmProjects\MF_counter_releases\build_exe\mf_timer_dict.spec" --windowed --clean --icon="C:\Users\oskro\PycharmProjects\MF_counter_releases\media\icon.ico"
start C:\Users\oskro\PycharmProjects\MF_counter_releases\dict_release\mf_timer
exit
2 changes: 1 addition & 1 deletion build_exe/create_one_exe.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ rmdir /S /Q "C:\Users\oskro\PycharmProjects\MF_counter_releases\dist"
rmdir /S /Q "C:\Users\oskro\PycharmProjects\MF_counter_releases\release"
cd "C:\Users\oskro\PycharmProjects\MF_counter_releases"
path=C:\Users\oskro\Downloads\WPy-3701\python-3.7.0.amd64;C:\Users\oskro\Downloads\WPy-3701\python-3.7.0.amd64\Scripts
pyinstaller "C:\Users\oskro\PycharmProjects\MF_counter_releases\build_exe\mf_timer_onefile.spec" --windowed --onefile --clean --icon="C:\Users\oskro\PycharmProjects\MF_counter_releases\icon.ico"
pyinstaller "C:\Users\oskro\PycharmProjects\MF_counter_releases\build_exe\mf_timer_onefile.spec" --windowed --onefile --clean --icon="C:\Users\oskro\PycharmProjects\MF_counter_releases\media\icon.ico"
start C:\Users\oskro\PycharmProjects\MF_counter_releases\release
exit
4 changes: 3 additions & 1 deletion init.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import re
import os
import sys
blockpath = os.path.join(getattr(sys, '_MEIPASS', os.path.abspath('.')), 'Blocks.txt')
blocks = [x for x in re.split(r'#(\s+)', open('Blocks.txt', 'r').read()) if x != '\n'] if os.path.isfile('Blocks.txt') else ['']*100
version = '0.10'
version = '0.9'
release_repo = 'https://github.com/oskros/MF_counter_releases/releases'
exec(blocks[0])
2 changes: 1 addition & 1 deletion mf_timer.py
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ def __init__(self):
self.root.title('MF run counter')
self.root.focus_get()
self.root.protocol("WM_DELETE_WINDOW", self.Quit)
self.root.iconbitmap(os.path.join(os.path.abspath('.'), frozen + 'icon.ico'))
self.root.iconbitmap(os.path.join(getattr(sys, '_MEIPASS', os.path.abspath('.')), frozen + 'icon.ico'))
self.root.pack_propagate(False)

# Build banner image
Expand Down

0 comments on commit b78d8c4

Please sign in to comment.