Skip to content

Support make install for PyNUT and NUT-Monitor#1504

Merged
jimklimov merged 22 commits intonetworkupstools:masterfrom
jimklimov:py3qt5-dual-install
Jul 20, 2022
Merged

Support make install for PyNUT and NUT-Monitor#1504
jimklimov merged 22 commits intonetworkupstools:masterfrom
jimklimov:py3qt5-dual-install

Conversation

@jimklimov
Copy link
Copy Markdown
Member

@jimklimov jimklimov commented Jul 17, 2022

As found in #1462 investigation, NUT never provided a way to make install its Python bindings module and the NUT-Monitor client. Packages did the equivalent activities until now, but people building their local NUT missed out on recent updates in this part of the codebase.

This PR also updates the contents of make dist tarball and documentation, appropriating some from the site of original author of PyNUT and NUT-Monitor.

CC @biergaizi as the original issue raiser :)

@jimklimov jimklimov added this to the 2.8.1 milestone Jul 17, 2022
@jimklimov jimklimov force-pushed the py3qt5-dual-install branch from 542ca17 to 5603030 Compare July 17, 2022 23:04
@jimklimov jimklimov requested review from aquette and clepple July 17, 2022 23:10
@jimklimov
Copy link
Copy Markdown
Member Author

jimklimov commented Jul 17, 2022

Example file listing in proto area after a build and install (forced because that system lacks dependencies for the app):

$ ./autogen.sh  && ./configure --with-nut_monitor=force --with-pynut=app && make -j8

$ rm -rf /dev/shm/nut-inst && make DESTDIR=/dev/shm/nut-inst install

$ find /dev/shm/nut-inst/ | grep -i monitor
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/module
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/module/test_nutclient.py
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/module/PyNUT.py
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/module/README
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/README
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/NUT-Monitor-py3qt5
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/NUT-Monitor-py2gtk2
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/NUT-Monitor
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/screenshots
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/screenshots/nut-monitor-3.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/screenshots/nut-monitor-2.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/screenshots/nut-monitor-1.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/pixmaps
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/pixmaps/warning.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/pixmaps/var-rw.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/pixmaps/var-ro.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/pixmaps/on_line.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/pixmaps/on_battery.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/nut-monitor-py3qt5.desktop
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/nut-monitor-py2gtk2.desktop
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/README
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/nut-monitor.appdata.xml
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/nut-monitor.desktop
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/ui
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/ui/window1.ui
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/ui/dialog2.ui
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/ui/dialog1.ui
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/ui/aboutdialog1.ui
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/ui/gui-1.3.glade
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/fr
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/fr/LC_MESSAGES
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/fr/LC_MESSAGES/NUT-Monitor.mo
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/it
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/it/LC_MESSAGES
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/it/LC_MESSAGES/NUT-Monitor.mo
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/ru
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/ru/LC_MESSAGES
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/locale/ru/LC_MESSAGES/NUT-Monitor.mo
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons/64x64
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons/64x64/nut-monitor.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons/256x256
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons/256x256/nut-monitor.png
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons/scalable
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons/scalable/nut-monitor.svg
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons/48x48
/dev/shm/nut-inst/usr/local/ups/share/nut-monitor/app/icons/48x48/nut-monitor.png
/dev/shm/nut-inst/usr/local/ups/bin/NUT-Monitor

Similar setup without a --with-pynut=app (left to auto-detection) installs the module into site-packages for both of the found Python 2/3 installations:

$ find /dev/shm/nut-inst/ | grep -i py
/dev/shm/nut-inst/usr/local/lib/python3.4
/dev/shm/nut-inst/usr/local/lib/python3.4/dist-packages
/dev/shm/nut-inst/usr/local/lib/python3.4/dist-packages/test_nutclient.py
/dev/shm/nut-inst/usr/local/lib/python3.4/dist-packages/PyNUT.py
/dev/shm/nut-inst/usr/local/lib/python2.7
/dev/shm/nut-inst/usr/local/lib/python2.7/dist-packages
/dev/shm/nut-inst/usr/local/lib/python2.7/dist-packages/test_nutclient.py
/dev/shm/nut-inst/usr/local/lib/python2.7/dist-packages/PyNUT.py

jimklimov and others added 22 commits July 19, 2022 19:52
…de.h sources"

This reverts commit d2ede1a.
Not sure ATM what the file is actually for, who uses or generates it.
… detected); do not require --with-nut_monitor (GUI) here
@jimklimov jimklimov force-pushed the py3qt5-dual-install branch from 52926d7 to e19fa23 Compare July 19, 2022 19:52
@jimklimov jimklimov merged commit 67c11d6 into networkupstools:master Jul 20, 2022
@jimklimov jimklimov deleted the py3qt5-dual-install branch July 20, 2022 07:45
jimklimov added a commit to jimklimov/nut that referenced this pull request Jun 15, 2024
… NUT-Monitor and PyNUT (even if as a co-bundle)

Modernize `DISTCHECK_LIGHT_MAN_FLAGS` for 2022+

Replicate commit e19fa23
from PR networkupstools#1504

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant