Browse Source

windows: fix destdir

use_builds_script
Alexandros Theodotou 2 years ago
parent
commit
bf0a84cbad
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 1
      osx-brew/zrythm.rb.in
  2. 20
      windows-msys/PKGBUILD.in
  3. 2
      windows-msys/make_windows_chroot.sh.in

1
osx-brew/zrythm.rb.in

@ -64,6 +64,7 @@ class Zrythm@TRIAL_INITIAL_UPPERCASE@ < Formula @@ -64,6 +64,7 @@ class Zrythm@TRIAL_INITIAL_UPPERCASE@ < Formula
"-Dstatic_deps=false",
"-Dphone_home=enabled",
"-Dinstaller_ver=true",
"-Dvamp_static=true",
".."
system "ninja", "-v"
system "meson", "install", "--skip-subprojects"

20
windows-msys/PKGBUILD.in

@ -72,7 +72,10 @@ build() { @@ -72,7 +72,10 @@ build() {
pushd $_zrythm_builddir
sed -i -e '94s/translator/"invalid"/' \
${srcdir}/zrythm-${pkgver}/scripts/gen-translators-list.scm
echo "using prefix ${MINGW_PREFIX}"
MSYS2_ARG_CONV_EXCL="--prefix=" \
${MINGW_PREFIX}/bin/meson \
--prefix=${MINGW_PREFIX} \
-Dsdl=enabled \
-Drtaudio=auto \
-Drtmidi=auto \
@ -85,7 +88,7 @@ build() { @@ -85,7 +88,7 @@ build() {
-Dphone_home=enabled \
-Dmanpage=false \
-Dtrial_ver=@TRIAL_TRUE_FALSE@ \
-Dvamp-static=true \
-Dvamp_static=true \
-Dinstaller_ver=true -Dcarla=enabled \
-Dcarla_binaries_dir_32bit='C:\msys64\mingw32\lib\carla' \
--buildtype=debugoptimized \
@ -93,7 +96,7 @@ build() { @@ -93,7 +96,7 @@ build() {
-Db_lto=false \
-Dtests=false \
"../zrythm-${pkgver}"
ninja
meson compile
cp ${MINGW_PREFIX}/lib/carla/libcarla_host-plugin.dll ./src/
popd
@ -103,10 +106,12 @@ build() { @@ -103,10 +106,12 @@ build() {
pushd "$_zplugins_builddir"
ls -l
mv ../zplugins ../zplugins-${_zplugins_ver}
MSYS2_ARG_CONV_EXCL="--prefix=" \
${MINGW_PREFIX}/bin/meson \
--prefix=${MINGW_PREFIX} \
--buildtype=release \
"../zplugins-${_zplugins_ver}"
ninja
meson compile
popd
}
@ -122,15 +127,14 @@ check() { @@ -122,15 +127,14 @@ check() {
}
package() {
destdir="${pkgdir}${MINGW_PREFIX}"
pushd "$_zrythm_builddir"
${MINGW_PREFIX}/bin/meson install \
--skip-subprojects --destdir="$destdir"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install \
--skip-subprojects
install -Dm644 "${srcdir}/zrythm-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/zrythm/COPYING"
popd
pushd "$_zplugins_builddir"
DESTDIR="$destdir" ninja install
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install \
--skip-subprojects
popd
}

2
windows-msys/make_windows_chroot.sh.in

@ -48,7 +48,7 @@ for pkg in "${packages_array[@]}"; do @@ -48,7 +48,7 @@ for pkg in "${packages_array[@]}"; do
pacman -U "$pkg" --noconfirm --needed --root $chroot_dir
done
# verify plugins exist
ls -l $chroot_dir$mingwprefix/lib/lv2/Z*.lv2
ls -l $chroot_mingw_prefix/lib/lv2/Z*.lv2
pacman -S \
"$mingw_pkg_prefix-gtksourceview4" \
"$mingw_pkg_prefix-fftw" \

Loading…
Cancel
Save