diff --git a/build_command_line_linux.bash b/build_command_line_linux.bash index 96fa1a5..33aba6b 100755 --- a/build_command_line_linux.bash +++ b/build_command_line_linux.bash @@ -2,13 +2,13 @@ rm -rf Web2ExeLinux*.zip rm -rf Web2ExeLinux-CMD -pyinstaller --onefile --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj --distpath Web2ExeLinux-CMD -n web2exe-linux command_line.py +pyinstaller --onefile --hidden-import PIL.Jpeg2KImagePlugin --hidden-import pkg_resources --hidden-import PIL._imaging --hidden-import configobj --distpath Web2ExeLinux-CMD -n web2exe-linux command_line.py cp -rf files Web2ExeLinux-CMD/files rm -rf Web2ExeLinux-CMD/files/downloads/* rm Web2ExeLinux-CMD/files/error.log Web2ExeLinux-CMD/files/last_project_path.txt Web2ExeLinux-CMD/files/recent_files.txt Web2ExeLinux-CMD/files/compressors/upx-mac Web2ExeLinux-CMD/files/compressors/upx-win.exe rm -rf Web2ExeLinux -pyinstaller -F --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj -n web2exe --distpath Web2ExeLinux main.py +pyinstaller -F --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj --hidden-import PIL._imaging --hidden-import pkg_resources -n web2exe --distpath Web2ExeLinux main.py cp -rf files Web2ExeLinux/files rm -rf Web2ExeLinux/files/downloads/* rm Web2ExeLinux/files/error.log Web2ExeLinux/files/last_project_path.txt Web2ExeLinux/files/recent_files.txt Web2ExeLinux/files/compressors/upx-mac Web2ExeLinux/files/compressors/upx-win.exe diff --git a/build_mac.bash b/build_mac.bash index d1b8f18..e8c3729 100755 --- a/build_mac.bash +++ b/build_mac.bash @@ -2,7 +2,7 @@ rm -rf Web2ExeMac* rm files/error.log files/last_project_path.txt files/recent_files.txt rm -rf files/downloads/* rm -rf Web2ExeMac-CMD/files -pyinstaller --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj --distpath Web2ExeMac-CMD --onefile -n web2exe-mac command_line.py +pyinstaller --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj --hidden-import pkg_resources --distpath Web2ExeMac-CMD --onefile -n web2exe-mac command_line.py cp -rf files Web2ExeMac-CMD/files/ rm -rf build dist Web2Executable.app diff --git a/build_mac_setup.py b/build_mac_setup.py index 0f9d01e..c14ff36 100644 --- a/build_mac_setup.py +++ b/build_mac_setup.py @@ -11,7 +11,7 @@ APP = ['main.py'] DATA_FILES = ['files'] OPTIONS = { 'iconfile': 'icon.icns', - 'includes': ['PySide.QtCore', 'PySide.QtGui', 'PySide.QtNetwork', 'configobj', 'PIL.Jpeg2KImagePlugin'], + 'includes': ['PySide.QtCore', 'PySide.QtGui', 'PySide.QtNetwork', 'configobj', 'PIL.Jpeg2KImagePlugin', 'pkg_resources'], 'packages': ['PIL'], 'excludes': ['numpy', 'matplotlib', 'PyQt5', 'PySide.QtXmlPatterns', 'PySide.QtWebEngineCore', 'PySide.QtDesigner', 'PySide.QtScript', 'PySide.QtWebkit', 'Cython', 'selenium', 'scapy', 'pytz', 'pygments', 'pip', 'netaddr', 'mercurial', 'cx_Freeze', 'bpython', 'astroid', 'Shiboken', 'PyInstaller', 'sip', 'llvmpy', 'llvm', 'pylint', 'unittest', 'pysideuic', 'email', 'Tkinter', 'multiprocessing', 'yaml', 'logilab', 'urwid', 'test', 'networkx' ], 'dylib_excludes':['QtXml.framework', 'QtWebkit.framework', 'QtScript.framework', 'QtDesigner.framework', 'QtWebEngineCore.framework', 'QtXmlPatterns.framework', 'QtNetwork.framework', 'QtGui.framework', 'QtCore.framework'] diff --git a/build_windows.bat b/build_windows.bat index f65fc81..50d9324 100755 --- a/build_windows.bat +++ b/build_windows.bat @@ -1,10 +1,10 @@ rd /S /Q Web2ExeWin -call pyinstaller --onefile --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj -i icon.ico --distpath command_line_builds -n web2exe-win command_line.py +call pyinstaller --onefile --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj --hidden-import pkg_resources -i icon.ico --distpath command_line_builds -n web2exe-win command_line.py rd /S /Q command_line_builds\files echo D | xcopy /s files command_line_builds\files -call pyinstaller -w --onefile --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj -i icon.ico --distpath Web2ExeWin -n Web2Exe main.py +call pyinstaller -w --onefile --hidden-import PIL.Jpeg2KImagePlugin --hidden-import pkg_resources --hidden-import configobj -i icon.ico --distpath Web2ExeWin -n Web2Exe main.py echo D | xcopy /s files Web2ExeWin\files del Web2ExeWin\files\compressors\upx-mac @@ -20,4 +20,4 @@ makensis /V4 Web2Exe.nsi 7z a Web2ExeWin-v0.2.4b.zip -r Web2ExeWin cd command_line_builds 7z a ..\Web2ExeWin-CMD.zip -tzip -r * -cd .. \ No newline at end of file +cd .. diff --git a/files/nw-versions.txt b/files/nw-versions.txt index a96ff0d..489f0bc 100644 --- a/files/nw-versions.txt +++ b/files/nw-versions.txt @@ -1,3 +1,4 @@ +0.12.2 0.12.1 0.12.0 0.12.0-rc1