From 714068c95c3df67e72b1c38ada6fef2e3f21dee9 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Fri, 18 Jun 2021 06:43:05 +0300 Subject: [PATCH] Compile linux manager with vcpkg --- .github/workflows/linux.yml | 8 ++++++-- deploy/prepare_deployment.sh | 3 +++ linux/ci_configure_apps.sh | 2 -- linux/ci_configure_libs.sh | 2 -- linux/ci_configure_manager.sh | 16 ++++++++++++++++ linux/update_vcpkg.sh | 2 +- linux/update_vcpkg_manager.sh | 23 +++++++++++++++++++++++ 7 files changed, 49 insertions(+), 7 deletions(-) create mode 100755 linux/ci_configure_manager.sh create mode 100755 linux/update_vcpkg_manager.sh diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d2d599d3d68..f7dffd0dddd 100644 --- 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' @@ -68,6 +68,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 diff --git a/deploy/prepare_deployment.sh b/deploy/prepare_deployment.sh index caaf58f6fca..5a57b10a545 100755 --- 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 index e943f97019f..909d5824ae7 100755 --- a/linux/ci_configure_apps.sh +++ b/linux/ci_configure_apps.sh @@ -13,6 +13,4 @@ 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 diff --git a/linux/ci_configure_libs.sh b/linux/ci_configure_libs.sh index 75707393707..ab278cf0062 100755 --- a/linux/ci_configure_libs.sh +++ b/linux/ci_configure_libs.sh @@ -13,6 +13,4 @@ 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 diff --git a/linux/ci_configure_manager.sh b/linux/ci_configure_manager.sh new file mode 100755 index 00000000000..b5f66536c85 --- /dev/null +++ b/linux/ci_configure_manager.sh @@ -0,0 +1,16 @@ +#!/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 + +./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 index 70d308af606..43226b02cd8 100755 --- 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 new file mode 100755 index 00000000000..b073f4ec65e --- /dev/null +++ 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/17072 +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