Browse Source

fix windows build (disable jack)

use_builds_script
Alexandros Theodotou 2 years ago
parent
commit
6f277fa987
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 1
      arch/meson.build
  2. 1
      debian/meson.build
  3. 3
      osx-brew/meson.build
  4. 1
      rpm/meson.build
  5. 5
      sources/meson.build
  6. 7
      windows-msys/PKGBUILD-w10.in
  7. 39
      windows-msys/collect_dlls.sh.in
  8. 290
      windows-msys/make_dist_dir.sh.in
  9. 46
      windows-msys/make_windows_installer.sh.in
  10. 53
      windows-msys/meson.build

1
arch/meson.build

@ -44,6 +44,7 @@ arch_pkg = custom_target ( @@ -44,6 +44,7 @@ arch_pkg = custom_target (
lsp_dsp_lib_installation,
zplugins_installation,
],
console: true,
install: true,
install_dir: get_option ('prefix'),
)

1
debian/meson.build vendored

@ -80,6 +80,7 @@ debian_pkg = custom_target ( @@ -80,6 +80,7 @@ debian_pkg = custom_target (
zrythm_src_tarball,
zplugins_installation,
],
console: true,
install: true,
install_dir: get_option ('prefix'),
)

3
osx-brew/meson.build

@ -102,6 +102,7 @@ carla_bottle = custom_target ( @@ -102,6 +102,7 @@ carla_bottle = custom_target (
'@INPUT1@', '@PRIVATE_DIR@',
'@INPUT2@',
],
console: true,
install: false,
)
zrythm_bottle = custom_target (
@ -117,6 +118,7 @@ zrythm_bottle = custom_target ( @@ -117,6 +118,7 @@ zrythm_bottle = custom_target (
'@INPUT3@',
],
depends: [ make_breeze_icons, zplugins_installation, ],
console: true,
install: false,
)
@ -133,6 +135,7 @@ installer_zip = custom_target ( @@ -133,6 +135,7 @@ installer_zip = custom_target (
'@INPUT1@', '@INPUT2@', '@INPUT3@', '@INPUT4@',
'@PRIVATE_DIR@',
],
console: true,
install: true,
install_dir: get_option ('prefix'),
)

1
rpm/meson.build

@ -42,6 +42,7 @@ rpm_pkg = custom_target ( @@ -42,6 +42,7 @@ rpm_pkg = custom_target (
lsp_dsp_lib_installation,
zplugins_installation,
],
console: true,
install: true,
install_dir: get_option ('prefix'),
)

5
sources/meson.build

@ -28,6 +28,7 @@ orig_zrythm_src_tarball = custom_target ( @@ -28,6 +28,7 @@ orig_zrythm_src_tarball = custom_target (
command: [
'wget', orig_zrythm_src_tarball_url, '-O', '@OUTPUT@',
],
console: true,
install: false,
)
@ -41,6 +42,7 @@ zrythm_src_tarball = custom_target ( @@ -41,6 +42,7 @@ zrythm_src_tarball = custom_target (
bash, '-c', '@INPUT0@ "$1" "$2" "$3"', '_ignored',
'@OUTPUT@', '@INPUT1@', '@PRIVATE_DIR@'
],
console: true,
install: false,
)
@ -57,6 +59,7 @@ carla_src_zip = custom_target ( @@ -57,6 +59,7 @@ carla_src_zip = custom_target (
command: [
'wget', url, '-O', '@OUTPUT@',
],
console: true,
install: false,
)
@ -67,6 +70,7 @@ zplugins_src_tarball = custom_target ( @@ -67,6 +70,7 @@ zplugins_src_tarball = custom_target (
command: [
'wget', url, '-O', '@OUTPUT@',
],
console: true,
install: false,
)
@ -77,5 +81,6 @@ lsp_dsp_lib_src_tarball = custom_target ( @@ -77,5 +81,6 @@ lsp_dsp_lib_src_tarball = custom_target (
command: [
'wget', url, '-O', '@OUTPUT@',
],
console: true,
install: false,
)

7
windows-msys/PKGBUILD-w10.in

@ -54,8 +54,11 @@ build() { @@ -54,8 +54,11 @@ build() {
${MINGW_PREFIX}/bin/meson \
-Dsdl=enabled \
-Drtaudio=auto \
-Drtmidi=auto -Dstatic_lsp_dsp=true \
-Djack=enabled \
-Drtmidi=auto \
-Dlsp_dsp=enabled \
-Dstatic_deps=true \
-Dstatic_lsp_dsp=true \
-Djack=disabled \
-Dguile=disabled \
-Dfallback_version=@ZRYTHM_PKG_VERSION@ \
-Dmanpage=false \

39
windows-msys/collect_dlls.sh.in

@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
#!@BASH@
set -ex
out_dir="$1"
copy_dll_deps_sh="$2"
chroot_dir="$3"
dash_trial="@DASH_TRIAL@"
mingw_prefix="$chroot_dir/mingw64"
rm -rf $out_dir
mkdir -p $out_dir
main () {
echo "Copying dlls..."
$copy_dll_deps_sh \
--infile "$mingw_prefix/bin/zrythm$dash_trial.exe" \
--destdir $out_dir/ \
--recursivesrcdir "$mingw_prefix/bin" \
--srcdir "$mingw_prefix/bin" \
--objdump "/mingw64/bin/objdump.exe" \
--copy
# some dlls need to be copied manually
cp $mingw_prefix/bin/librsvg-2-2.dll $out_dir/
cp $mingw_prefix/lib/carla/*.dll $out_dir/
# for an unknown reason it doesn't work unless it
# is named CarlaNativePlugin.dll
mv $out_dir/libcarla_native-plugin.dll \
$out_dir/CarlaNativePlugin.dll
# ******************************
}
main 1>&2

290
windows-msys/make_dist_dir.sh.in

@ -5,10 +5,10 @@ set -ex @@ -5,10 +5,10 @@ set -ex
out_dir="$1"
zrythm_src_tarball="$2"
chroot_dir="$3"
inno_installer_iss="$4"
private_dir="$5"
copy_dll_deps_sh="$6"
rcedit_x64_exe="$7"
private_dir="$4"
copy_dll_deps_sh="$5"
rcedit_x64_exe="$6"
dll_dir="$7"
inner_dir="@ZRYTHM_INNER_DIR_NAME@"
dash_trial="@DASH_TRIAL@"
@ -33,160 +33,134 @@ dist_plugins_dir=$dist_dir/plugins @@ -33,160 +33,134 @@ dist_plugins_dir=$dist_dir/plugins
install_data="install -m 644"
glib_schemas_dir_suffix=share/glib-2.0/schemas
# make the dirs
rm -rf $private_dir
mkdir -p $dist_bindir
mkdir -p $dist_libdir
mkdir -p $dist_sharedir
mkdir -p $dist_etcdir
mkdir -p $dist_plugins_dir
rm -rf $out_dir
verify_bin_file () {
bin_file="$1"
ok_text="$2"
echo "verifying zrythm binary $bin_file..."
temp_file=`mktemp`
$bin_file --version > $temp_file 2>&1 || true
output="`cat $temp_file`"
echo "$output"
if [[ "$output" = *"$ok_text"* ]]; then
echo "ok"
else
echo "fail"
rm "$temp_file"
exit 1
main () {
# make the dirs
rm -rf $private_dir
mkdir -p $dist_bindir
mkdir -p $dist_libdir
mkdir -p $dist_sharedir
mkdir -p $dist_etcdir
mkdir -p $dist_plugins_dir
rm -rf $out_dir
# create sources distribution
echo "TODO" > $dist_dir/THIRDPARTY_INFO
cp $zrythm_src_tarball $installer_dir/
pushd $installer_dir
tar xf $zrythm_src_tarball_filename
rm $zrythm_src_tarball_filename
popd
mv $installer_dir/$zrythm_inner_dir_name $src_dir
cp $src_dir/AUTHORS $dist_dir/
cp $src_dir/COPYING* $dist_dir/
cp $src_dir/README.md $dist_dir/README.txt
cp $src_dir/CONTRIBUTING.md $dist_dir/
cp $src_dir/THANKS $dist_dir/
cp $src_dir/TRANSLATORS $dist_dir/
cp $src_dir/CHANGELOG.md $dist_dir/
cp $src_dir/data/windows/zrythm.ico $dist_dir/zrythm.ico
# copy plugins from the chroot dir
cp -R $chroot_dir/mingw64/lib/lv2/Z*.lv2 $dist_dir/plugins/
# remove some plugins if trial ver
if [ "$dash_trial" == "-trial" ]; then \
rm -rf $dist_dir/plugins/ZChordz*.lv2 ; \
rm -rf $dist_dir/plugins/ZLFO*.lv2 ; \
fi
rm "$temp_file"
exit 0
mkdir -p $dist_dir/$glib_schemas_dir_suffix
glib-compile-schemas $mingw_prefix/$glib_schemas_dir_suffix
cp $mingw_prefix/$glib_schemas_dir_suffix/* $dist_dir/$glib_schemas_dir_suffix/
# ******************************
echo "Copying dlls..."
cp -R "$dll_dir"/* "$dist_bindir"/
# ******************************
# ******************************
if [ "$dash_trial" != "-trial" ]; then
echo "packaging user manuals" ;
unzip -o $manuals_zip -d $dist_dir/ ;
fi
# ******************************
# ******************************
cp -R $mingw_prefix/etc/fonts $dist_etcdir
# ******************************
# ******************************
echo "packaging breeze icons"
mkdir -p "$dist_sharedir/icons"
# the icons are preinstalled here
cp -R "$breeze_dark_path" "$dist_sharedir/icons"/breeze-dark
echo "packaging existing hicolor icons"
cp -R "$mingw_prefix/share/icons/hicolor" "$dist_sharedir/icons/"
# ******************************
# ******************************
echo "packaging gtksourceview files"
cp -R $mingw_prefix/share/gtksourceview-4 $dist_sharedir/
# ******************************
# ******************************
echo "packaging locales"
cp -R $mingw_prefix/share/locale $dist_sharedir/
# ******************************
# ******************************
echo "packaging other assets"
cp -R $mingw_prefix/share/zrythm $dist_sharedir/
# ******************************
# ******************************
echo "packaging fonts"
cp -R $mingw_prefix/share/fonts $dist_sharedir/
# ******************************
# ******************************
echo "packaging gdk pixbuf loaders"
pixbuf_dir="lib/gdk-pixbuf-2.0/2.10.0"
mkdir -p "$dist_dir/$pixbuf_dir/loaders"
cp "$mingw_prefix/$pixbuf_dir/loaders/"*.dll \
"$dist_dir/$pixbuf_dir/loaders/"
gdk_pixbuf_module_dir="$mingw_prefix/$pixbuf_dir/loaders" \
$mingw_prefix/bin/gdk-pixbuf-query-loaders.exe \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-svg.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-jpeg.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-gif.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-bmp.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-tiff.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-png.dll > \
"$dist_dir/$pixbuf_dir/loaders.cache"
sed -i -e 's|.*loaders/|"lib\\\\gdk-pixbuf-2.0\\\\2.10.0\\\\loaders\\\\|g' \
"$dist_dir/$pixbuf_dir/loaders.cache"
# ******************************
# ******************************
echo "packaging binaries"
orig_zrythm_exe="$mingw_prefix/bin/zrythm$dash_trial.exe"
zrythm_exe="$dist_bindir/zrythm.exe"
"$orig_zrythm_exe" --version
cp "$orig_zrythm_exe" "$zrythm_exe"
"$zrythm_exe" --version
cp $mingw_prefix/bin/carla*.exe "$dist_bindir/"
if [ -f "$mingw_prefix/bin/gdbus.exe" ]; then
cp "$mingw_prefix/bin/gdbus.exe" "$dist_bindir/"
fi
$rcedit_x64_exe "$zrythm_exe" --set-icon "$dist_dir/zrythm.ico"
"$zrythm_exe" --version
cp "$mingw_prefix/bin/gspawn-win64-helper.exe" "$dist_bindir/"
cp "$mingw_prefix/bin/gspawn-win64-helper-console.exe" "$dist_bindir/"
# ******************************
mv "$dist_dir" "$out_dir"
}
# create sources distribution
echo "TODO" > $dist_dir/THIRDPARTY_INFO
cp $zrythm_src_tarball $installer_dir/
pushd $installer_dir
tar xf $zrythm_src_tarball_filename
rm $zrythm_src_tarball_filename
popd
mv $installer_dir/$zrythm_inner_dir_name $src_dir
cp $src_dir/AUTHORS $dist_dir/
cp $src_dir/COPYING* $dist_dir/
cp $src_dir/README.md $dist_dir/README.txt
cp $src_dir/CONTRIBUTING.md $dist_dir/
cp $src_dir/THANKS $dist_dir/
cp $src_dir/TRANSLATORS $dist_dir/
cp $src_dir/CHANGELOG.md $dist_dir/
cp $src_dir/data/windows/zrythm.ico $dist_dir/zrythm.ico
# copy plugins from the chroot dir
cp -R $chroot_dir/mingw64/lib/lv2/Z*.lv2 $dist_dir/plugins/
# remove some plugins if trial ver
if [ "$dash_trial" == "-trial" ]; then \
rm -rf $dist_dir/plugins/ZChordz*.lv2 ; \
rm -rf $dist_dir/plugins/ZLFO*.lv2 ; \
fi
mkdir -p $dist_dir/$glib_schemas_dir_suffix
glib-compile-schemas $mingw_prefix/$glib_schemas_dir_suffix
cp $mingw_prefix/$glib_schemas_dir_suffix/* $dist_dir/$glib_schemas_dir_suffix/
# ******************************
echo "Copying dlls..."
$copy_dll_deps_sh \
--infile "$mingw_prefix/bin/zrythm$dash_trial.exe" \
--destdir $dist_bindir/ \
--recursivesrcdir "$mingw_prefix/bin" \
--srcdir "$mingw_prefix/bin" \
--objdump "/mingw64/bin/objdump.exe" \
--copy
# some dlls need to be copied manually
cp $mingw_prefix/bin/librsvg-2-2.dll $dist_bindir/
cp $mingw_prefix/lib/carla/*.dll $dist_bindir/
# for an unknown reason it doesn't work unless it
# is named CarlaNativePlugin.dll
mv $dist_bindir/libcarla_native-plugin.dll \
$dist_bindir/CarlaNativePlugin.dll
# verify installation
(verify_bin_file "$dist_bindir/zrythm.exe" "built with ")
# ******************************
# ******************************
if [ "$dash_trial" != "-trial" ]; then
echo "packaging user manuals" ;
unzip -o $manuals_zip -d $dist_dir/ ;
fi
# ******************************
# ******************************
cp -R $mingw_prefix/etc/fonts $dist_etcdir
# ******************************
# ******************************
echo "packaging breeze icons"
mkdir -p "$dist_sharedir/icons"
# the icons are preinstalled here
cp -R "$breeze_dark_path" "$dist_sharedir/icons"/breeze-dark
echo "packaging existing hicolor icons"
cp -R "$mingw_prefix/share/icons/hicolor" "$dist_sharedir/icons/"
# ******************************
# ******************************
echo "packaging gtksourceview files"
cp -R $mingw_prefix/share/gtksourceview-4 $dist_sharedir/
# ******************************
# ******************************
echo "packaging locales"
cp -R $mingw_prefix/share/locale $dist_sharedir/
# ******************************
# ******************************
echo "packaging other assets"
cp -R $mingw_prefix/share/zrythm $dist_sharedir/
# ******************************
# ******************************
echo "packaging fonts"
cp -R $mingw_prefix/share/fonts $dist_sharedir/
# ******************************
# ******************************
echo "packaging gdk pixbuf loaders"
pixbuf_dir="lib/gdk-pixbuf-2.0/2.10.0"
mkdir -p "$dist_dir/$pixbuf_dir/loaders"
cp "$mingw_prefix/$pixbuf_dir/loaders/"*.dll \
"$dist_dir/$pixbuf_dir/loaders/"
gdk_pixbuf_module_dir="$mingw_prefix/$pixbuf_dir/loaders" \
$mingw_prefix/bin/gdk-pixbuf-query-loaders.exe \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-svg.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-jpeg.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-gif.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-bmp.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-tiff.dll \
$mingw_prefix/$pixbuf_dir/loaders/libpixbufloader-png.dll > \
"$dist_dir/$pixbuf_dir/loaders.cache"
sed -i -e 's|.*loaders/|"lib\\\\gdk-pixbuf-2.0\\\\2.10.0\\\\loaders\\\\|g' \
"$dist_dir/$pixbuf_dir/loaders.cache"
# ******************************
# ******************************
echo "packaging binaries"
cp "$mingw_prefix/bin/zrythm$dash_trial.exe" "$dist_bindir/zrythm.exe"
cp $mingw_prefix/bin/carla*.exe "$dist_bindir/"
if [ -f "$mingw_prefix/bin/gdbus.exe" ]; then
cp "$mingw_prefix/bin/gdbus.exe" "$dist_bindir/"
fi
$rcedit_x64_exe "$dist_bindir/zrythm.exe" --set-icon "$dist_dir/zrythm.ico"
cp "$mingw_prefix/bin/gspawn-win64-helper.exe" "$dist_bindir/"
cp "$mingw_prefix/bin/gspawn-win64-helper-console.exe" "$dist_bindir/"
mv "$dist_dir" "$out_dir"
main 1>&2

46
windows-msys/make_windows_installer.sh.in

@ -4,19 +4,47 @@ set -ex @@ -4,19 +4,47 @@ set -ex
out_file="$1"
dist_dir="$2"
inno_installer_iss="$3"
dash_trial="@DASH_TRIAL@"
zrythm_pkg_ver="@ZRYTHM_PKG_VERSION@"
app_name="Zrythm$dash_trial"
pushd $dist_dir
~/.wine/drive_c/Program\ Files\ \(x86\)/Inno\ Setup\ 6/ISCC.exe \
"//DAppName=$app_name" "//DAppVersion=$zrythm_pkg_ver" \
"//DAppInfoVersion=${zrythm_pkg_ver:0:7}" \
"//DPluginsDir=plugins" \
installer.iss
popd
verify_bin_file () {
bin_file="$1"
ok_text="$2"
echo "verifying zrythm binary $bin_file..."
temp_file=`mktemp`
$bin_file --version > $temp_file 2>&1 || true
output="`cat $temp_file`"
echo "$output"
if [[ "$output" = *"$ok_text"* ]]; then
echo "ok"
else
echo "fail"
rm "$temp_file"
exit 1
fi
rm "$temp_file"
exit 0
}
mv "$dist_dir/Output/Zrythm$dash_trial $zrythm_pkg_ver.exe" \
"$out_file"
main () {
# verify installation
(verify_bin_file "$dist_dir/bin/zrythm.exe" "built with ")
cp $inno_installer_iss $dist_dir/installer.iss
pushd $dist_dir
~/.wine/drive_c/Program\ Files\ \(x86\)/Inno\ Setup\ 6/ISCC.exe \
"//DAppName=$app_name" "//DAppVersion=$zrythm_pkg_ver" \
"//DAppInfoVersion=${zrythm_pkg_ver:0:7}" \
"//DPluginsDir=plugins" \
installer.iss
popd
mv "$dist_dir/Output/Zrythm$dash_trial $zrythm_pkg_ver.exe" \
"$out_file"
}
main 1>&2

53
windows-msys/meson.build

@ -30,6 +30,11 @@ make_windows_chroot = configure_file ( @@ -30,6 +30,11 @@ make_windows_chroot = configure_file (
input: 'make_windows_chroot.sh.in',
configuration: global_conf,
)
collect_dlls = configure_file (
output: 'collect_dlls.sh',
input: 'collect_dlls.sh.in',
configuration: global_conf,
)
make_dist_dir = configure_file (
output: 'make_dist_dir.sh',
input: 'make_dist_dir.sh.in',
@ -71,6 +76,7 @@ inno_extract_zip = custom_target ( @@ -71,6 +76,7 @@ inno_extract_zip = custom_target (
command: [
'wget', url, '-O', '@OUTPUT@',
],
console: true,
install: false,
)
#inno_extract = custom_target (
@ -90,6 +96,7 @@ rcedit_x64_exe = custom_target ( @@ -90,6 +96,7 @@ rcedit_x64_exe = custom_target (
'wget ' + url + ' -O \'@OUTPUT@\' && ' +
'chmod +x \'@OUTPUT@\''
],
console: true,
install: false,
)
@ -104,6 +111,7 @@ foreach dep_name : independent_dep_names @@ -104,6 +111,7 @@ foreach dep_name : independent_dep_names
make_mingw_pkg, 'PKGBUILD-' + dep_name + '-mingw',
],
command: make_mingw_pkg_cmd,
console: true,
install: false,
)
endforeach
@ -114,6 +122,7 @@ lv2_pkg = custom_target ( @@ -114,6 +122,7 @@ lv2_pkg = custom_target (
make_mingw_pkg, 'PKGBUILD-lv2-mingw',
],
command: make_mingw_pkg_cmd,
console: true,
install: false,
)
serd_pkg = custom_target (
@ -130,6 +139,7 @@ sord_pkg = custom_target ( @@ -130,6 +139,7 @@ sord_pkg = custom_target (
input: [ make_mingw_pkg, 'PKGBUILD-sord-mingw', ],
command: make_mingw_pkg_cmd,
depends: serd_pkg,
console: true,
install: false,
)
sratom_pkg = custom_target (
@ -146,6 +156,7 @@ lilv_pkg = custom_target ( @@ -146,6 +156,7 @@ lilv_pkg = custom_target (
input: [ make_mingw_pkg, 'PKGBUILD-lilv-mingw', ],
command: make_mingw_pkg_cmd,
depends: sratom_pkg,
console: true,
install: false,
)
@ -159,6 +170,7 @@ carla_woe32_binary_32_zip = custom_target ( @@ -159,6 +170,7 @@ carla_woe32_binary_32_zip = custom_target (
command: [
'wget', url, '-O', '@OUTPUT@',
],
console: true,
install: false,
)
carla_short_git_ver = run_command (
@ -171,6 +183,7 @@ carla_woe32_binary_64_zip = custom_target ( @@ -171,6 +183,7 @@ carla_woe32_binary_64_zip = custom_target (
command: [
'wget', url, '-O', '@OUTPUT@',
],
console: true,
install: false,
)
@ -185,6 +198,7 @@ mingw_install_carla_bins_target = custom_target ( @@ -185,6 +198,7 @@ mingw_install_carla_bins_target = custom_target (
bash, '-c', '@INPUT0@ "$1" "$2" "$3"', '_ignored',
'@OUTPUT@', '@INPUT1@', '@INPUT2@'
],
console: true,
install: false,
)
@ -205,6 +219,7 @@ mingw_zrythm_pkg = custom_target ( @@ -205,6 +219,7 @@ mingw_zrythm_pkg = custom_target (
mingw_install_carla_bins_target, lilv_pkg,
independent_deps,
],
console: true,
install: false,
)
@ -232,6 +247,26 @@ windows_chroot_target = custom_target ( @@ -232,6 +247,26 @@ windows_chroot_target = custom_target (
'@INPUT3@', '@INPUT4@', '@INPUT5@', '@INPUT6@',
'@INPUT7@', '@INPUT8@', '@INPUT9@',
],
console: true,
install: false,
)
dll_dir = custom_target (
'windows-msys-dll-dir',
output: 'dlls',
input: [
collect_dlls, 'copy-dll-deps.sh',
],
command: [
bash, '-c',
'@INPUT0@ "$1" "$2" "$3"',
'_ignored',
'@OUTPUT@', '@INPUT1@', chroot_dir,
],
depends: [
windows_chroot_target,
],
console: true,
install: false,
)
@ -240,19 +275,18 @@ installer_dist_dir = custom_target ( @@ -240,19 +275,18 @@ installer_dist_dir = custom_target (
output: 'installer-dist',
input: [
make_dist_dir, zrythm_src_tarball,
'installer.iss', 'copy-dll-deps.sh',
rcedit_x64_exe,
'copy-dll-deps.sh',
rcedit_x64_exe, dll_dir,
],
command: [
bash, '-c',
'@INPUT0@ "$1" "$2" "$3" "$4" "$5" "$6" "$7"',
'_ignored',
'@OUTPUT@', '@INPUT1@', chroot_dir, '@INPUT2@',
'@PRIVATE_DIR@', '@INPUT3@', '@INPUT4@',
],
depends: [
windows_chroot_target,
'@OUTPUT@', '@INPUT1@', chroot_dir,
'@PRIVATE_DIR@', '@INPUT2@', '@INPUT3@',
'@INPUT4@',
],
console: true,
install: false,
)
@ -265,11 +299,14 @@ windows_msys_installer = custom_target ( @@ -265,11 +299,14 @@ windows_msys_installer = custom_target (
output: windows_msys_installer_filename,
input: [
make_windows_installer, installer_dist_dir,
'installer.iss',
],
command: [
bash, '-c',
'@INPUT0@ "$1" "$2"', '_ignored', '@OUTPUT@', '@INPUT1@',
'@INPUT0@ "$1" "$2" "$3"', '_ignored',
'@OUTPUT@', '@INPUT1@', '@INPUT2@',
],
console: true,
install: true,
install_dir: get_option ('prefix'),
)

Loading…
Cancel
Save