diff --git a/.travis.yml b/.travis.yml index fa20893..46d73e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start' export mingw64="$msys2 -mingw64 -full-path -here -c \$\* --" export msys2+=" -msys2 -c \$\* --" - $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-librsvg mingw-w64-x86_64-meson mingw-w64-x86_64-libsndfile guile mingw-w64-x86_64-make + $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-librsvg mingw-w64-x86_64-meson mingw-w64-x86_64-libsndfile guile make ## Install more MSYS2 packages from https://packages.msys2.org/base here taskkill //IM gpg-agent.exe //F || true # https://travis-ci.community/t/4967 export PATH=/C/tools/msys64/mingw64/bin:$PATH @@ -70,7 +70,7 @@ script: ninja -C build test ;; windows) - $mingw64 cd ext/Soundpipe && make && cd ../.. + $mingw64 cd ext/Soundpipe && $MAKE && cd ../.. $mingw64 meson build $mingw64 ninja -C build $mingw64 ninja -C build test diff --git a/plugins/manifest_gen_wrap.sh b/plugins/manifest_gen_wrap.sh old mode 100644 new mode 100755 diff --git a/plugins/meson.build b/plugins/meson.build index 548797a..6baf333 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -29,6 +29,7 @@ plugins = [ fs = import('fs') guile = find_program (['guile2.2', 'guile']) +sh = find_program ('sh') ztoolkit_dep = dependency( 'ztoolkit', version: '>= 0.1.1', fallback: ['ztoolkit', 'ztoolkit_dep'], @@ -220,7 +221,9 @@ if get_option ('plugins').contains (pl[0]) manifest_ttl = configure_file ( output: pl_str + '_manifest.ttl', command: [ - manifest_gen_wrap, '@OUTPUT@', + sh, + meson.current_build_dir () / 'manifest_gen_wrap.sh', + '@OUTPUT@', project_uri, pl_type, pl_uri, pl_dsp_binary, pl_minor_version, pl_micro_version, pl_ttl,