mirror of
https://github.com/mpv-player/mpv
synced 2025-02-27 02:40:53 +00:00
ci: separate meson/waf build dirs
This commit is contained in:
parent
08d11e8c5d
commit
7151b5122a
@ -30,6 +30,7 @@ if [ ! -e "./waf" ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
python3 ./waf configure \
|
python3 ./waf configure \
|
||||||
|
--out=build_waf \
|
||||||
--enable-libmpv-shared \
|
--enable-libmpv-shared \
|
||||||
--enable-lua \
|
--enable-lua \
|
||||||
--enable-egl-drm \
|
--enable-egl-drm \
|
||||||
|
@ -32,6 +32,7 @@ if [[ $1 = "waf" ]]; then
|
|||||||
|
|
||||||
PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" python3 \
|
PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" python3 \
|
||||||
./waf configure \
|
./waf configure \
|
||||||
|
--out=build_waf \
|
||||||
--variant="${MPV_VARIANT}" \
|
--variant="${MPV_VARIANT}" \
|
||||||
--prefix="${MPV_INSTALL_PREFIX}" \
|
--prefix="${MPV_INSTALL_PREFIX}" \
|
||||||
--enable-{gl,iconv,lcms2,libmpv-shared,lua,jpeg,plain-gl,zlib} \
|
--enable-{gl,iconv,lcms2,libmpv-shared,lua,jpeg,plain-gl,zlib} \
|
||||||
@ -41,5 +42,5 @@ if [[ $1 = "waf" ]]; then
|
|||||||
python3 ./waf build --variant="${MPV_VARIANT}" -j4
|
python3 ./waf build --variant="${MPV_VARIANT}" -j4
|
||||||
|
|
||||||
python3 ./waf install --variant="${MPV_VARIANT}"
|
python3 ./waf install --variant="${MPV_VARIANT}"
|
||||||
./build/mpv
|
${MPV_INSTALL_PREFIX}/bin/mpv
|
||||||
fi
|
fi
|
||||||
|
@ -207,6 +207,7 @@ if [ "$1" = "meson" ]; then
|
|||||||
meson test -C build
|
meson test -C build
|
||||||
elif [ "$1" = "waf" ]; then
|
elif [ "$1" = "waf" ]; then
|
||||||
PKG_CONFIG=pkg-config ./waf configure \
|
PKG_CONFIG=pkg-config ./waf configure \
|
||||||
|
--out=build_waf \
|
||||||
--enable-libmpv-shared --lua=luajit \
|
--enable-libmpv-shared --lua=luajit \
|
||||||
--enable-{shaderc,spirv-cross,d3d11,libplacebo,tests}
|
--enable-{shaderc,spirv-cross,d3d11,libplacebo,tests}
|
||||||
|
|
||||||
@ -216,7 +217,7 @@ fi
|
|||||||
if [ "$2" = pack ]; then
|
if [ "$2" = pack ]; then
|
||||||
mkdir -p artifact
|
mkdir -p artifact
|
||||||
echo "Copying:"
|
echo "Copying:"
|
||||||
cp -pv build/mpv.{com,exe} "$prefix_dir/bin/"*.dll artifact/
|
cp -pv build_waf/mpv.{com,exe} "$prefix_dir/bin/"*.dll artifact/
|
||||||
# ship everything and the kitchen sink
|
# ship everything and the kitchen sink
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
for file in /usr/lib/gcc/$TARGET/*-posix/*.dll /usr/$TARGET/lib/*.dll; do
|
for file in /usr/lib/gcc/$TARGET/*-posix/*.dll /usr/$TARGET/lib/*.dll; do
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
if [ "$1" = "meson" ]; then
|
if [ "$1" = "meson" ]; then
|
||||||
meson setup build_meson \
|
meson setup build \
|
||||||
-D cdda=enabled \
|
-D cdda=enabled \
|
||||||
-D d3d-hwaccel=enabled \
|
-D d3d-hwaccel=enabled \
|
||||||
-D d3d11=enabled \
|
-D d3d11=enabled \
|
||||||
@ -22,15 +22,16 @@ if [ "$1" = "meson" ]; then
|
|||||||
-D uchardet=enabled \
|
-D uchardet=enabled \
|
||||||
-D vapoursynth=enabled \
|
-D vapoursynth=enabled \
|
||||||
-D vulkan=enabled
|
-D vulkan=enabled
|
||||||
meson compile -C build_meson
|
meson compile -C build
|
||||||
cp ./build_meson/generated/mpv.com ./build_meson
|
cp ./build/generated/mpv.com ./build
|
||||||
meson test -C build_meson
|
meson test -C build
|
||||||
./build_meson/mpv.com --no-config -v --unittest=all-simple
|
./build/mpv.com --no-config -v --unittest=all-simple
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$1" = "waf" ]; then
|
if [ "$1" = "waf" ]; then
|
||||||
./bootstrap.py
|
./bootstrap.py
|
||||||
./waf configure \
|
./waf configure \
|
||||||
|
--out=build_waf \
|
||||||
--enable-cdda \
|
--enable-cdda \
|
||||||
--enable-d3d-hwaccel \
|
--enable-d3d-hwaccel \
|
||||||
--enable-d3d11 \
|
--enable-d3d11 \
|
||||||
@ -52,5 +53,5 @@ if [ "$1" = "waf" ]; then
|
|||||||
--lua=luajit \
|
--lua=luajit \
|
||||||
--enable-vulkan
|
--enable-vulkan
|
||||||
./waf build
|
./waf build
|
||||||
./build/mpv.com -v --no-config -v --unittest=all-simple
|
./build_waf/mpv.com -v --no-config -v --unittest=all-simple
|
||||||
fi
|
fi
|
||||||
|
@ -19,7 +19,8 @@ if [ "$1" = "meson" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$1" = "waf" ]; then
|
if [ "$1" = "waf" ]; then
|
||||||
python3 ./waf configure \
|
python3 ./waf configure \
|
||||||
|
--out=build_waf \
|
||||||
--enable-cdda \
|
--enable-cdda \
|
||||||
--enable-dvbin \
|
--enable-dvbin \
|
||||||
--enable-dvdnav \
|
--enable-dvdnav \
|
||||||
@ -31,5 +32,5 @@ if [ "$1" = "waf" ]; then
|
|||||||
--enable-tests \
|
--enable-tests \
|
||||||
--enable-vulkan
|
--enable-vulkan
|
||||||
python3 ./waf build
|
python3 ./waf build
|
||||||
./build/mpv -v --no-config -v --unittest=all-simple
|
./build_waf/mpv -v --no-config -v --unittest=all-simple
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user