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

Unify manifests vcpkg files

This commit is contained in:
Tal Regev 2022-06-05 15:18:08 +03:00
parent 5555f021a7
commit 758d93d65c
No known key found for this signature in database
GPG Key ID: A421558E0F87AC82
24 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
android/vcpkg_config_apps/vcpkg.json → 3rdParty/vcpkg_ports/configs/apps/android/vcpkg.json vendored
View File

0
linux/vcpkg_config_apps/vcpkg.json → 3rdParty/vcpkg_ports/configs/apps/linux/vcpkg.json vendored
View File

0
mingw/vcpkg_config_apps/vcpkg.json → 3rdParty/vcpkg_ports/configs/apps/mingw/vcpkg.json vendored
View File

0
linux/vcpkg_config_client/vcpkg.json → 3rdParty/vcpkg_ports/configs/client/vcpkg.json vendored
View File

0
linux/vcpkg_config_libs/vcpkg.json → 3rdParty/vcpkg_ports/configs/libs/vcpkg.json vendored
View File

7
android/vcpkg_config_libs/vcpkg.json → 3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json vendored
View File

@ -5,8 +5,9 @@
[
{
"name": "curl",
"features": ["openssl"],
"features": ["schannel"],
"default-features": false
}
]
},
"openssl"
]
}

0
win_build/vcpkg_config_msbuild_ARM64/vcpkg.json → 3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json vendored
View File

0
win_build/vcpkg_config_msbuild_x64/vcpkg.json → 3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json vendored
View File

7
android/buildAndroidBOINC-CI.sh
View File

@ -119,6 +119,7 @@ if [ "x$build_dir" != "x" ]; then
else
cd ../
BUILD_DIR="$(pwd)/3rdParty/android"
THIRD_PARTY="$(pwd)/3rdParty"
cd android/
fi
@ -244,7 +245,11 @@ if [ $build_with_vcpkg = "yes" ]; then
else
triplets_setup="default"
fi
manifests="--x-manifest-root=vcpkg_config_$component/ --x-install-root=$VCPKG_ROOT/installed/"
manifest_dir=$THIRD_PARTY/vcpkg_ports/configs/$component
if [ $component = "apps" ]; then
manifest_dir=$manifest_dir/android
fi
manifests="--x-manifest-root=$manifest_dir --x-install-root=$VCPKG_ROOT/installed/"
vcpkg_overlay="--overlay-ports=$vcpkg_ports_dir/ports --overlay-triplets=$vcpkg_ports_dir/triplets/$triplets_setup"
vcpkg_flags="$vcpkg_overlay --feature-flags=versions --clean-after-build"
if [ ! -d "$VCPKG_ROOT" ]; then

2
android/ci_build_libs_cmake.sh
View File

@ -35,7 +35,7 @@ for TRIPLET in $TRIPLETS_LIST ; do
export ANDROID_NDK_HOME=$NDK_ROOT
fi
BUILD_TRIPLET=build-$TRIPLET
cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/ -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake --build $BUILD_TRIPLET
echo "\e[1;32m $TRIPLET done \e[0m"

12
android/vcpkg_config_client/vcpkg.json
View File

@ -1,12 +0,0 @@
{
"name": "boinc-client",
"version-string": "7.19.0",
"dependencies":
[
{
"name": "curl",
"features": ["openssl"],
"default-features": false
}
]
}

2
lib/CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.16)
project(libboinc)
project(boinc-libs)
message(WARNING "This build is under development and may not work as expected")

8
lib/vcpkg.json
View File

@ -1,8 +0,0 @@
{
"name": "libboinc",
"version-string": "7.19.0",
"dependencies":
[
"openssl"
]
}

2
linux/ci_configure_libs_cmake.sh
View File

@ -14,4 +14,4 @@ export VCPKG_DIR="$VCPKG_ROOT/installed/x64-linux"
linux/bootstrap_vcpkg_cmake.sh
cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=x64-linux -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/ -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=x64-linux -DVCPKG_INSTALL_OPTIONS=--clean-after-build

2
linux/update_vcpkg_apps.sh
View File

@ -18,4 +18,4 @@ fi
git -C $VCPKG_ROOT pull
$VCPKG_ROOT/bootstrap-vcpkg.sh
$VCPKG_ROOT/vcpkg install --x-manifest-root=linux/vcpkg_config_apps/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --feature-flags=versions --clean-after-build
$VCPKG_ROOT/vcpkg install --x-manifest-root=3rdParty/vcpkg_ports/configs/apps/linux/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --clean-after-build

2
linux/update_vcpkg_client.sh
View File

@ -18,4 +18,4 @@ fi
git -C $VCPKG_ROOT pull
$VCPKG_ROOT/bootstrap-vcpkg.sh
$VCPKG_ROOT/vcpkg install --x-manifest-root=linux/vcpkg_config_client/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --feature-flags=versions --clean-after-build
$VCPKG_ROOT/vcpkg install --x-manifest-root=3rdParty/vcpkg_ports/configs/client/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --clean-after-build

2
linux/update_vcpkg_libs.sh
View File

@ -18,4 +18,4 @@ fi
git -C $VCPKG_ROOT pull
$VCPKG_ROOT/bootstrap-vcpkg.sh
$VCPKG_ROOT/vcpkg install --x-manifest-root=linux/vcpkg_config_libs/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --feature-flags=versions --clean-after-build
$VCPKG_ROOT/vcpkg install --x-manifest-root=3rdParty/vcpkg_ports/configs/libs/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --clean-after-build

