revpi/revpicommander
1
0
Fork 0
mirror of https://github.com/naruxde/revpicommander.git synced 2025-11-08 16:43:53 +01:00
Code Issues Packages Releases Wiki Activity

Update Makefile and requirements.txt for build and clean ui files

Browse Source
This commit is contained in:
Sven Sager
2023-01-04 22:26:47 +01:00
parent 2ac1477441
commit 7f9111b5b0
5 changed files with 3450 additions and 3391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MANIFEST.in
View File

@@ -1,7 +1,12 @@
recursive-include data * recursive-include data *
recursive-include src/revpicommander *.py *.qm recursive-include src/revpicommander *.py *.qm
global-exclude *.pyc recursive-include ui_dev *
include LICENSE.txt include LICENSE.txt
include Makefile
include MANIFEST.in include MANIFEST.in
include README.md include README.md
include requirements.txt
include setup.iss
include setup.py
include stdeb.cfg include stdeb.cfg
include translate.pro

85
Makefile
View File

@@ -1,38 +1,91 @@
SHELL := bash SHELL := bash
MAKEFLAGS = --no-print-directory --no-builtin-rules
.DEFAULT_GOAL = all
# Variables
PACKAGE = revpicommander
# If virtualenv exists, use it. If not, use PATH to find
SYSTEM_PYTHON = $(or $(shell which python3), $(shell which python))
PYTHON = $(or $(wildcard venv/bin/python), $(SYSTEM_PYTHON))
SYSTEM_PYUIC5 = $(shell which pyuic5)
PYUIC5 = $(or $(wildcard venv/bin/pyuic5), $(SYSTEM_PYUIC5))
SYSTEM_PYRCC5 = $(shell which pyrcc5)
PYRCC5 = $(or $(wildcard venv/bin/pyrcc5), $(SYSTEM_PYRCC5))
SYSTEM_PYLUP5 = $(shell which pylupdate5)
PYLUP5 = $(or $(wildcard venv/bin/pylupdate5), $(SYSTEM_PYLUP5))
all: build_ui build_rc build
.PHONY: all
## Compile Qt UI files to python code
build_ui: build_ui:
cd ui_dev && for ui_file in *.ui; do \ cd ui_dev && for ui_file in *.ui; do \
file_name=$${ui_file%.ui}; \ file_name=$${ui_file%.ui}; \
pyuic5 $${ui_file} -o ../src/revpicommander/ui/$${file_name}_ui.py -x --from-imports; \ $(PYUIC5) $${ui_file} -o ../src/$(PACKAGE)/ui/$${file_name}_ui.py -x --from-imports; \
echo $${file_name}; \ echo $${file_name}; \
done done
build_rc:
cd ui_dev && for rc_file in *.qrc; do \ cd ui_dev && for rc_file in *.qrc; do \
file_name=$${rc_file%.qrc}; \ file_name=$${rc_file%.qrc}; \
pyrcc5 $${rc_file} -o ../src/revpicommander/ui/$${file_name}_rc.py; \ $(PYRCC5) $${rc_file} -o ../src/$(PACKAGE)/ui/$${file_name}_rc.py; \
echo $${file_name}; \ echo $${file_name}; \
done done
update_translation: update_translation:
pylupdate5 translate.pro $(PYLUP5) translate.pro
installer_mac: .PHONY: build_ui build_rc update_translation
pyinstaller -n "RevPi Commander" \
--add-data="src/revpicommander/locale:locale" \ ## Environment
--add-data="data/revpicommander.icns:." \ venv:
--icon=data/revpicommander.icns \ rm -rf venv
$(SYSTEM_PYTHON) -m venv venv
deps:
$(PYTHON) -m pip install --upgrade pip -r requirements.txt
.PHONY: venv deps
## Build, install
build:
$(PYTHON) -m setup sdist
$(PYTHON) -m setup bdist_wheel
install:
$(PYTHON) -m pip install dist/$(PACKAGE)-*.whl
.PHONY: build install
## PyInstaller
installer_mac: all
$(PYTHON) -m PyInstaller -n "RevPi Commander" \
--add-data="src/$(PACKAGE)/locale:locale" \
--add-data="data/$(PACKAGE).icns:." \
--icon=data/$(PACKAGE).icns \
--noconfirm \ --noconfirm \
--clean \ --clean \
--onedir \ --onedir \
--windowed \ --windowed \
src/revpicommander/__main__.py src/$(PACKAGE)/__main__.py
installer_win: installer_win: all
pyinstaller -n "RevPi Commander" \ $(PYTHON) -m PyInstaller -n "RevPi Commander" \
--add-data="src\\revpicommander\\locale;.\\locale" \ --add-data="src\\$(PACKAGE)\\locale;.\\locale" \
--add-data="data\\revpicommander.ico;." \ --add-data="data\\$(PACKAGE).ico;." \
--icon=data\\revpicommander.ico \ --icon=data\\$(PACKAGE).ico \
--noconfirm \ --noconfirm \
--clean \ --clean \
--onedir \ --onedir \
--windowed \ --windowed \
src/revpicommander\__main__.py src/$(PACKAGE)\__main__.py
.PHONY: installer_mac installer_win
## Clean
clean:
rm -rf build dist src/*.egg-info src/$(PACKAGE)/ui/[^__]*.py *.spec
.PHONY: clean

1
requirements.txt
View File

@@ -1,3 +1,4 @@
Pyinstaller
PyQt5>=5.14.1 PyQt5>=5.14.1
revpimodio2>=2.5.6 revpimodio2>=2.5.6
zeroconf>=0.24.4 zeroconf>=0.24.4

58
src/revpicommander/locale/revpicommander_de.ts
View File

@@ -1693,147 +1693,147 @@ applicable law.
<translation type="unfinished">SPS &amp;start</translation> <translation type="unfinished">SPS &amp;start</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="63"/> <location filename="../../../ui_dev/revpicommander.ui" line="67"/>
<source>PLC s&amp;top</source> <source>PLC s&amp;top</source>
<translation type="unfinished">SPS s&amp;top</translation> <translation type="unfinished">SPS s&amp;top</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="70"/> <location filename="../../../ui_dev/revpicommander.ui" line="78"/>
<source>PLC restart</source> <source>PLC restart</source>
<translation type="unfinished">SPS Neustart</translation> <translation type="unfinished">SPS Neustart</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="77"/> <location filename="../../../ui_dev/revpicommander.ui" line="89"/>
<source>PLC &amp;logs</source> <source>PLC &amp;logs</source>
<translation type="unfinished">SPS &amp;Logdateien</translation> <translation type="unfinished">SPS &amp;Logdateien</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="86"/> <location filename="../../../ui_dev/revpicommander.ui" line="102"/>
<source>Status:</source> <source>Status:</source>
<translation type="unfinished">Status:</translation> <translation type="unfinished">Status:</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="117"/> <location filename="../../../ui_dev/revpicommander.ui" line="133"/>
<source>PLC watch &amp;mode</source> <source>PLC watch &amp;mode</source>
<translation type="unfinished">SPS &amp;Monitor</translation> <translation type="unfinished">SPS &amp;Monitor</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="137"/> <location filename="../../../ui_dev/revpicommander.ui" line="157"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation type="unfinished">&amp;Datei</translation> <translation type="unfinished">&amp;Datei</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="148"/> <location filename="../../../ui_dev/revpicommander.ui" line="168"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation type="unfinished">&amp;Hilfe</translation> <translation type="unfinished">&amp;Hilfe</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="156"/> <location filename="../../../ui_dev/revpicommander.ui" line="176"/>
<source>&amp;PLC</source> <source>&amp;PLC</source>
<translation type="unfinished">S&amp;PS</translation> <translation type="unfinished">S&amp;PS</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="170"/> <location filename="../../../ui_dev/revpicommander.ui" line="190"/>
<source>&amp;Connections</source> <source>&amp;Connections</source>
<translation type="unfinished">&amp;Verbindungen</translation> <translation type="unfinished">&amp;Verbindungen</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="185"/> <location filename="../../../ui_dev/revpicommander.ui" line="205"/>
<source>&amp;Connections...</source> <source>&amp;Connections...</source>
<translation type="unfinished">&amp;Verbindungen...</translation> <translation type="unfinished">&amp;Verbindungen...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="193"/> <location filename="../../../ui_dev/revpicommander.ui" line="213"/>
<source>&amp;Search Revolution Pi...</source> <source>&amp;Search Revolution Pi...</source>
<translation type="unfinished">&amp;Suche Revolution Pi...</translation> <translation type="unfinished">&amp;Suche Revolution Pi...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="201"/> <location filename="../../../ui_dev/revpicommander.ui" line="221"/>
<source>&amp;Quit</source> <source>&amp;Quit</source>
<translation type="unfinished">&amp;Beenden</translation> <translation type="unfinished">&amp;Beenden</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="206"/> <location filename="../../../ui_dev/revpicommander.ui" line="226"/>
<source>Visit &amp;webpage...</source> <source>Visit &amp;webpage...</source>
<translation type="unfinished">&amp;Webseite besuchen...</translation> <translation type="unfinished">&amp;Webseite besuchen...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="216"/> <location filename="../../../ui_dev/revpicommander.ui" line="236"/>
<source>PLC &amp;logs...</source> <source>PLC &amp;logs...</source>
<translation type="unfinished">SPS &amp;Logdateien...</translation> <translation type="unfinished">SPS &amp;Logdateien...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="224"/> <location filename="../../../ui_dev/revpicommander.ui" line="244"/>
<source>PLC &amp;options...</source> <source>PLC &amp;options...</source>
<translation type="unfinished">SPS &amp;Optionen...</translation> <translation type="unfinished">SPS &amp;Optionen...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="232"/> <location filename="../../../ui_dev/revpicommander.ui" line="252"/>
<source>PLC progra&amp;m...</source> <source>PLC progra&amp;m...</source>
<translation type="unfinished">SPS Progra&amp;mm...</translation> <translation type="unfinished">SPS Progra&amp;mm...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="240"/> <location filename="../../../ui_dev/revpicommander.ui" line="260"/>
<source>PLC de&amp;veloper...</source> <source>PLC de&amp;veloper...</source>
<translation type="unfinished">SPS Ent&amp;wickler...</translation> <translation type="unfinished">SPS Ent&amp;wickler...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="248"/> <location filename="../../../ui_dev/revpicommander.ui" line="268"/>
<source>piCtory configuraiton...</source> <source>piCtory configuraiton...</source>
<translation type="unfinished">piCtory Konfiguration...</translation> <translation type="unfinished">piCtory Konfiguration...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="253"/> <location filename="../../../ui_dev/revpicommander.ui" line="273"/>
<source>&amp;Disconnect</source> <source>&amp;Disconnect</source>
<translation type="unfinished">&amp;Trennen</translation> <translation type="unfinished">&amp;Trennen</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="261"/> <location filename="../../../ui_dev/revpicommander.ui" line="281"/>
<source>Reset driver...</source> <source>Reset driver...</source>
<translation type="unfinished">Treiber zurücksetzen...</translation> <translation type="unfinished">Treiber zurücksetzen...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="266"/> <location filename="../../../ui_dev/revpicommander.ui" line="286"/>
<source>RevPi si&amp;mulator...</source> <source>RevPi si&amp;mulator...</source>
<translation type="unfinished">RevPi Si&amp;mulator...</translation> <translation type="unfinished">RevPi Si&amp;mulator...</translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="188"/> <location filename="../../../ui_dev/revpicommander.ui" line="208"/>
<source>Ctrl+N</source> <source>Ctrl+N</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="196"/> <location filename="../../../ui_dev/revpicommander.ui" line="216"/>
<source>Ctrl+F</source> <source>Ctrl+F</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="211"/> <location filename="../../../ui_dev/revpicommander.ui" line="231"/>
<source>&amp;Info...</source> <source>&amp;Info...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="219"/> <location filename="../../../ui_dev/revpicommander.ui" line="239"/>
<source>Ctrl+L</source> <source>Ctrl+L</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="227"/> <location filename="../../../ui_dev/revpicommander.ui" line="247"/>
<source>Ctrl+O</source> <source>Ctrl+O</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="235"/> <location filename="../../../ui_dev/revpicommander.ui" line="255"/>
<source>Ctrl+P</source> <source>Ctrl+P</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="243"/> <location filename="../../../ui_dev/revpicommander.ui" line="263"/>
<source>Ctrl+D</source> <source>Ctrl+D</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../ui_dev/revpicommander.ui" line="256"/> <location filename="../../../ui_dev/revpicommander.ui" line="276"/>
<source>Ctrl+X</source> <source>Ctrl+X</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

6688
src/revpicommander/ui/ressources_rc.py
View File

File diff suppressed because it is too large Load Diff