Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Compile Linux with vcpkg

This commit is contained in:
Tal Regev 2021-04-10 01:52:34 +03:00
parent 6bffda0485
commit 0a9ffd4c58
7 changed files with 85 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.github/workflows/linux.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
type: [libs, server, client, apps, manager-with-webview, manager-without-webview, unit-test, integration-test]
type: [libs, client, apps, libs-vcpkg, client-vcpkg, apps-vcpkg, server, manager-with-webview, manager-without-webview, unit-test, integration-test]
fail-fast: false
steps:
- uses: actions/checkout@v2
@ -41,25 +41,37 @@ jobs:
restore-keys: linux-${{ matrix.type }}-
- name: Automake
if: ${{ success() }}
if: success()
run: ./_autosetup
- name: Configure libs
if: ${{ success() && matrix.type == 'libs' }}
if: success() && matrix.type == 'libs'
run: ./configure --disable-server --disable-client --disable-manager
- name: Configure server
if: ${{ success() && matrix.type == 'server' }}
run: ./configure --enable-server --disable-client --disable-manager
- name: Configure client
if: ${{ success() && matrix.type == 'client' }}
if: success() && matrix.type == 'client'
run: ./configure --disable-server --enable-client --disable-manager
- name: Configure apps
if: success() && matrix.type == 'apps'
run: ./configure --enable-apps --disable-server --disable-client --disable-manager
- name: Configure vcpkg libs
if: success() && matrix.type == 'libs-vcpkg'
run: linux/ci_configure_libs.sh
- name: Configure vcpkg client
if: success() && matrix.type == 'client-vcpkg'
run: linux/ci_configure_client.sh
- name: Configure vcpkg apps
if: success() && matrix.type == 'apps-vcpkg'
run: linux/ci_configure_apps.sh
- name: Configure server
if: success() && matrix.type == 'server'
run: ./configure --enable-server --disable-client --disable-manager
- name: Configure manager with webview
if: success() && matrix.type == 'manager-with-webview'
run: ./3rdParty/buildLinuxDependencies.sh && ./configure --disable-server --disable-client --with-wx-prefix=${GITHUB_WORKSPACE}/3rdParty/buildCache/linux
@ -85,7 +97,7 @@ jobs:
run: ./integration_test/executeTestSuite.sh
- name: Deploy to BinTray
if: ${{ success() && ! contains(matrix.type, 'libs') && ! contains(matrix.type, 'server') && ! contains(matrix.type, 'test') }}
if: success() && ! contains(matrix.type, 'libs') && ! contains(matrix.type, 'server') && ! contains(matrix.type, 'test')
env:
BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
PULL_REQUEST: ${{ github.event.number }}

6
deploy/prepare_deployment.sh
View File

@ -192,6 +192,12 @@ case $TYPE in
linux_apps)
prepare_apps
;;
linux_client-vcpkg)
prepare_client
;;
linux_apps-vcpkg)
prepare_apps
;;
linux_manager-with-webview)
prepare_manager
;;

9
linux/ci_configure_apps.sh
View File

@ -6,6 +6,13 @@ if [ ! -d "linux" ]; then
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.sh
./configure --enable-apps --enable-vcpkg --disable-server --disable-client --disable-manager
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

18
linux/ci_configure_client.sh Executable file
View File

@ -0,0 +1,18 @@
#!/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.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 --enable-client --disable-manager

18
linux/ci_configure_libs.sh Executable file
View File

@ -0,0 +1,18 @@
#!/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.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

22
linux/update_vcpkg.sh
View File

@ -6,18 +6,18 @@ if [ ! -d "linux" ]; then
exit 1
fi
cache_dir="$PWD/3rdParty/buildCache/linux"
build_dir="$PWD/3rdParty/linux"
vcpkg_root="$build_dir/vcpkg"
CACHE_DIR="$PWD/3rdParty/buildCache/linux"
BUILD_DIR="$PWD/3rdParty/linux"
VCPKG_ROOT="$BUILD_DIR/vcpkg"
export XDG_CACHE_HOME=$cache_dir/vcpkgcache
export XDG_CACHE_HOME=$CACHE_DIR/vcpkgcache
if [ ! -d $vcpkg_root ]; then
mkdir -p $build_dir
git -C $build_dir clone https://github.com/microsoft/vcpkg
if [ ! -d $VCPKG_ROOT ]; then
mkdir -p $BUILD_DIR
git -C $BUILD_DIR clone https://github.com/microsoft/vcpkg
fi
git -C $vcpkg_root pull
$vcpkg_root/bootstrap-vcpkg.sh
$vcpkg_root/vcpkg install rappture --clean-after-build
$vcpkg_root/vcpkg upgrade --no-dry-run
git -C $VCPKG_ROOT pull
$VCPKG_ROOT/bootstrap-vcpkg.sh
$VCPKG_ROOT/vcpkg install rappture curl[core,openssl] --clean-after-build
$VCPKG_ROOT/vcpkg upgrade --no-dry-run

3
m4/libcurl.m4
View File

@ -123,6 +123,9 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
powerpc-apple-darwin7*)
LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
;;
x86_64-pc-linux-gnu)
LIBCURL=`echo $LIBCURL -ldl`
;;
armv6-*)
LIBCURL="-lcurl -lssl -lcrypto -lz -latomic"
;;