rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

ci: Use a prefix for the meson build in the windows image

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1084>
This commit is contained in:
Jordan Petridis 2022-08-17 18:03:27 +03:00
parent 9a9b7bc5ce
commit be356dbf08
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ci/run_windows_tests.ps1
View file

@ -1,6 +1,6 @@
# Add the precompiled gst binaries to the path # Add the precompiled gst binaries to the path
$env:Path += ';C:\bin\' $env:Path += ';C:/gst-install/bin\'
$env:PKG_CONFIG_PATH = "C:/lib/pkgconfig" $env:PKG_CONFIG_PATH = "C:/gst-install/lib/pkgconfig"
# List of all the crates we want to build # List of all the crates we want to build
# We need to do this manually to avoid trying # We need to do this manually to avoid trying

2
ci/windows-docker/Dockerfile
View file

@ -10,7 +10,7 @@ ARG DEFAULT_BRANCH="main"
ARG RUST_VERSION="invalid" ARG RUST_VERSION="invalid"
RUN choco install -y pkgconfiglite RUN choco install -y pkgconfiglite
ENV PKG_CONFIG_PATH="C:/lib/pkgconfig" ENV PKG_CONFIG_PATH="C:\gst-install\lib\pkgconfig"
COPY install_gst.ps1 install_gtk.ps1 C:\ COPY install_gst.ps1 install_gtk.ps1 C:\
RUN C:\install_gst.ps1 RUN C:\install_gst.ps1

3
ci/windows-docker/install_gst.ps1
View file

@ -26,7 +26,8 @@ if (!$?) {
Exit 1 Exit 1
} }
$env:MESON_ARGS = "-Dglib:installed_tests=false " + $env:MESON_ARGS = "--prefix=C:\gst-install\ " +
"-Dglib:installed_tests=false " +
"-Dlibnice:tests=disabled " + "-Dlibnice:tests=disabled " +
"-Dlibnice:examples=disabled " + "-Dlibnice:examples=disabled " +
"-Dffmpeg:tests=disabled " + "-Dffmpeg:tests=disabled " +

2
ci/windows-docker/install_gtk.ps1
View file

@ -11,7 +11,7 @@ if (!$?) {
Set-Location C:\gtk Set-Location C:\gtk
$env:MESON_ARGS = "" $env:MESON_ARGS = "--prefix=C:\gst-install\"
Write-Output "Building gtk" Write-Output "Building gtk"
cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson _build $env:MESON_ARGS && meson compile -C _build && ninja -C _build install" cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson _build $env:MESON_ARGS && meson compile -C _build && ninja -C _build install"