2
mingw/ci_configure_libs_cmake.sh
View File

@ -17,4 +17,4 @@ export VCPKG_DIR="$VCPKG_ROOT/installed/$TRIPLET"
$PLATFORM_NAME/bootstrap_vcpkg_cmake.sh
cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/ -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build

2
mingw/update_vcpkg.sh
View File

@ -19,4 +19,4 @@ fi
git -C $VCPKG_ROOT pull
$VCPKG_ROOT/bootstrap-vcpkg.sh
$VCPKG_ROOT/vcpkg install --x-manifest-root=mingw/vcpkg_config_apps/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-mingw-static --feature-flags=versions --clean-after-build
$VCPKG_ROOT/vcpkg install --x-manifest-root=3rdParty/vcpkg_ports/configs/apps/mingw --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-mingw-static --clean-after-build

2
osx/ci_build_libs_cmake.sh
View File

@ -20,7 +20,7 @@ for TRIPLET in $TRIPLETS_LIST ; do
echo "\033[0;35m building $TRIPLET ... \033[0m"
BUILD_TRIPLET=build-$TRIPLET
cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/ -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake --build $BUILD_TRIPLET
echo "\033[1;32m $TRIPLET done \033[0m"

19
set-version.py
View File

@ -80,16 +80,15 @@ def set_build_gradle(version):
f.write(line)
def set_vcpkg_json(version):
for json in ['android/vcpkg_config_apps/vcpkg.json',
'android/vcpkg_config_client/vcpkg.json',
'android/vcpkg_config_libs/vcpkg.json',
'lib/vcpkg.json',
'linux/vcpkg_config_apps/vcpkg.json',
'linux/vcpkg_config_client/vcpkg.json',
'linux/vcpkg_config_libs/vcpkg.json',
'mingw/vcpkg_config_apps/vcpkg.json',
'win_build/vcpkg_config_msbuild_ARM64/vcpkg.json',
'win_build/vcpkg_config_msbuild_x64/vcpkg.json']:
for json in ['3rdParty/vcpkg_ports/configs/libs/vcpkg.json',
'3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json',
'3rdParty/vcpkg_ports/configs/client/vcpkg.json',
'3rdParty/vcpkg_ports/configs/apps/android/vcpkg.json',
'3rdParty/vcpkg_ports/configs/apps/linux/vcpkg.json',
'3rdParty/vcpkg_ports/configs/apps/mingw/vcpkg.json',
'3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json',
'3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json',
]:
with open(json, 'r') as f:
lines = f.readlines()
with open(json, 'w') as f:

1
win_build/boinc.props
View File

@ -1,6 +1,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Windows3rdPartyBuildDir Condition="'$(Windows3rdPartyBuildDir)' == ''">$(MSBuildThisFileDirectory)..\3rdParty\Windows</Windows3rdPartyBuildDir>
<VcpkgConfigsDir Condition="'$(VcpkgConfigsDir)' == ''">$(MSBuildThisFileDirectory)..\3rdParty\vcpkg_ports\configs\msbuild</VcpkgConfigsDir>
<VcpkgRootDir Condition="'$(VcpkgRootDir)' == ''">$(Windows3rdPartyBuildDir)\vcpkg</VcpkgRootDir>
<VcpkgExe>$(VcpkgRootDir)\vcpkg.exe</VcpkgExe>
<VcpkgTripletConfig Condition="'$(VcpkgTripletConfig)' == ''">default</VcpkgTripletConfig>

2
win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj
View File

@ -172,6 +172,6 @@
<Exec Command="bootstrap-vcpkg.bat" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
</Target>
<Target Name="Build3rdPartyLibraries" BeforeTargets="ClCompile" DependsOnTargets="InstallVcpkg" AfterTargets="InstallVcpkg">
<Exec Command="vcpkg.exe install --x-manifest-root=$(ProjectDir)/vcpkg_config_msbuild_$(Platform) --x-install-root=installed/ --overlay-ports=../../vcpkg_ports/ports --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName) --clean-after-build" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" ContinueOnError="WarnAndContinue" />
<Exec Command="vcpkg.exe install --x-manifest-root=$(VcpkgConfigsDir)/$(Platform) --x-install-root=$(VcpkgRootDir)/installed/ --overlay-ports=../../vcpkg_ports/ports --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName) --clean-after-build" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" ContinueOnError="WarnAndContinue" />
</Target>
</Project>

2
windows/ci_build_libs_cmake.bat
View File

@ -27,5 +27,5 @@ set "VCPKG_ROOT=%BUILD_DIR%\vcpkg"
call windows\bootstrap_vcpkg_cmake.bat
cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake -DVCPKG_OVERLAY_PORTS=%VCPKG_PORTS%\ports -DVCPKG_OVERLAY_TRIPLETS=%VCPKG_PORTS%\triplets\ci -DVCPKG_TARGET_TRIPLET=%PLATFORM%-windows-static -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/windows -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=%VCPKG_PORTS%\ports -DVCPKG_OVERLAY_TRIPLETS=%VCPKG_PORTS%\triplets\ci -DVCPKG_TARGET_TRIPLET=%PLATFORM%-windows-static -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake --build build --config %CONFIGURATION%