# HG changeset patch # User Chris Cannam # Date 1591971239 -3600 # Node ID 31435b4d9833198b9e4fbf604fcab2358fbc5b29 # Parent 1f7260245c6dd40b898444666547e34438032556 Build a 32-bit installer as well as 64-bit (on Windows). Requires splitting the resource file in two, otherwise the 32-bit compiler runs out of heap space! diff -r 1f7260245c6d -r 31435b4d9833 .hgignore --- a/.hgignore Thu Jun 11 17:19:32 2020 +0100 +++ b/.hgignore Fri Jun 12 15:13:59 2020 +0100 @@ -48,6 +48,8 @@ *.dmg *.app installer.qrc +installer_a.qrc +installer_b.qrc Dockerfile*.gen plugins.zip get-version diff -r 1f7260245c6d -r 31435b4d9833 deploy/clean-build-and-package.bat --- a/deploy/clean-build-and-package.bat Thu Jun 11 17:19:32 2020 +0100 +++ b/deploy/clean-build-and-package.bat Fri Jun 12 15:13:59 2020 +0100 @@ -13,12 +13,21 @@ @if "%YN%" neq "y" exit /b 3 @echo Proceeding + +@echo Building 32-bit +del /q /s out +del /q /s build_win32 +call .\deploy\win64\build-32.bat sign +if %errorlevel% neq 0 exit /b %errorlevel% + +@echo Building 64-bit del /q /s out del /q /s build_win64 call .\deploy\win64\build-64.bat sign if %errorlevel% neq 0 exit /b %errorlevel% mkdir packages +copy "build_win32\release\Vamp Plugin Pack Installer.exe" "packages\Vamp Plugin Pack Installer %VERSION% 32-bit.exe" copy "build_win64\release\Vamp Plugin Pack Installer.exe" "packages\Vamp Plugin Pack Installer %VERSION%.exe" @echo( diff -r 1f7260245c6d -r 31435b4d9833 deploy/win32/build-32.bat --- a/deploy/win32/build-32.bat Thu Jun 11 17:19:32 2020 +0100 +++ b/deploy/win32/build-32.bat Fri Jun 12 15:13:59 2020 +0100 @@ -70,7 +70,10 @@ if %errorlevel% neq 0 exit /b %errorlevel% rem So is this -call .\deploy\win64\generate-qrc installer.qrc +call .\deploy\win64\generate-qrc installer_a.qrc +if %errorlevel% neq 0 exit /b %errorlevel% + +call .\deploy\win64\generate-qrc installer_b.qrc if %errorlevel% neq 0 exit /b %errorlevel% mkdir build_win32 @@ -99,7 +102,10 @@ if %errorlevel% neq 0 exit /b %errorlevel% ) -%QTDIR%\bin\rcc ..\installer.qrc -o o\qrc_installer.cpp +%QTDIR%\bin\rcc --name A ..\installer_a.qrc -o o\qrc_installer_a.cpp +if %errorlevel% neq 0 exit /b %errorlevel% + +%QTDIR%\bin\rcc --name B ..\installer_b.qrc -o o\qrc_installer_b.cpp if %errorlevel% neq 0 exit /b %errorlevel% qmake -spec win32-msvc -r -tp vc ..\installer.pro diff -r 1f7260245c6d -r 31435b4d9833 deploy/win64/build-64.bat --- a/deploy/win64/build-64.bat Thu Jun 11 17:19:32 2020 +0100 +++ b/deploy/win64/build-64.bat Fri Jun 12 15:13:59 2020 +0100 @@ -68,7 +68,10 @@ PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& 'deploy\win64\copy-metadata.ps1' " if %errorlevel% neq 0 exit /b %errorlevel% -call .\deploy\win64\generate-qrc installer.qrc +call .\deploy\win64\generate-qrc installer_a.qrc +if %errorlevel% neq 0 exit /b %errorlevel% + +call .\deploy\win64\generate-qrc installer_b.qrc if %errorlevel% neq 0 exit /b %errorlevel% mkdir build_win64 @@ -97,7 +100,10 @@ if %errorlevel% neq 0 exit /b %errorlevel% ) -%QTDIR%\bin\rcc ..\installer.qrc -o o\qrc_installer.cpp +%QTDIR%\bin\rcc ..\installer_a.qrc -o o\qrc_installer_a.cpp +if %errorlevel% neq 0 exit /b %errorlevel% + +%QTDIR%\bin\rcc ..\installer_b.qrc -o o\qrc_installer_b.cpp if %errorlevel% neq 0 exit /b %errorlevel% qmake -spec win32-msvc -r -tp vc ..\installer.pro diff -r 1f7260245c6d -r 31435b4d9833 installer.cpp --- a/installer.cpp Thu Jun 11 17:19:32 2020 +0100 +++ b/installer.cpp Fri Jun 12 15:13:59 2020 +0100 @@ -768,9 +768,15 @@ int statusColumn = 2; int infoColumn = 4; // column 3 is a small sliver of spacing + QString additionalNote = ""; + if (sizeof(char *) == 4) { + additionalNote = QObject::tr("(32-bit)"); + } + selectionLayout->addWidget - (new QLabel(QObject::tr("Vamp Plugin Pack v%1") - .arg(PACK_VERSION)), + (new QLabel(QObject::tr("Vamp Plugin Pack v%1 %2") + .arg(PACK_VERSION) + .arg(additionalNote)), selectionRow, titleColumn, 1, 3); ++selectionRow; diff -r 1f7260245c6d -r 31435b4d9833 installer.pro --- a/installer.pro Thu Jun 11 17:19:32 2020 +0100 +++ b/installer.pro Fri Jun 12 15:13:59 2020 +0100 @@ -28,28 +28,37 @@ ICON = icons/sv-macicon.icns RC_FILE = icons/sv.rc -qrc.target = $$PWD/installer.qrc -qrc.depends = $$PWD/installer.qrc.in -qrc.commands = $$DEPLOYDIR/generate-qrc $$PWD/installer.qrc +qrc_a.target = $$PWD/installer_a.qrc +qrc_a.depends = $$PWD/installer_a.qrc.in +qrc_a.commands = $$DEPLOYDIR/generate-qrc $$qrc_a.target -QMAKE_EXTRA_TARGETS += qrc -PRE_TARGETDEPS += $$qrc.target +qrc_b.target = $$PWD/installer_b.qrc +qrc_b.depends = $$PWD/installer_b.qrc.in +qrc_b.commands = $$DEPLOYDIR/generate-qrc $$qrc_b.target + +QMAKE_EXTRA_TARGETS += qrc_a qrc_b +PRE_TARGETDEPS += $$qrc_a.target $$qrc_b.target # We can't use use RESOURCES += installer.qrc here, as qmake will # reject a resource file that hasn't been generated yet qtPrepareTool(QMAKE_RCC, rcc) -qrc_cpp.target = $${RCC_DIR}/qrc_installer.cpp -qrc_cpp.depends = $$qrc.target -qrc_cpp.commands = $$QMAKE_RCC $$qrc.target -o $$qrc_cpp.target +qrc_cpp_a.target = $${RCC_DIR}/qrc_installer_a.cpp +qrc_cpp_a.depends = $$qrc_a.target +qrc_cpp_a.commands = $$QMAKE_RCC --name A $$qrc_a.target -o $$qrc_cpp_a.target -QMAKE_EXTRA_TARGETS += qrc_cpp -PRE_TARGETDEPS += $$qrc_cpp.target +qrc_cpp_b.target = $${RCC_DIR}/qrc_installer_b.cpp +qrc_cpp_b.depends = $$qrc_b.target +qrc_cpp_b.commands = $$QMAKE_RCC --name B $$qrc_b.target -o $$qrc_cpp_b.target + +QMAKE_EXTRA_TARGETS += qrc_cpp_a qrc_cpp_b +PRE_TARGETDEPS += $$qrc_cpp_a.target $$qrc_cpp_b.target SOURCES += \ installer.cpp \ - $$qrc_cpp.target \ + $$qrc_cpp_a.target \ + $$qrc_cpp_b.target \ svcore/base/Debug.cpp \ svcore/base/ResourceFinder.cpp \ svcore/system/System.cpp \ diff -r 1f7260245c6d -r 31435b4d9833 installer.qrc.in --- a/installer.qrc.in Thu Jun 11 17:19:32 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +0,0 @@ - - - icons/scalable/info.svg - out/get-version@EXESUFFIX@ - 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_README.md - out/bbc-vamp-plugins@SUFFIX@ - out/beatroot-vamp.cat - out/beatroot-vamp_CITATION.txt - out/beatroot-vamp_COPYING.txt - out/beatroot-vamp_README.txt - out/beatroot-vamp@SUFFIX@ - out/cepstral-pitchtracker.cat - out/cepstral-pitchtracker_COPYING.txt - out/cepstral-pitchtracker_README.txt - out/cepstral-pitchtracker@SUFFIX@ - out/cqvamp.cat - out/cqvamp_CITATION.txt - out/cqvamp_COPYING.txt - 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_README.txt - out/match-vamp-plugin@SUFFIX@ - out/mvamp.cat - out/mvamp_COPYING.txt - out/mvamp_README.txt - out/mvamp@SUFFIX@ - out/nnls-chroma.cat - out/nnls-chroma_CITATION.txt - out/nnls-chroma_COPYING.txt - out/nnls-chroma_README.txt - out/nnls-chroma@SUFFIX@ - out/pyin.cat - out/pyin_COPYING.txt - out/pyin_README.txt - out/pyin@SUFFIX@ - out/qm-vamp-plugins.cat - out/qm-vamp-plugins_COPYING.txt - out/qm-vamp-plugins_README.md - out/qm-vamp-plugins@SUFFIX@ - out/segmentino.cat - out/segmentino_CITATION.txt - out/segmentino_COPYING.txt - out/segmentino_README.txt - out/segmentino@SUFFIX@ - out/silvet.cat - out/silvet_CITATION.txt - out/silvet_COPYING.txt - out/silvet_README.txt - out/silvet@SUFFIX@ - out/simple-cepstrum.cat - out/simple-cepstrum_COPYING.txt - out/simple-cepstrum_README.txt - out/simple-cepstrum@SUFFIX@ - out/tempogram.cat - out/tempogram_CITATION.txt - out/tempogram_COPYING.txt - out/tempogram_README.txt - out/tempogram@SUFFIX@ - out/tipic.cat - out/tipic_CITATION.txt - out/tipic_COPYING.txt - out/tipic_README.txt - out/tipic@SUFFIX@ - out/tuning-difference.cat - out/tuning-difference_COPYING.txt - 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_COPYING.txt - out/vamp-aubio_README.md - out/vamp-aubio@SUFFIX@ - out/vamp-example-plugins.cat - out/vamp-example-plugins_COPYING.txt - out/vamp-example-plugins@SUFFIX@ - out/vamp-libxtract.cat - out/vamp-libxtract_COPYING.txt - out/vamp-libxtract_README.txt - out/vamp-libxtract@SUFFIX@ - - rdf/vamp.n3 - rdf/vamp.rdf - rdf/plugins/availability.n3 - rdf/plugins/azi.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/tuning-difference.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 1f7260245c6d -r 31435b4d9833 installer_a.qrc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer_a.qrc.in Fri Jun 12 15:13:59 2020 +0100 @@ -0,0 +1,54 @@ + + + icons/scalable/info.svg + out/get-version@EXESUFFIX@ + 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_README.md + out/bbc-vamp-plugins@SUFFIX@ + out/beatroot-vamp.cat + out/beatroot-vamp_CITATION.txt + out/beatroot-vamp_COPYING.txt + out/beatroot-vamp_README.txt + out/beatroot-vamp@SUFFIX@ + out/cepstral-pitchtracker.cat + out/cepstral-pitchtracker_COPYING.txt + out/cepstral-pitchtracker_README.txt + out/cepstral-pitchtracker@SUFFIX@ + out/cqvamp.cat + out/cqvamp_CITATION.txt + out/cqvamp_COPYING.txt + 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_README.txt + out/match-vamp-plugin@SUFFIX@ + out/mvamp.cat + out/mvamp_COPYING.txt + out/mvamp_README.txt + out/mvamp@SUFFIX@ + out/nnls-chroma.cat + out/nnls-chroma_CITATION.txt + out/nnls-chroma_COPYING.txt + out/nnls-chroma_README.txt + out/nnls-chroma@SUFFIX@ + out/pyin.cat + out/pyin_COPYING.txt + out/pyin_README.txt + out/pyin@SUFFIX@ + out/qm-vamp-plugins.cat + out/qm-vamp-plugins_COPYING.txt + out/qm-vamp-plugins_README.md + out/qm-vamp-plugins@SUFFIX@ + + diff -r 1f7260245c6d -r 31435b4d9833 installer_b.qrc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/installer_b.qrc.in Fri Jun 12 15:13:59 2020 +0100 @@ -0,0 +1,96 @@ + + + out/segmentino.cat + out/segmentino_CITATION.txt + out/segmentino_COPYING.txt + out/segmentino_README.txt + out/segmentino@SUFFIX@ + out/silvet.cat + out/silvet_CITATION.txt + out/silvet_COPYING.txt + out/silvet_README.txt + out/silvet@SUFFIX@ + out/simple-cepstrum.cat + out/simple-cepstrum_COPYING.txt + out/simple-cepstrum_README.txt + out/simple-cepstrum@SUFFIX@ + out/tempogram.cat + out/tempogram_CITATION.txt + out/tempogram_COPYING.txt + out/tempogram_README.txt + out/tempogram@SUFFIX@ + out/tipic.cat + out/tipic_CITATION.txt + out/tipic_COPYING.txt + out/tipic_README.txt + out/tipic@SUFFIX@ + out/tuning-difference.cat + out/tuning-difference_COPYING.txt + 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_COPYING.txt + out/vamp-aubio_README.md + out/vamp-aubio@SUFFIX@ + out/vamp-example-plugins.cat + out/vamp-example-plugins_COPYING.txt + out/vamp-example-plugins@SUFFIX@ + out/vamp-libxtract.cat + out/vamp-libxtract_COPYING.txt + out/vamp-libxtract_README.txt + out/vamp-libxtract@SUFFIX@ + + rdf/vamp.n3 + rdf/vamp.rdf + rdf/plugins/availability.n3 + rdf/plugins/azi.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/tuning-difference.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 + +