From 442cdbaabddbd754973d73acbd52748ccb34db2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Wed, 18 Nov 2020 12:28:02 -0300 Subject: [PATCH 1/6] win32: Fix unassigned parameter --- platforms/windows-native.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/windows-native.txt b/platforms/windows-native.txt index 827e467dac..1958dd58b7 100644 --- a/platforms/windows-native.txt +++ b/platforms/windows-native.txt @@ -28,7 +28,7 @@ libmount = 'false' evas-loaders-disabler = 'gst,pdf,ps,raw,svg,rsvg,xcf,bmp,dds,generic,gif,ico,jp2k,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm,json' opengl = 'none' emotion-loaders-disabler = 'gstreamer1,libvlc,xine' -bindings= +bindings = '' [properties] c_args = common_flags From f72d5e9c0ba6b2342f34b38b70eef429df76b61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Wed, 25 Nov 2020 15:54:15 -0300 Subject: [PATCH 2/6] win32: Add a custom native-file for windows ci --- platforms/windows-ci-custom-native-properties.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 platforms/windows-ci-custom-native-properties.txt diff --git a/platforms/windows-ci-custom-native-properties.txt b/platforms/windows-ci-custom-native-properties.txt new file mode 100644 index 0000000000..4d14b32b10 --- /dev/null +++ b/platforms/windows-ci-custom-native-properties.txt @@ -0,0 +1,5 @@ +[properties] +cmake_toolchain_file = 'D:/a/efl/efl/vcpkg/scripts/buildsystems/vcpkg.cmake' + +[project options] +buildtype = 'debug' From c3c86bbf4a4bc5e5c8ec7e665e379636740e43cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Wed, 25 Nov 2020 15:55:40 -0300 Subject: [PATCH 3/6] win32: use build-in options instead of properties for c_args/cpp_args --- platforms/windows-native.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/windows-native.txt b/platforms/windows-native.txt index 1958dd58b7..f5fde271a6 100644 --- a/platforms/windows-native.txt +++ b/platforms/windows-native.txt @@ -30,6 +30,6 @@ opengl = 'none' emotion-loaders-disabler = 'gstreamer1,libvlc,xine' bindings = '' -[properties] +[built-in options] c_args = common_flags cpp_args = common_flags From cb0c11a86d5f7dbed9cf96e344283f9c673d5cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Wed, 25 Nov 2020 16:16:39 -0300 Subject: [PATCH 4/6] win32: update upload/download artifact to v2 --- .github/workflows/windows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 83bc9a40bc..4c4b48aa3c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -105,7 +105,7 @@ jobs: - name: Build run: .\build.bat - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v2 with: name: build path: build @@ -140,9 +140,10 @@ jobs: - name: Test meson run: meson -v - name: Download build artifact - uses: actions/download-artifact@v1.0.0 + uses: actions/download-artifact@v2 with: name: build + path: build - name: Check directory tree (for debugging purposes) run: tree . - name: Add vcpkg installed package dirs to path From 1f4e438c4bea1b994bc9c6965c6fd04935bb280a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Wed, 25 Nov 2020 16:31:58 -0300 Subject: [PATCH 5/6] win32: Directly invoke Meson instead of custom .bat scripts --- .github/workflows/windows.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4c4b48aa3c..fa327d67ad 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -98,12 +98,10 @@ jobs: run: echo "::add-path::${{ github.workspace }}/vcpkg/installed/x64-windows/bin" - name: Add vcpkg installed package dirs to path (debug libs) run: echo "::add-path::${{ github.workspace }}/vcpkg/installed/x64-windows/debug/bin" - - name: configure - run: .\configure.bat - env: - vcpkg_toolchain_file: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake + - name: Configure + run: meson build --native-file platforms/windows-native.txt --native-file platforms/windows-ci-custom-native-properties.txt - name: Build - run: .\build.bat + run: meson compile -C build - name: Upload artifact uses: actions/upload-artifact@v2 with: From 51f73128b3b3584c2e60d4b8f489d6db9c48c122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Wed, 25 Nov 2020 16:34:21 -0300 Subject: [PATCH 6/6] win32: Prevent Strawberry packages from being used by Meson --- .github/workflows/windows.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fa327d67ad..4d99315c38 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,6 +10,14 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + + # Remove Strawberry + # Strawberry is added by default to the PATH environmment, and it happens + # that the Meson inconveniently preffer its packages over those installed + # with vcpkg, so we just rename Strawberry folder so it can't be found. + - name: Remove Strawberry + run: mv C:\Strawberry C:\Strawberry.disabled + - name: Cache LLVM install uses: actions/cache@v2 id: cache-llvm