From 1ff0f118ae9e2d4799d55d572492c99d0a5cacae Mon Sep 17 00:00:00 2001 From: Cristina Suteu Date: Tue, 7 Nov 2023 09:37:16 +0200 Subject: [PATCH 1/2] CI/docker/install_prep: copy xmls to bin dir when creating dir hier. for win installer, copy xmls dir to bin dir this ensures the detailed SPI Reg Map is visible on windows Signed-off-by: Cristina Suteu --- CI/docker/install_prep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/docker/install_prep.sh b/CI/docker/install_prep.sh index 7f85fcded..e55dfc730 100644 --- a/CI/docker/install_prep.sh +++ b/CI/docker/install_prep.sh @@ -86,6 +86,7 @@ bin_dir() { cp -r $WORKDIR/iio-oscilloscope/glade $WORKDIR/iio-oscilloscope/build/bin/ cp -r $WORKDIR/iio-oscilloscope/block_diagrams $WORKDIR/iio-oscilloscope/build/bin/ cp -r $WORKDIR/iio-oscilloscope/icons $WORKDIR/iio-oscilloscope/build/bin/ + cp -r $WORKDIR/iio-oscilloscope/xmls $WORKDIR/iio-oscilloscope/build/bin/ popd } @@ -98,7 +99,6 @@ lib_dir() { cp -r $WORKDIR/iio-oscilloscope/filters $WORKDIR/iio-oscilloscope/build/lib/osc cp -r $WORKDIR/iio-oscilloscope/build/profiles $WORKDIR/iio-oscilloscope/build/lib/osc cp -r $WORKDIR/iio-oscilloscope/waveforms $WORKDIR/iio-oscilloscope/build/lib/osc - cp -r $WORKDIR/iio-oscilloscope/xmls $WORKDIR/iio-oscilloscope/build/lib/osc cp $WORKDIR/iio-oscilloscope/build/plugins/*.dll $WORKDIR/iio-oscilloscope/build/lib/osc popd } From be4d1a34a9dc07deac45a92226e21b7ba1d61856 Mon Sep 17 00:00:00 2001 From: Cristina Suteu Date: Tue, 7 Nov 2023 11:07:51 +0200 Subject: [PATCH 2/2] workflows/buildmingw.yml: use libiio v0 branch for win installer Signed-off-by: Cristina Suteu --- .github/workflows/buildmingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildmingw.yml b/.github/workflows/buildmingw.yml index 48a5e7517..2bf6ec2cb 100644 --- a/.github/workflows/buildmingw.yml +++ b/.github/workflows/buildmingw.yml @@ -35,7 +35,7 @@ jobs: -e BRANCH=%GITHUB_REF_NAME% ^ -e HEAD_BRANCH=%GITHUB_HEAD_REF% ^ -e OSC_BUILD_VER=%TAG% ^ - -e LIBIIO_BRANCH=v0.25 ^ + -e LIBIIO_BRANCH=libiio-v0 ^ -e LIBAD9361_BRANCH=master ^ -e LIBAD9166_BRANCH=master ^ shooteu/iio-oscilloscope C:\msys64\usr\bin\bash.exe -c '/home/docker/iio-oscilloscope/CI/docker/inside_docker.sh'