Skip to content

Commit

Permalink
Fix setup script
Browse files Browse the repository at this point in the history
  • Loading branch information
citizen-stig committed Mar 24, 2018
1 parent 95856b8 commit 466bc5a
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 48 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PyQt5==5.10.1
cx_Freeze=5.1.1
cx_Freeze==5.1.1
90 changes: 43 additions & 47 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,42 @@

path = ["pyjtt"] + sys.path
icon_path = os.path.join("resources", "icons", "clock.ico")
build_exe_options = {"path": path,
"icon": icon_path,
"include_msvcr": True, #skip error msvcr100.dll missing,
# Fix error with "This application failed to start because it could not find or load the QT platform plugin "windows"."
"include_files": ['C:\Python34\Lib\site-packages\PyQt5\libEGL.dll']
}
build_exe_options = {'path': path, 'include_msvcr': True}

# http://msdn.microsoft.com/en-us/library/windows/desktop/aa371847(v=vs.85).aspx
shortcut_table = [
("DesktopShortcut", # Shortcut
"DesktopFolder", # Directory_
"pyJTT", # Name
"TARGETDIR", # Component_
"[TARGETDIR]pyjtt.exe", # Target
None, # Arguments
None, # Description
None, # Hotkey
None, # Icon
None, # IconIndex
None, # ShowCmd
'%APPDATA%\pyjtt' # WkDir
("DesktopShortcut", # Shortcut
"DesktopFolder", # Directory_
"pyJTT", # Name
"TARGETDIR", # Component_
"[TARGETDIR]pyjtt.exe", # Target
None, # Arguments
None, # Description
None, # Hotkey
None, # Icon
None, # IconIndex
None, # ShowCmd
'%APPDATA%\pyjtt' # WkDir
),
("ProgramMenuShortcut", # Shortcut
"ProgramMenuFolder", # Directory_
"pyJTT", # Name
"TARGETDIR", # Component_
"[TARGETDIR]pyjtt.exe", # Target
None, # Arguments
None, # Description
None, # Hotkey
None, # Icon
None, # IconIndex
None, # ShowCmd
'%APPDATA%\pyjtt' # WkDir
("ProgramMenuShortcut", # Shortcut
"ProgramMenuFolder", # Directory_
"pyJTT", # Name
"TARGETDIR", # Component_
"[TARGETDIR]pyjtt.exe", # Target
None, # Arguments
None, # Description
None, # Hotkey
None, # Icon
None, # IconIndex
None, # ShowCmd
'%APPDATA%\pyjtt' # WkDir
)]



# Now create the table dictionary
msi_data = {"Shortcut": shortcut_table}

# Change some default MSI options and specify the use of the above defined tables
# Change some default MSI options and specify the
# use of the above defined tables
bdist_msi_options = {'data': msi_data}

# GUI applications require a different base on Windows (the default is for a
Expand All @@ -55,17 +50,18 @@

target_app = os.path.join("pyjtt", "app.py")

setup( name = "pyjtt",
version = "1.2.2",
description = "Jira Time Tracker",
maintainer="Nikolay Golub",
maintainer_email="[email protected]",
long_description = "Allows track time in JIRA online and manage worklogs",
license = "GNU GENERAL PUBLIC LICENSE Version 3",
options = {"build_exe": build_exe_options,
"bdist_msi": bdist_msi_options,},
executables = [Executable(target_app,
base=base,
targetName="pyjtt.exe",
shortcutName="pyJTT",
shortcutDir="DesktopFolder")])
setup(name="pyjtt",
version="1.2.3",
description="Jira Time Tracker",
maintainer="Nikolay Golub",
maintainer_email="[email protected]",
long_description="Allows track time in JIRA online and manage worklogs",
license="GNU GENERAL PUBLIC LICENSE Version 3",
options={"build_exe": build_exe_options,
"bdist_msi": bdist_msi_options, },
executables=[Executable(target_app,
base=base,
targetName="pyjtt.exe",
icon=icon_path,
shortcutName="pyJTT",
shortcutDir="DesktopFolder")])

0 comments on commit 466bc5a

Please sign in to comment.