# HG changeset patch # User Chris Cannam # Date 1576576292 0 # Node ID 3466e0d1393c24e0113093e61773aa2ef81a8b08 # Parent 28b1dd4ee37089324f19f839a88c62c2c9f9ec04 Generate the qrc file diff -r 28b1dd4ee370 -r 3466e0d1393c deploy/linux/generate-qrc --- /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" diff -r 28b1dd4ee370 -r 3466e0d1393c deploy/osx/generate-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" diff -r 28b1dd4ee370 -r 3466e0d1393c installer.pro --- 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) +} diff -r 28b1dd4ee370 -r 3466e0d1393c installer.qrc --- 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 @@ - - - out/azi.cat - out/azi_COPYING.txt - out/azi.so - out/bbc-vamp-plugins.cat - out/bbc-vamp-plugins_COPYING.txt - out/bbc-vamp-plugins.n3 - out/bbc-vamp-plugins_README.md - out/bbc-vamp-plugins.so - out/beatroot-vamp.cat - out/beatroot-vamp_CITATION.txt - out/beatroot-vamp_COPYING.txt - out/beatroot-vamp.n3 - out/beatroot-vamp_README.txt - out/beatroot-vamp.so - out/cepstral-pitchtracker.cat - out/cepstral-pitchtracker.n3 - out/cepstral-pitchtracker_README.txt - out/cepstral-pitchtracker.so - out/cqvamp.cat - out/cqvamp_CITATION.txt - out/cqvamp_COPYING.txt - out/cqvamp.n3 - out/cqvamp_README.txt - out/cqvamp.so - out/fanchirp.cat - out/fanchirp_CITATION.txt - out/fanchirp_COPYING.txt - out/fanchirp_README.md - out/fanchirp.so - out/match-vamp-plugin.cat - out/match-vamp-plugin_CITATION.txt - out/match-vamp-plugin_COPYING.txt - out/match-vamp-plugin.n3 - out/match-vamp-plugin_README.txt - out/match-vamp-plugin.so - out/mvamp.cat - out/mvamp_COPYING.txt - out/mvamp.n3 - out/mvamp_README.txt - out/mvamp.so - out/nnls-chroma.cat - out/nnls-chroma_CITATION.txt - out/nnls-chroma_COPYING.txt - out/nnls-chroma.n3 - out/nnls-chroma_README.txt - out/nnls-chroma.so - out/pyin.cat - out/pyin_COPYING.txt - out/pyin.n3 - out/pyin_README.txt - out/pyin.so - out/qm-vamp-plugins.cat - out/qm-vamp-plugins_COPYING.txt - out/qm-vamp-plugins.n3 - out/qm-vamp-plugins_README.md - out/qm-vamp-plugins.so - out/segmentino.cat - out/segmentino_CITATION.txt - out/segmentino_COPYING.txt - out/segmentino.n3 - out/segmentino_README.txt - out/segmentino.so - out/silvet.cat - out/silvet_CITATION.txt - out/silvet_COPYING.txt - out/silvet.n3 - out/silvet_README.txt - out/silvet.so - out/simple-cepstrum.cat - out/simple-cepstrum.n3 - out/simple-cepstrum.so - out/tempogram.cat - out/tempogram_CITATION.txt - out/tempogram_COPYING.txt - out/tempogram.n3 - out/tempogram_README.txt - out/tempogram.so - out/tipic.cat - out/tipic_CITATION.txt - out/tipic_COPYING.txt - out/tipic.n3 - out/tipic_README.txt - out/tipic.so - out/tuning-difference.cat - out/tuning-difference_COPYING.txt - out/tuning-difference.n3 - out/tuning-difference_README.md - out/tuning-difference.so - out/ua-vamp-plugins.cat - out/ua-vamp-plugins_COPYING.txt - out/ua-vamp-plugins_README.md - out/ua-vamp-plugins.so - out/vamp-aubio.cat - out/vamp-aubio.n3 - out/vamp-aubio-plugins_COPYING.txt - out/vamp-aubio-plugins_README.md - out/vamp-aubio.so - out/vamp-example-plugins.cat - out/vamp-example-plugins_COPYING.txt - out/vamp-example-plugins.n3 - out/vamp-example-plugins.so - out/vamp-libxtract.cat - out/vamp-libxtract_COPYING.txt - out/vamp-libxtract.n3 - out/vamp-libxtract_README.txt - out/vamp-libxtract.so - out/vampy_COPYING.txt - out/vampy_README.txt - out/vampy.so - rdf/vamp.n3 - rdf/vamp.rdf - rdf/plugins/availability.n3 - rdf/plugins/bbc-vamp-plugins.n3 - rdf/plugins/beatroot-vamp.n3 - rdf/plugins/cepstral-pitchtracker.n3 - rdf/plugins/cqvamp.n3 - rdf/plugins/extra-categories.n3 - rdf/plugins/FChT_f0gram.n3 - rdf/plugins/featured.n3 - rdf/plugins/index.txt - rdf/plugins/match-vamp-plugin.n3 - rdf/plugins/mazurka-plugins.n3 - rdf/plugins/mfs.n3 - rdf/plugins/mir-edu.n3 - rdf/plugins/mtg-melodia.n3 - rdf/plugins/mvamp-ibt.n3 - rdf/plugins/mvamp.n3 - rdf/plugins/nnls-chroma.n3 - rdf/plugins/ofa-vamp-plugin.n3 - rdf/plugins/pyin.n3 - rdf/plugins/qm-vamp-plugins.n3 - rdf/plugins/segmentino.n3 - rdf/plugins/silvet.n3 - rdf/plugins/simple-cepstrum.n3 - rdf/plugins/tempogram.n3 - rdf/plugins/tipic.n3 - rdf/plugins/ua-vamp-plugins.n3 - rdf/plugins/vamp-aubio.n3 - rdf/plugins/vamp-example-plugins.n3 - rdf/plugins/vamp-hpcp-mtg.n3 - rdf/plugins/vamp-libxtract.n3 - rdf/plugins/vamp-onsetsds.n3 - rdf/plugins/makers/bbc.png - rdf/plugins/makers/bbc-rd.png - rdf/plugins/makers/qm-logo.png - rdf/plugins/makers/qm.png - rdf/plugins/makers/rgu.png - rdf/plugins/makers/smc.png - rdf/plugins/makers/ua.png - rdf/plugins/makers/udelar.png - rdf/plugins/makers/upf.png - - diff -r 28b1dd4ee370 -r 3466e0d1393c installer.qrc.in --- /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 @@ + + + out/azi.cat + out/azi_COPYING.txt + out/azi.@SUFFIX@ + out/bbc-vamp-plugins.cat + out/bbc-vamp-plugins_COPYING.txt + out/bbc-vamp-plugins.n3 + out/bbc-vamp-plugins_README.md + out/bbc-vamp-plugins.@SUFFIX@ + out/beatroot-vamp.cat + out/beatroot-vamp_CITATION.txt + out/beatroot-vamp_COPYING.txt + out/beatroot-vamp.n3 + out/beatroot-vamp_README.txt + out/beatroot-vamp.@SUFFIX@ + out/cepstral-pitchtracker.cat + out/cepstral-pitchtracker.n3 + out/cepstral-pitchtracker_README.txt + out/cepstral-pitchtracker.@SUFFIX@ + out/cqvamp.cat + out/cqvamp_CITATION.txt + out/cqvamp_COPYING.txt + out/cqvamp.n3 + out/cqvamp_README.txt + out/cqvamp.@SUFFIX@ + out/fanchirp.cat + out/fanchirp_CITATION.txt + out/fanchirp_COPYING.txt + out/fanchirp_README.md + out/fanchirp.@SUFFIX@ + out/match-vamp-plugin.cat + out/match-vamp-plugin_CITATION.txt + out/match-vamp-plugin_COPYING.txt + out/match-vamp-plugin.n3 + out/match-vamp-plugin_README.txt + out/match-vamp-plugin.@SUFFIX@ + out/mvamp.cat + out/mvamp_COPYING.txt + out/mvamp.n3 + out/mvamp_README.txt + out/mvamp.@SUFFIX@ + out/nnls-chroma.cat + out/nnls-chroma_CITATION.txt + out/nnls-chroma_COPYING.txt + out/nnls-chroma.n3 + out/nnls-chroma_README.txt + out/nnls-chroma.@SUFFIX@ + out/pyin.cat + out/pyin_COPYING.txt + out/pyin.n3 + out/pyin_README.txt + out/pyin.@SUFFIX@ + out/qm-vamp-plugins.cat + out/qm-vamp-plugins_COPYING.txt + out/qm-vamp-plugins.n3 + out/qm-vamp-plugins_README.md + out/qm-vamp-plugins.@SUFFIX@ + out/segmentino.cat + out/segmentino_CITATION.txt + out/segmentino_COPYING.txt + out/segmentino.n3 + out/segmentino_README.txt + out/segmentino.@SUFFIX@ + out/silvet.cat + out/silvet_CITATION.txt + out/silvet_COPYING.txt + out/silvet.n3 + out/silvet_README.txt + out/silvet.@SUFFIX@ + out/simple-cepstrum.cat + out/simple-cepstrum.n3 + out/simple-cepstrum.@SUFFIX@ + out/tempogram.cat + out/tempogram_CITATION.txt + out/tempogram_COPYING.txt + out/tempogram.n3 + out/tempogram_README.txt + out/tempogram.@SUFFIX@ + out/tipic.cat + out/tipic_CITATION.txt + out/tipic_COPYING.txt + out/tipic.n3 + out/tipic_README.txt + out/tipic.@SUFFIX@ + out/tuning-difference.cat + out/tuning-difference_COPYING.txt + out/tuning-difference.n3 + out/tuning-difference_README.md + out/tuning-difference.@SUFFIX@ + out/ua-vamp-plugins.cat + out/ua-vamp-plugins_COPYING.txt + out/ua-vamp-plugins_README.md + out/ua-vamp-plugins.@SUFFIX@ + out/vamp-aubio.cat + out/vamp-aubio.n3 + out/vamp-aubio-plugins_COPYING.txt + out/vamp-aubio-plugins_README.md + out/vamp-aubio.@SUFFIX@ + out/vamp-example-plugins.cat + out/vamp-example-plugins_COPYING.txt + out/vamp-example-plugins.n3 + out/vamp-example-plugins.@SUFFIX@ + out/vamp-libxtract.cat + out/vamp-libxtract_COPYING.txt + out/vamp-libxtract.n3 + out/vamp-libxtract_README.txt + out/vamp-libxtract.@SUFFIX@ + out/vampy_COPYING.txt + out/vampy_README.txt + out/vampy.@SUFFIX@ + rdf/vamp.n3 + rdf/vamp.rdf + rdf/plugins/availability.n3 + rdf/plugins/bbc-vamp-plugins.n3 + rdf/plugins/beatroot-vamp.n3 + rdf/plugins/cepstral-pitchtracker.n3 + rdf/plugins/cqvamp.n3 + rdf/plugins/extra-categories.n3 + rdf/plugins/FChT_f0gram.n3 + rdf/plugins/featured.n3 + rdf/plugins/index.txt + rdf/plugins/match-vamp-plugin.n3 + rdf/plugins/mazurka-plugins.n3 + rdf/plugins/mfs.n3 + rdf/plugins/mir-edu.n3 + rdf/plugins/mtg-melodia.n3 + rdf/plugins/mvamp-ibt.n3 + rdf/plugins/mvamp.n3 + rdf/plugins/nnls-chroma.n3 + rdf/plugins/ofa-vamp-plugin.n3 + rdf/plugins/pyin.n3 + rdf/plugins/qm-vamp-plugins.n3 + rdf/plugins/segmentino.n3 + rdf/plugins/silvet.n3 + rdf/plugins/simple-cepstrum.n3 + rdf/plugins/tempogram.n3 + rdf/plugins/tipic.n3 + rdf/plugins/ua-vamp-plugins.n3 + rdf/plugins/vamp-aubio.n3 + rdf/plugins/vamp-example-plugins.n3 + rdf/plugins/vamp-hpcp-mtg.n3 + rdf/plugins/vamp-libxtract.n3 + rdf/plugins/vamp-onsetsds.n3 + rdf/plugins/makers/bbc.png + rdf/plugins/makers/bbc-rd.png + rdf/plugins/makers/qm-logo.png + rdf/plugins/makers/qm.png + rdf/plugins/makers/rgu.png + rdf/plugins/makers/smc.png + rdf/plugins/makers/ua.png + rdf/plugins/makers/udelar.png + rdf/plugins/makers/upf.png + +