Compile linux manager with vcpkg

BOINC · Jun 28, 2021 · 8307051 · 8307051
1 parent 45475b9
commit 8307051
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 10 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        type: [libs, client, apps, libs-vcpkg, client-vcpkg, apps-vcpkg, server, manager-with-webview, manager-without-webview, unit-test, integration-test]
+        type: [libs, client, apps, libs-vcpkg, client-vcpkg, apps-vcpkg, manager-with-webview-vcpkg, server, manager-with-webview, manager-without-webview, unit-test, integration-test]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -24,7 +24,7 @@ jobs:
         run: |
           sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu bionic main universe'
           sudo apt-get -qq update
-          sudo apt-get install -y freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk2.0-dev libwebkitgtk-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip
+          sudo apt-get install -y freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk2.0-dev libgtk-3-dev libwebkitgtk-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip
 
       - name: Install dependencies for integration testing
         if: matrix.type == 'integration-test'
@@ -80,6 +80,10 @@ jobs:
         if: success() && matrix.type == 'apps-vcpkg'
         run: linux/ci_configure_apps.sh
 
+      - name: Configure manager with webview and vcpkg
+        if: success() && matrix.type == 'manager-with-webview-vcpkg'
+        run: linux/ci_configure_manager.sh
+
       - name: Configure server
         if: success() && matrix.type == 'server'
         run: ./configure --enable-server --disable-client --disable-manager
@@ -98,7 +102,7 @@ jobs:
 
       - name: Make
         if: success() && ! contains(matrix.type, 'integration-test')
-        run: make
+        run: make SHELL="/bin/bash -x"
 
       - name: Execute unit-test and report coverage
         if: success() && matrix.type == 'unit-test'

diff --git a/deploy/prepare_deployment.sh b/deploy/prepare_deployment.sh
@@ -198,6 +198,9 @@ case $TYPE in
     linux_apps-vcpkg)
         prepare_apps
     ;;
+    linux_manager-with-webview-vcpkg)
+        prepare_manager
+    ;;
     linux_manager-with-webview)
         prepare_manager
     ;;

diff --git a/linux/ci_configure_apps.sh b/linux/ci_configure_apps.sh
@@ -13,6 +13,5 @@ export VCPKG_DIR="$VCPKG_ROOT/installed/x64-linux"
 
 linux/update_vcpkg.sh
 
-chmod +x "$VCPKG_DIR/share/curl/curl-config"
-export _libcurl_config="$VCPKG_DIR/share/curl/curl-config"
-./configure --enable-vcpkg --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --enable-apps --disable-server --disable-client --disable-manager
+export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
+./configure --enable-vcpkg --with-ssl=$VCPKG_DIR --enable-apps --disable-server --disable-client --disable-manager
diff --git a/linux/ci_configure_libs.sh b/linux/ci_configure_libs.sh
@@ -13,6 +13,5 @@ export VCPKG_DIR="$VCPKG_ROOT/installed/x64-linux"
 
 linux/update_vcpkg.sh
 
-chmod +x "$VCPKG_DIR/share/curl/curl-config"
-export _libcurl_config="$VCPKG_DIR/share/curl/curl-config"
-./configure --enable-vcpkg --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --disable-server --disable-client --disable-manager
+export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
+./configure --enable-vcpkg --with-ssl=$VCPKG_DIR --disable-server --disable-client --disable-manager
diff --git a/linux/ci_configure_manager.sh b/linux/ci_configure_manager.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+if [ ! -d "linux" ]; then
+    echo "start this script in the source root directory"
+    exit 1
+fi
+
+CACHE_DIR="$PWD/3rdParty/buildCache/linux"
+BUILD_DIR="$PWD/3rdParty/linux"
+VCPKG_ROOT="$BUILD_DIR/vcpkg"
+export VCPKG_DIR="$VCPKG_ROOT/installed/x64-linux"
+
+linux/update_vcpkg_manager.sh
+
+export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
+./configure --enable-vcpkg --disable-server --disable-client --with-wx-config=$VCPKG_DIR/tools/wxwidgets/wx-config
diff --git a/linux/update_vcpkg.sh b/linux/update_vcpkg.sh
@@ -19,5 +19,5 @@ fi
 
 git -C $VCPKG_ROOT pull
 $VCPKG_ROOT/bootstrap-vcpkg.sh
-$VCPKG_ROOT/vcpkg install rappture curl[core,openssl] --clean-after-build
+$VCPKG_ROOT/vcpkg install rappture curl[core,openssl] opencl --clean-after-build
 $VCPKG_ROOT/vcpkg upgrade --no-dry-run
diff --git a/linux/update_vcpkg_manager.sh b/linux/update_vcpkg_manager.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+if [ ! -d "linux" ]; then
+    echo "start this script in the source root directory"
+    exit 1
+fi
+
+CACHE_DIR="$PWD/3rdParty/buildCache/linux"
+BUILD_DIR="$PWD/3rdParty/linux"
+VCPKG_ROOT="$BUILD_DIR/vcpkg"
+
+export XDG_CACHE_HOME=$CACHE_DIR/vcpkgcache
+
+if [ ! -d $VCPKG_ROOT ]; then
+    mkdir -p $BUILD_DIR
+    git -C $BUILD_DIR clone https://github.com/JackBoosY/vcpkg -b dev/jack/for-test-only-wxwidgets-3
+fi
+
+git -C $VCPKG_ROOT pull
+$VCPKG_ROOT/bootstrap-vcpkg.sh
+$VCPKG_ROOT/vcpkg install freetype[core,bzip2,png] freeglut ftgl wxwidgets
+$VCPKG_ROOT/vcpkg upgrade --no-dry-run