changeset 38:3466e0d1393c

Generate the qrc file
author Chris Cannam
date Tue, 17 Dec 2019 09:51:32 +0000
parents 28b1dd4ee370
children f24d8a6f1e49
files deploy/linux/generate-qrc deploy/osx/generate-qrc installer.pro installer.qrc installer.qrc.in
diffstat 5 files changed, 192 insertions(+), 158 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/generate-qrc	Tue Dec 17 09:51:32 2019 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+qrc="$1"
+if [ ! -f "$qrc".in ]; then
+    echo "Input file $qrc.in not found"
+    exit 2
+fi
+set -eu
+cat "$qrc".in | sed 's/@SUFFIX@/so/g' > "$qrc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/osx/generate-qrc	Tue Dec 17 09:51:32 2019 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+qrc="$1"
+if [ ! -f "$qrc".in ]; then
+    echo "Input file $qrc.in not found"
+    exit 2
+fi
+set -eu
+cat "$qrc".in | sed 's/@SUFFIX@/dylib/g' > "$qrc"
--- a/installer.pro	Mon Dec 16 14:37:00 2019 +0000
+++ b/installer.pro	Tue Dec 17 09:51:32 2019 +0000
@@ -23,8 +23,6 @@
 MOC_DIR = o
 RCC_DIR = o
 
-RESOURCES += installer.qrc
-
 sign.target = $$PWD/out/.signed
 sign.depends = $$PWD/out/.something-to-sign
 sign.commands = $$DEPLOYDIR/sign-plugins $$PWD/out
@@ -32,5 +30,25 @@
 QMAKE_EXTRA_TARGETS += sign
 PRE_TARGETDEPS += $$sign.target
 
-SOURCES += installer.cpp
+qrc.target = $$PWD/installer.qrc
+qrc.depends = $$PWD/installer.qrc.in
+qrc.commands = $$DEPLOYDIR/generate-qrc $$PWD/installer.qrc
 
