Browse Source

fix make not found on travis

master
Alexandros Theodotou 2 years ago
parent
commit
59ab41d88f
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 4
      .travis.yml
  2. 0
      plugins/manifest_gen_wrap.sh
  3. 5
      plugins/meson.build

4
.travis.yml

@ -25,7 +25,7 @@ before_install: @@ -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: @@ -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

0
plugins/manifest_gen_wrap.sh

5
plugins/meson.build

@ -29,6 +29,7 @@ plugins = [ @@ -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]) @@ -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,

Loading…
Cancel
Save