Make windows happy

Switch to nuitka3 for all platforms
develop
knotteye 2021-04-17 10:40:06 -05:00
parent c26695fdf6
commit 5e9e73cd0e
5 changed files with 7 additions and 44 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
__pycache__ __pycache__
plchat.build plchat.build
dist dist
build

View File

@ -1,7 +1,7 @@
ifeq ($(PREFIX),) ifeq ($(PREFIX),)
PREFIX := /usr/local PREFIX := /usr/local
endif endif
PRODUCTVER=0001 PRODUCTVER=0100
all: default pack all: default pack
@ -11,7 +11,7 @@ fresh: clean default pack
systemlibs: systemlibtarget pack systemlibs: systemlibtarget pack
default: default:
nuitka3 --follow-imports --nofollow-import-to=PyQt5 --nofollow-import-to=PySide --nofollow-import-to=PyQt4 --nofollow-import-to=PySide2 --windows-disable-console --windows-icon-from-ico=fedi.ico --windows-company-name=plchat --windows-product-name=plchat --windows-product-version=$(PRODUCTVER) --python-flag=-O -o plchat plchat.py nuitka3 --follow-imports --windows-disable-console --windows-icon-from-ico=fedi.ico --windows-company-name=plchat --windows-product-name=plchat --windows-product-version=$(PRODUCTVER) --python-flag=-O -o plchat plchat.py
systemlibtarget: systemlibtarget:
nuitka3 --nofollow-imports --follow-import=misc --follow-import=monkeypatch --follow-import=pleroma --follow-import=timeconvert --follow-import=videowidget --follow-import=audiowidget --windows-disable-console --windows-icon-from-ico=fedi.ico --windows-company-name=plchat --windows-product-name=plchat --windows-product-version=$(PRODUCTVER) --python-flag=-O -o plchat plchat.py nuitka3 --nofollow-imports --follow-import=misc --follow-import=monkeypatch --follow-import=pleroma --follow-import=timeconvert --follow-import=videowidget --follow-import=audiowidget --windows-disable-console --windows-icon-from-ico=fedi.ico --windows-company-name=plchat --windows-product-name=plchat --windows-product-version=$(PRODUCTVER) --python-flag=-O -o plchat plchat.py

View File

@ -1,26 +0,0 @@
[Application]
name=PlChat
version=1.0
entry_point=plchat:main
icon = fedi.ico
[Python]
version=3.8.8
bitness=64
format=bundled
[Include]
pypi_wheels = python-dateutil==2.8.1
QtPy==1.9.0
keyring==22.0.1
PySide2==5.15.2
appdirs==1.4.4
python-magic==0.4.22
python-magic-bin==0.4.14
websockets==8.1
files = LICENSE
fedi.svg
send.svg
unread.svg
COPYING

View File

@ -28,16 +28,9 @@
import os, time, platform import os, time, platform
from ctypes import cdll, util from ctypes import cdll, util
#try:
# if os.name == 'posix':
# libc = cdll.LoadLibrary("libc.so.6")
# elif os.name == 'nt':
# libc = cdll.kernel32
#except:
# libc = None
try: try:
if platform.system() == "Windows": if platform.system() == "Windows":
libc_path = util.find_library("msvcrt") libc_path = "kernel32"
else: else:
libc_path = util.find_library("c") libc_path = util.find_library("c")
libc = cdll.LoadLibrary(libc_path) libc = cdll.LoadLibrary(libc_path)

View File

@ -51,7 +51,7 @@ STATIC_PREF = ''
ICON_PATH = 'fedi.svg' ICON_PATH = 'fedi.svg'
class App(QMainWindow): class App(QMainWindow):
settings = QSettings() settings = QSettings(APPDATA+"/settings.ini")
_eventloop = asyncio.new_event_loop() _eventloop = asyncio.new_event_loop()
accts = {} accts = {}
@ -1442,7 +1442,7 @@ def updateAnimationPref():
else: else:
STATIC_PREF = 'static_' STATIC_PREF = 'static_'
def main(): if __name__ == '__main__':
_mkdir(CACHE+'/img/') _mkdir(CACHE+'/img/')
_mkdir(CACHE+'/vid/') _mkdir(CACHE+'/vid/')
_mkdir(CACHE+'/audio/') _mkdir(CACHE+'/audio/')
@ -1452,6 +1452,3 @@ def main():
app.setApplicationName("plchat") app.setApplicationName("plchat")
ex = App(app.processEvents) ex = App(app.processEvents)
sys.exit(ex._eventloop.run_forever()) sys.exit(ex._eventloop.run_forever())
if __name__ == '__main__':
main()