+QMAKE_EXTRA_TARGETS += qrc
+PRE_TARGETDEPS += $$qrc.target
+
+# We can't use use RESOURCES += installer.qrc here, as qmake will
+# reject a resource file that hasn't been generated yet
+
+qrc_cpp.target = $${RCC_DIR}/qrc_installer.cpp
+qrc_cpp.depends = $$qrc.target
+qrc_cpp.commands = rcc $$qrc.target -o $$qrc_cpp.target
+
+QMAKE_EXTRA_TARGETS += qrc_cpp
+PRE_TARGETDEPS += $$qrc_cpp.target
+
+SOURCES += installer.cpp $$qrc_cpp.target
+
+macx* {
+    QMAKE_POST_LINK += deploy/osx/deploy.sh $$shell_quote($$TARGET)
+}
--- a/installer.qrc	Mon Dec 16 14:37:00 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-  <file>out/azi.cat</file>
-  <file>out/azi_COPYING.txt</file>
-  <file>out/azi.so</file>
-  <file>out/bbc-vamp-plugins.cat</file>
-  <file>out/bbc-vamp-plugins_COPYING.txt</file>
-  <file>out/bbc-vamp-plugins.n3</file>
-  <file>out/bbc-vamp-plugins_README.md</file>
-  <file>out/bbc-vamp-plugins.so</file>
-  <file>out/beatroot-vamp.cat</file>
-  <file>out/beatroot-vamp_CITATION.txt</file>
-  <file>out/beatroot-vamp_COPYING.txt</file>
-  <file>out/beatroot-vamp.n3</file>
-  <file>out/beatroot-vamp_README.txt</file>
-  <file>out/beatroot-vamp.so</file>
-  <file>out/cepstral-pitchtracker.cat</file>
-  <file>out/cepstral-pitchtracker.n3</file>
-  <file>out/cepstral-pitchtracker_README.txt</file>
-  <file>out/cepstral-pitchtracker.so</file>
-  <file>out/cqvamp.cat</file>
-  <file>out/cqvamp_CITATION.txt</file>
-  <file>out/cqvamp_COPYING.txt</file>
-  <file>out/cqvamp.n3</file>
-  <file>out/cqvamp_README.txt</file>
-  <file>out/cqvamp.so</file>
-  <file>out/fanchirp.cat</file>
-  <file>out/fanchirp_CITATION.txt</file>
-  <file>out/fanchirp_COPYING.txt</file>
-  <file>out/fanchirp_README.md</file>
-  <file>out/fanchirp.so</file>
-  <file>out/match-vamp-plugin.cat</file>
-  <file>out/match-vamp-plugin_CITATION.txt</file>
-  <file>out/match-vamp-plugin_COPYING.txt</file>
-  <file>out/match-vamp-plugin.n3</file>
-  <file>out/match-vamp-plugin_README.txt</file>
-  <file>out/match-vamp-plugin.so</file>
-  <file>out/mvamp.cat</file>
-  <file>out/mvamp_COPYING.txt</file>
-  <file>out/mvamp.n3</file>
-  <file>out/mvamp_README.txt</file>
-  <file>out/mvamp.so</file>
-  <file>out/nnls-chroma.cat</file>
-  <file>out/nnls-chroma_CITATION.txt</file>
-  <file>out/nnls-chroma_COPYING.txt</file>
-  <file>out/nnls-chroma.n3</file>
-  <file>out/nnls-chroma_README.txt</file>
-  <file>out/nnls-chroma.so</file>
-  <file>out/pyin.cat</file>
-  <file>out/pyin_COPYING.txt</file>
-  <file>out/pyin.n3</file>
-  <file>out/pyin_README.txt</file>
-  <file>out/pyin.so</file>
-  <file>out/qm-vamp-plugins.cat</file>
-  <file>out/qm-vamp-plugins_COPYING.txt</file>
-  <file>out/qm-vamp-plugins.n3</file>
-  <file>out/qm-vamp-plugins_README.md</file>
-  <file>out/qm-vamp-plugins.so</file>
-  <file>out/segmentino.cat</file>
-  <file>out/segmentino_CITATION.txt</file>
-  <file>out/segmentino_COPYING.txt</file>
-  <file>out/segmentino.n3</file>
-  <file>out/segmentino_README.txt</file>
-  <file>out/segmentino.so</file>
-  <file>out/silvet.cat</file>
-  <file>out/silvet_CITATION.txt</file>
-  <file>out/silvet_COPYING.txt</file>
-  <file>out/silvet.n3</file>
-  <file>out/silvet_README.txt</file>
-  <file>out/silvet.so</file>
-  <file>out/simple-cepstrum.cat</file>
-  <file>out/simple-cepstrum.n3</file>
-  <file>out/simple-cepstrum.so</file>
-  <file>out/tempogram.cat</file>
-  <file>out/tempogram_CITATION.txt</file>
-  <file>out/tempogram_COPYING.txt</file>
-  <file>out/tempogram.n3</file>
-  <file>out/tempogram_README.txt</file>
-  <file>out/tempogram.so</file>
-  <file>out/tipic.cat</file>
-  <file>out/tipic_CITATION.txt</file>
-  <file>out/tipic_COPYING.txt</file>
-  <file>out/tipic.n3</file>
-  <file>out/tipic_README.txt</file>
-  <file>out/tipic.so</file>
-  <file>out/tuning-difference.cat</file>
-  <file>out/tuning-difference_COPYING.txt</file>
-  <file>out/tuning-difference.n3</file>
-  <file>out/tuning-difference_README.md</file>
-  <file>out/tuning-difference.so</file>
-  <file>out/ua-vamp-plugins.cat</file>
-  <file>out/ua-vamp-plugins_COPYING.txt</file>
-  <file>out/ua-vamp-plugins_README.md</file>
-  <file>out/ua-vamp-plugins.so</file>
-  <file>out/vamp-aubio.cat</file>
-  <file>out/vamp-aubio.n3</file>
-  <file>out/vamp-aubio-plugins_COPYING.txt</file>
-  <file>out/vamp-aubio-plugins_README.md</file>
-  <file>out/vamp-aubio.so</file>
-  <file>out/vamp-example-plugins.cat</file>
-  <file>out/vamp-example-plugins_COPYING.txt</file>
-  <file>out/vamp-example-plugins.n3</file>
-  <file>out/vamp-example-plugins.so</file>
-  <file>out/vamp-libxtract.cat</file>
-  <file>out/vamp-libxtract_COPYING.txt</file>
-  <file>out/vamp-libxtract.n3</file>
-  <file>out/vamp-libxtract_README.txt</file>
-  <file>out/vamp-libxtract.so</file>
-  <file>out/vampy_COPYING.txt</file>
-  <file>out/vampy_README.txt</file>
-  <file>out/vampy.so</file>
-  <file>rdf/vamp.n3</file>
-  <file>rdf/vamp.rdf</file>
-  <file>rdf/plugins/availability.n3</file>
-  <file>rdf/plugins/bbc-vamp-plugins.n3</file>
-  <file>rdf/plugins/beatroot-vamp.n3</file>
-  <file>rdf/plugins/cepstral-pitchtracker.n3</file>
-  <file>rdf/plugins/cqvamp.n3</file>
-  <file>rdf/plugins/extra-categories.n3</file>
-  <file>rdf/plugins/FChT_f0gram.n3</file>
-  <file>rdf/plugins/featured.n3</file>
-  <file>rdf/plugins/index.txt</file>
-  <file>rdf/plugins/match-vamp-plugin.n3</file>
-  <file>rdf/plugins/mazurka-plugins.n3</file>
-  <file>rdf/plugins/mfs.n3</file>
-  <file>rdf/plugins/mir-edu.n3</file>
-  <file>rdf/plugins/mtg-melodia.n3</file>
-  <file>rdf/plugins/mvamp-ibt.n3</file>
-  <file>rdf/plugins/mvamp.n3</file>
-  <file>rdf/plugins/nnls-chroma.n3</file>
-  <file>rdf/plugins/ofa-vamp-plugin.n3</file>
-  <file>rdf/plugins/pyin.n3</file>
-  <file>rdf/plugins/qm-vamp-plugins.n3</file>
-  <file>rdf/plugins/segmentino.n3</file>
-  <file>rdf/plugins/silvet.n3</file>
-  <file>rdf/plugins/simple-cepstrum.n3</file>
-  <file>rdf/plugins/tempogram.n3</file>
-  <file>rdf/plugins/tipic.n3</file>
-  <file>rdf/plugins/ua-vamp-plugins.n3</file>
-  <file>rdf/plugins/vamp-aubio.n3</file>
-  <file>rdf/plugins/vamp-example-plugins.n3</file>
-  <file>rdf/plugins/vamp-hpcp-mtg.n3</file>
-  <file>rdf/plugins/vamp-libxtract.n3</file>
-  <file>rdf/plugins/vamp-onsetsds.n3</file>
-  <file>rdf/plugins/makers/bbc.png</file>
-  <file>rdf/plugins/makers/bbc-rd.png</file>
-  <file>rdf/plugins/makers/qm-logo.png</file>
-  <file>rdf/plugins/makers/qm.png</file>
-  <file>rdf/plugins/makers/rgu.png</file>
-  <file>rdf/plugins/makers/smc.png</file>
-  <file>rdf/plugins/makers/ua.png</file>
-  <file>rdf/plugins/makers/udelar.png</file>
-  <file>rdf/plugins/makers/upf.png</file>
-</qresource>
-</RCC>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/installer.qrc.in	Tue Dec 17 09:51:32 2019 +0000
@@ -0,0 +1,155 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+  <file>out/azi.cat</file>
+  <file>out/azi_COPYING.txt</file>
+  <file>out/azi.@SUFFIX@</file>
+  <file>out/bbc-vamp-plugins.cat</file>
+  <file>out/bbc-vamp-plugins_COPYING.txt</file>
+  <file>out/bbc-vamp-plugins.n3</file>
+  <file>out/bbc-vamp-plugins_README.md</file>
+  <file>out/bbc-vamp-plugins.@SUFFIX@</file>
+  <file>out/beatroot-vamp.cat</file>
+  <file>out/beatroot-vamp_CITATION.txt</file>
+  <file>out/beatroot-vamp_COPYING.txt</file>
+  <file>out/beatroot-vamp.n3</file>
+  <file>out/beatroot-vamp_README.txt</file>
+  <file>out/beatroot-vamp.@SUFFIX@</file>
+  <file>out/cepstral-pitchtracker.cat</file>
+  <file>out/cepstral-pitchtracker.n3</file>
+  <file>out/cepstral-pitchtracker_README.txt</file>
+  <file>out/cepstral-pitchtracker.@SUFFIX@</file>
+  <file>out/cqvamp.cat</file>
+  <file>out/cqvamp_CITATION.txt</file>
+  <file>out/cqvamp_COPYING.txt</file>
+  <file>out/cqvamp.n3</file>
+  <file>out/cqvamp_README.txt</file>
+  <file>out/cqvamp.@SUFFIX@</file>
+  <file>out/fanchirp.cat</file>
+  <file>out/fanchirp_CITATION.txt</file>
+  <file>out/fanchirp_COPYING.txt</file>
+  <file>out/fanchirp_README.md</file>
+  <file>out/fanchirp.@SUFFIX@</file>
+  <file>out/match-vamp-plugin.cat</file>
+  <file>out/match-vamp-plugin_CITATION.txt</file>
+  <file>out/match-vamp-plugin_COPYING.txt</file>
+  <file>out/match-vamp-plugin.n3</file>
+  <file>out/match-vamp-plugin_README.txt</file>
+  <file>out/match-vamp-plugin.@SUFFIX@</file>
+  <file>out/mvamp.cat</file>
+  <file>out/mvamp_COPYING.txt</file>
+  <file>out/mvamp.n3</file>
+  <file>out/mvamp_README.txt</file>
+  <file>out/mvamp.@SUFFIX@</file>
+  <file>out/nnls-chroma.cat</file>
+  <file>out/nnls-chroma_CITATION.txt</file>
+  <file>out/nnls-chroma_COPYING.txt</file>
+  <file>out/nnls-chroma.n3</file>
+  <file>out/nnls-chroma_README.txt</file>
+  <file>out/nnls-chroma.@SUFFIX@</file>
+  <file>out/pyin.cat</file>
+  <file>out/pyin_COPYING.txt</file>
+  <file>out/pyin.n3</file>
+  <file>out/pyin_README.txt</file>
+  <file>out/pyin.@SUFFIX@</file>
+  <file>out/qm-vamp-plugins.cat</file>
+  <file>out/qm-vamp-plugins_COPYING.txt</file>
+  <file>out/qm-vamp-plugins.n3</file>
+  <file>out/qm-vamp-plugins_README.md</file>
+  <file>out/qm-vamp-plugins.@SUFFIX@</file>
+  <file>out/segmentino.cat</file>
+  <file>out/segmentino_CITATION.txt</file>
+  <file>out/segmentino_COPYING.txt</file>
+  <file>out/segmentino.n3</file>
+  <file>out/segmentino_README.txt</file>
+  <file>out/segmentino.@SUFFIX@</file>
+  <file>out/silvet.cat</file>
+  <file>out/silvet_CITATION.txt</file>
+  <file>out/silvet_COPYING.txt</file>
+  <file>out/silvet.n3</file>
+  <file>out/silvet_README.txt</file>
+  <file>out/silvet.@SUFFIX@</file>
+  <file>out/simple-cepstrum.cat</file>
+  <file>out/simple-cepstrum.n3</file>
+  <file>out/simple-cepstrum.@SUFFIX@</file>
+  <file>out/tempogram.cat</file>
+  <file>out/tempogram_CITATION.txt</file>
+  <file>out/tempogram_COPYING.txt</file>
+  <file>out/tempogram.n3</file>
+  <file>out/tempogram_README.txt</file>
+  <file>out/tempogram.@SUFFIX@</file>
+  <file>out/tipic.cat</file>
+  <file>out/tipic_CITATION.txt</file>
+  <file>out/tipic_COPYING.txt</file>
+  <file>out/tipic.n3</file>
+  <file>out/tipic_README.txt</file>
+  <file>out/tipic.@SUFFIX@</file>
+  <file>out/tuning-difference.cat</file>
+  <file>out/tuning-difference_COPYING.txt</file>
+  <file>out/tuning-difference.n3</file>
+  <file>out/tuning-difference_README.md</file>
+  <file>out/tuning-difference.@SUFFIX@</file>
+  <file>out/ua-vamp-plugins.cat</file>
+  <file>out/ua-vamp-plugins_COPYING.txt</file>
+  <file>out/ua-vamp-plugins_README.md</file>
+  <file>out/ua-vamp-plugins.@SUFFIX@</file>
+  <file>out/vamp-aubio.cat</file>
+  <file>out/vamp-aubio.n3</file>
+  <file>out/vamp-aubio-plugins_COPYING.txt</file>
+  <file>out/vamp-aubio-plugins_README.md</file>
+  <file>out/vamp-aubio.@SUFFIX@</file>
+  <file>out/vamp-example-plugins.cat</file>
+  <file>out/vamp-example-plugins_COPYING.txt</file>
+  <file>out/vamp-example-plugins.n3</file>
+  <file>out/vamp-example-plugins.@SUFFIX@</file>
+  <file>out/vamp-libxtract.cat</file>
+  <file>out/vamp-libxtract_COPYING.txt</file>
+  <file>out/vamp-libxtract.n3</file>
+  <file>out/vamp-libxtract_README.txt</file>
+  <file>out/vamp-libxtract.@SUFFIX@</file>
+  <file>out/vampy_COPYING.txt</file>
+  <file>out/vampy_README.txt</file>
+  <file>out/vampy.@SUFFIX@</file>
+  <file>rdf/vamp.n3</file>
+  <file>rdf/vamp.rdf</file>
+  <file>rdf/plugins/availability.n3</file>
+  <file>rdf/plugins/bbc-vamp-plugins.n3</file>
+  <file>rdf/plugins/beatroot-vamp.n3</file>
+  <file>rdf/plugins/cepstral-pitchtracker.n3</file>
+  <file>rdf/plugins/cqvamp.n3</file>
+  <file>rdf/plugins/extra-categories.n3</file>
+  <file>rdf/plugins/FChT_f0gram.n3</file>
+  <file>rdf/plugins/featured.n3</file>
+  <file>rdf/plugins/index.txt</file>
+  <file>rdf/plugins/match-vamp-plugin.n3</file>
+  <file>rdf/plugins/mazurka-plugins.n3</file>
+  <file>rdf/plugins/mfs.n3</file>
+  <file>rdf/plugins/mir-edu.n3</file>
+  <file>rdf/plugins/mtg-melodia.n3</file>
+  <file>rdf/plugins/mvamp-ibt.n3</file>
+  <file>rdf/plugins/mvamp.n3</file>
+  <file>rdf/plugins/nnls-chroma.n3</file>
+  <file>rdf/plugins/ofa-vamp-plugin.n3</file>
+  <file>rdf/plugins/pyin.n3</file>
+  <file>rdf/plugins/qm-vamp-plugins.n3</file>
+  <file>rdf/plugins/segmentino.n3</file>
+  <file>rdf/plugins/silvet.n3</file>
+  <file>rdf/plugins/simple-cepstrum.n3</file>
+  <file>rdf/plugins/tempogram.n3</file>
+  <file>rdf/plugins/tipic.n3</file>
+  <file>rdf/plugins/ua-vamp-plugins.n3</file>
+  <file>rdf/plugins/vamp-aubio.n3</file>
+  <file>rdf/plugins/vamp-example-plugins.n3</file>
+  <file>rdf/plugins/vamp-hpcp-mtg.n3</file>
+  <file>rdf/plugins/vamp-libxtract.n3</file>
+  <file>rdf/plugins/vamp-onsetsds.n3</file>
+  <file>rdf/plugins/makers/bbc.png</file>
+  <file>rdf/plugins/makers/bbc-rd.png</file>
+  <file>rdf/plugins/makers/qm-logo.png</file>
+  <file>rdf/plugins/makers/qm.png</file>
+  <file>rdf/plugins/makers/rgu.png</file>
+  <file>rdf/plugins/makers/smc.png</file>
+  <file>rdf/plugins/makers/ua.png</file>
+  <file>rdf/plugins/makers/udelar.png</file>
+  <file>rdf/plugins/makers/upf.png</file>
+</qresource>
+</RCC>