Skip to content

Commit

Permalink
debian build: make pmview+*vis bits conditional
Browse files Browse the repository at this point in the history
Make packaging follow build conditional, so that we only include the
installed bits in the pcp-gui.install file if we actually build 'em.
  • Loading branch information
kmcdonell committed Jul 2, 2024
1 parent 65ec767 commit 3d2d7e0
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 36 deletions.
5 changes: 4 additions & 1 deletion debian/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,15 @@ pcp.postrm: pcp.postrm.head configversions pcp.postrm.tail cull_old_conffiles
rm -f $@
cat pcp.postrm.head configversions cull_old_conffiles pcp.postrm.tail > $@

pcp-gui.install: pcp-gui.install.base pcp-gui.install.hicolor
pcp-gui.install: pcp-gui.install.base pcp-gui.install.hicolor pcp-gui.install.pmview
rm -f pcp-gui.install
cat pcp-gui.install.base >pcp-gui.install
ifeq ($(HAVE_HICOLOR_ICONS), true)
cat pcp-gui.install.hicolor >>pcp-gui.install
endif
ifeq "$(ENABLE_QT3D)" "true"
cat pcp-gui.install.pmview >>pcp-gui.pmview
endif

control: fixcontrol control.pcp control.python2 control.python3 \
control.pcpgui control.pcp2xlsx control.pcp2arrow \
Expand Down
35 changes: 0 additions & 35 deletions debian/pcp-gui.install.base
Original file line number Diff line number Diff line change
Expand Up @@ -24,53 +24,25 @@ etc/pcp/pmchart/Sockets
etc/pcp/pmchart/Swap
etc/pcp/pmchart/Syscalls
etc/pcp/pmchart/vCPU
etc/pcp/pmlogger/config.dkvis
etc/pcp/pmlogger/config.mpvis
etc/pcp/pmlogger/config.nfsvis
etc/pcp/pmlogger/config.osvis
etc/pcp/pmlogger/config.weblogvis
etc/pcp/pmlogger/config.webpingvis
etc/pcp/pmlogger/config.webvis
etc/pcp/pmsnap/control
etc/pcp/pmsnap/crontab
etc/pcp/pmsnap/Snap
etc/pcp/pmsnap/summary.html
usr/bin/clustervis
usr/bin/dkvis
usr/bin/mpvis
usr/bin/nfsvis
usr/bin/osvis
usr/bin/pmchart
usr/bin/pmconfirm
usr/bin/pmdumptext
usr/bin/pmmessage
usr/bin/pmquery
usr/bin/pmtime
usr/bin/pmview
usr/bin/weblogvis
usr/bin/webpingvis
usr/bin/webvis
usr/lib/pcp/bin/pmsnap
usr/lib/pcp/lib/pmview-args
usr/share/applications/pmchart.desktop
usr/share/man/man1/clustervis.1.gz
usr/share/man/man1/dkvis.1.gz
usr/share/man/man1/mpvis.1.gz
usr/share/man/man1/nfsvis.1.gz
usr/share/man/man1/osvis.1.gz
usr/share/man/man1/pmchart.1.gz
usr/share/man/man1/pmconfirm.1.gz
usr/share/man/man1/pmdumptext.1.gz
usr/share/man/man1/pmmessage.1.gz
usr/share/man/man1/pmquery.1.gz
usr/share/man/man1/pmsnap.1.gz
usr/share/man/man1/pmtime.1.gz
usr/share/man/man1/pmview.1.gz
usr/share/man/man1/weblogvis.1.gz
usr/share/man/man1/webpingvis.1.gz
usr/share/man/man1/webvis.1.gz
usr/share/man/man5/pmview.5.gz
usr/share/pcp/lib/pmview-args
var/lib/pcp/config/pmafm/pcp-gui
var/lib/pcp/config/pmchart/ApacheServer
var/lib/pcp/config/pmchart/BusyCPU
Expand All @@ -97,13 +69,6 @@ var/lib/pcp/config/pmchart/Sockets
var/lib/pcp/config/pmchart/Swap
var/lib/pcp/config/pmchart/Syscalls
var/lib/pcp/config/pmchart/vCPU
var/lib/pcp/config/pmlogger/config.dkvis
var/lib/pcp/config/pmlogger/config.mpvis
var/lib/pcp/config/pmlogger/config.nfsvis
var/lib/pcp/config/pmlogger/config.osvis
var/lib/pcp/config/pmlogger/config.weblogvis
var/lib/pcp/config/pmlogger/config.webpingvis
var/lib/pcp/config/pmlogger/config.webvis
var/lib/pcp/config/pmsnap/crontab
var/lib/pcp/config/pmsnap/Snap
var/lib/pcp/config/pmsnap/summary.html
35 changes: 35 additions & 0 deletions debian/pcp-gui.install.pmview
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
etc/pcp/pmlogger/config.dkvis
etc/pcp/pmlogger/config.mpvis
etc/pcp/pmlogger/config.nfsvis
etc/pcp/pmlogger/config.osvis
etc/pcp/pmlogger/config.weblogvis
etc/pcp/pmlogger/config.webpingvis
etc/pcp/pmlogger/config.webvis
usr/bin/clustervis
usr/bin/dkvis
usr/bin/mpvis
usr/bin/nfsvis
usr/bin/osvis
usr/bin/pmview
usr/bin/weblogvis
usr/bin/webpingvis
usr/bin/webvis
usr/lib/pcp/lib/pmview-args
usr/share/man/man1/clustervis.1.gz
usr/share/man/man1/dkvis.1.gz
usr/share/man/man1/mpvis.1.gz
usr/share/man/man1/nfsvis.1.gz
usr/share/man/man1/osvis.1.gz
usr/share/man/man1/pmview.1.gz
usr/share/man/man1/weblogvis.1.gz
usr/share/man/man1/webpingvis.1.gz
usr/share/man/man1/webvis.1.gz
usr/share/man/man5/pmview.5.gz
usr/share/pcp/lib/pmview-args
var/lib/pcp/config/pmlogger/config.dkvis
var/lib/pcp/config/pmlogger/config.mpvis
var/lib/pcp/config/pmlogger/config.nfsvis
var/lib/pcp/config/pmlogger/config.osvis
var/lib/pcp/config/pmlogger/config.weblogvis
var/lib/pcp/config/pmlogger/config.webpingvis
var/lib/pcp/config/pmlogger/config.webvis

0 comments on commit 3d2d7e0

Please sign in to comment.