--- a/PluginPyInstaller.py Wed Jan 17 16:25:59 2018 +0100 +++ b/PluginPyInstaller.py Thu Jan 18 14:30:06 2018 +0100 @@ -130,7 +130,7 @@ for minorVersion in minorVersions: for versionSuffix in versionSuffixes: versionStr = '{0}.{1}{2}'.format(majorVersion, minorVersion, - versionSuffix) + versionSuffix) exePaths = getExePath( winreg.HKEY_CURRENT_USER, winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr) @@ -399,10 +399,10 @@ project = e5App().getObject("Project") majorVersionStr = project.getProjectLanguage() if majorVersionStr == "Python3": - executables = [f for f in exePy3 if + executables = [f for f in exePy3 if f.endswith(("pyinstaller", "pyinstaller.exe"))] else: - executables = [f for f in exePy2 if + executables = [f for f in exePy2 if f.endswith(("pyinstaller", "pyinstaller.exe"))] if not executables: E5MessageBox.critical( @@ -423,6 +423,9 @@ args, params = dlg.generateParameters() project.setData('PACKAGERSPARMS', "PYINSTALLER", params) + # TODO: implement pyinstaller + return + # now do the call from PyInstaller.PyInstallerExecDialog import PyInstallerExecDialog dia = PyInstallerExecDialog("pyinstaller") @@ -431,7 +434,6 @@ project.getMainScript()) if res: dia.exec_() - # TODO: implement pyinstaller @pyqtSlot() def __pyiMakeSpec(self): @@ -442,10 +444,10 @@ project = e5App().getObject("Project") majorVersionStr = project.getProjectLanguage() if majorVersionStr == "Python3": - executables = [f for f in exePy3 if + executables = [f for f in exePy3 if f.endswith(("pyi-makespec", "pyi-makespec.exe"))] else: - executables = [f for f in exePy2 if + executables = [f for f in exePy2 if f.endswith(("pyi-makespec", "pyi-makespec.exe"))] if not executables: E5MessageBox.critical(