Mercurial > hg > sonic-annotator
changeset 378:a296bbde0861
Strive to include dynamic (because faster startup) and static (AppImage) builds
| author | Chris Cannam |
|---|---|
| date | Fri, 05 Jun 2020 13:38:22 +0100 |
| parents | f7b1e81991e4 |
| children | 276c3764ab10 |
| files | deploy/clean-build-and-package deploy/linux/docker/Dockerfile_appimage.in package/sonic-annotator.spec |
| diffstat | 3 files changed, 5 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/deploy/clean-build-and-package Fri Jun 05 13:17:53 2020 +0100 +++ b/deploy/clean-build-and-package Fri Jun 05 13:38:22 2020 +0100 @@ -33,9 +33,11 @@ ( cd deploy/linux/docker/output - mkdir -p "$dir" - cp SonicAnnotator-"$current"-x86_64.AppImage "$dir/sonic-annotator" + mkdir -p "$dir/static" + cp sonic-annotator "$dir/sonic-annotator" + cp SonicAnnotator-"$current"-x86_64.AppImage "$dir/static/sonic-annotator" chmod +x "$dir/sonic-annotator" + chmod +x "$dir/static/sonic-annotator" cp ../../../../README.md "$dir" cp ../../../../CHANGELOG "$dir" cp ../../../../COPYING "$dir"
--- a/deploy/linux/docker/Dockerfile_appimage.in Fri Jun 05 13:17:53 2020 +0100 +++ b/deploy/linux/docker/Dockerfile_appimage.in Fri Jun 05 13:38:22 2020 +0100 @@ -73,4 +73,4 @@ RUN make -j3 RUN deploy/linux/deploy-appimage.sh -RUN tar cvf output-appimage.tar *.AppImage && cp output-appimage.tar .. +RUN tar cvf output-appimage.tar sonic-annotator *.AppImage && cp output-appimage.tar ..
--- a/package/sonic-annotator.spec Fri Jun 05 13:17:53 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -%define _topdir /home/cannam/rpm/sonic-annotator -%define name sonic-annotator -%define version 0.6 -%define release svn20100629 - -BuildRoot: %{_tmppath}/%{name}-buildroot -Summary: Sonic Annotator -License: GPL -Name: %{name} -Group: Sound -Version: %{version} -Release: %{release} - -%description -Sonic Annotator is a utility program for batch feature extraction -from audio files. It runs Vamp audio analysis plugins on audio files, -and can write the result features in a selection of formats including -CSV and RDF/Turtle. - -%prep -svn co http://sv1.svn.sourceforge.net/svnroot/sv1/sonic-annotator/trunk . -#%{name}-%{version}-%{release} - -%build -export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig -#cd %{name}-%{version}-%{release} -/home/cannam/qt-4.6.2-static/bin/qmake -r "LIBS += -Wl,-Bstatic" "DEFINES += BUILD_STATIC" -make - -%install -#cd %{name}-%{version}-%{release} -mkdir -p $RPM_BUILD_ROOT/usr/bin -install runner/sonic-annotator $RPM_BUILD_ROOT/usr/bin - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%{_bindir}/sonic-annotator -%doc README COPYING CHANGELOG -