Skip to content

Commit

Permalink
Update to 1.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
elmoiv authored Feb 24, 2022
1 parent db4f06b commit c11eb16
Show file tree
Hide file tree
Showing 24 changed files with 3,842 additions and 728 deletions.
1 change: 1 addition & 0 deletions BUILD.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set "src=%cd%\src\"

pyuic5 "%exe%ui_main.ui" -o "%src%ui\ui_main.py"
pyuic5 "%exe%ui_about.ui" -o "%src%ui\ui_about.py"
pyuic5 "%exe%ui_device.ui" -o "%src%ui\ui_device.py"
pyuic5 "%exe%ui_settings.ui" -o "%src%ui\ui_settings.py"

python build.py
Expand Down
1 change: 1 addition & 0 deletions RUN.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set "src=%cd%\src\"
echo Updating UIs
pyuic5 "%exe%ui_main.ui" -o "%src%ui\ui_main.py"
pyuic5 "%exe%ui_about.ui" -o "%src%ui\ui_about.py"
pyuic5 "%exe%ui_device.ui" -o "%src%ui\ui_device.py"
pyuic5 "%exe%ui_settings.ui" -o "%src%ui\ui_settings.py"

echo Running script
Expand Down
16 changes: 13 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@
is_gui = not bool(input('Press Enter for GUI, or anything for Console: '))
app_name = 'elmoCut'
app_guid = '31430AA0-C0A7-4598-991B-E3B2CD961817'
version = '1.0.5'
version = input('Enter version: ')

try:sum(map(int, version.split('.')))
except:version='1.0.0'

import os, shutil, time, re

Expand Down Expand Up @@ -184,6 +187,9 @@ def version_format(s):

platforms_dlls = app_path + 'PyQt5\\Qt\\plugins\\platforms\\'

## Kill elmocut in case was running from old output folder
os.system('taskkill /f /im elmoCut.exe')

## Remove previous builds
if os.path.exists(app_path):
shutil.rmtree(app_path)
Expand Down Expand Up @@ -215,7 +221,11 @@ def version_format(s):
'build',
app_path + 'PyQt5\\Qt\\translations',
app_path + 'PyQt5\\Qt\\plugins\\imageformats',
app_path + 'PyQt5\\Qt\\plugins\\iconengines']:
app_path + 'PyQt5\\Qt\\plugins\\iconengines',
app_path + 'altgraph-0.17.dist-info',
app_path + 'pyinstaller-4.9.dist-info',
app_path + 'setuptools-41.2.0.dist-info'
]:
shutil.rmtree(rm)

# Dynamically add files list to iss file
Expand Down Expand Up @@ -253,4 +263,4 @@ def version_format(s):
end = time.time()

print('>>> Finished in', int(end - start), 'seconds')
input('\nSee your files at "output\\"')
input('\nSee your files at "output\\"')
Loading

0 comments on commit c11eb16

Please sign in to comment.