From 446baa5064a19849f08231666906d7ea21f6e736 Mon Sep 17 00:00:00 2001 From: knotteye Date: Sat, 17 Apr 2021 15:31:25 -0500 Subject: [PATCH] update readme and makefile --- Makefile | 12 ++++++++++-- README.md | 9 +++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 49ffd06..ad24393 100644 --- a/Makefile +++ b/Makefile @@ -13,11 +13,16 @@ fresh: clean default pack systemlibs: systemlibtarget pack +windows: windowstarget + default: - python -m nuitka --follow-imports --include-module=win32ctypes --enable-plugin=qt-plugins --include-qt-plugins=all --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 || python -m nuitka --follow-imports --enable-plugin=qt-plugins --include-qt-plugins=all --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 + python -m nuitka --follow-imports --enable-plugin=qt-plugins --include-qt-plugins=all --python-flag=-O -o plchat plchat.py + +windowstarget: + python -m nuitka --follow-imports --include-module=win32ctypes --enable-plugin=qt-plugins --include-qt-plugins=all --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: - python -m nuitka --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 + python -m nuitka --nofollow-imports --follow-import=misc --follow-import=monkeypatch --follow-import=pleroma --follow-import=timeconvert --follow-import=videowidget --follow-import=audiowidget --python-flag=-O -o plchat plchat.py pack: mkdir dist @@ -26,6 +31,9 @@ pack: cp fedi.ico dist cp send.svg dist cp unread.svg dist + cp README.md dist + cp LICENSE dist + cp COPYING dist clean: rm -r dist || true diff --git a/README.md b/README.md index 4535f86..9db56ce 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,11 @@ Installation instructions for PlChat. If you are looking to package this program ### Windows Download and install [python 3.8.9](https://www.python.org/downloads/windows/) from the website and the [k-lite codec pack](https://www.codecguide.com/download_kl.htm). The basic version with default options should work fine. -Download the latest plchat_windows.zip from https://git.waldn.net/git/knotteye/plchat/releases extract the zip file and run plchat.exe +Download the latest plchat_windows.zip from https://git.waldn.net/git/knotteye/plchat/releases extract the zip file. Run the setup.bat file, and keep the setup-log file if something does not work. Run plchat.exe and log in! +No guarantees on Windows 7, but windows 8 and 10 should work fine. ### Linux -A prepackaged deb file is provided in https://git.waldn.net/git/knotteye/plchat/releases +A prepackaged deb file is provided in https://git.waldn.net/git/knotteye/plchat/releases as is a compiled binary for amd64 linux. If you package plchat for your distro, please let me know and I will add instructions here. ### MacOS @@ -23,13 +24,13 @@ PlChat comes with a Makefile for compiling to a binary, but it is of course poss Otherwise you can see below for instructions on building the binary. ### Runtime Depencies -You will need the following system libraries: Qt4 or 5 (maybe be optional, the pypi package includes a copy of required libraries in some cases), Secret Service (on linux or BSD), libmagic (on macos/linux/bsd), and some codecs for qtmultimedia. +You will need the following libraries: PyQt5, Secret Service (on linux or BSD), libmagic (python-magic-bin from pypi on windows), and some codecs for qtmultimedia. The windows codecs can be found above, and on linux you will need gstreamer and some plugins. On gentoo, `sudo emerge media-plugins/gst-plugins-base media-plugins/gst-plugins-good media-plugins/gst-plugins-bad media-plugins/gst-plugins-ugly media-plugins/gst-plugins-neon media-plugins/gst-plugins-soup media-plugins/gst-plugins-libav` should do. Other distributions are on your own. And, obviously, a copy of python. Python3.5+ is the only thing I will support but other versions may work. End users will need the same version of python used to compile the binary. Other versions may work but this is what nuitka officially supports. ### Building You will need the following packages from pypi: PyQt5, keyring, appdirs, python-magic(or python-magic-bin on windows), python-dateutil, requests, urllib3, and websockets. -You will also need all runtime dependencies listed above, as well as nuitka3 and a C compiler compiler. Nuitka supports the following compilers: +You will also need all runtime dependencies listed above, as well as nuitka3 and a C compiler. Nuitka supports the following compilers: * gcc 5.1+ or g++ 4.4+ * clang on macOS or BSD