lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-10-11 17:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

coin: generate vcpkg attribution files during provisioning

Browse Source 
Run vcpkg_generate_attributions.py after installing the ports, so the
generated qt_attribution.json files and the port index are written in
place into $VCPKG_ROOT/installed, next to the libraries they describe.

The OHOS wrapper needs no change, it delegates to install-vcpkg-ports.sh.

Task-number: QTBUG-150865
Change-Id: Ib9b9cded132dac9b574bcadc05c939e6ed352946
Reviewed-by: Alexandru Croitor <[email protected]>
This commit is contained in:
Joerg Bornemann
2026-10-03 07:50:08 +00:00
parent 7776c20e0d
commit c63b5fb4e5
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coin/provisioning/common/linux/install-vcpkg-ports-android.sh
+6
View File
@@ -12,6 +12,12 @@ mkdir -p "$VCPKG_ROOT/installed"
cp -R x86-android-qt-tmp/* "$VCPKG_ROOT/installed/"
cp -R x86_64-android-qt-tmp/* "$VCPKG_ROOT/installed/"
for triplet in x86-android-qt x86_64-android-qt; do
python3 "${BASH_SOURCE%/*}/../shared/vcpkg_generate_attributions.py" \
--install-root "$VCPKG_ROOT/installed" \
--triplet "$triplet"
done
cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
"-DVCPKG_INSTALL_ROOT=$PWD/x86-android-qt-tmp"\
"-DOUTPUT=$HOME/versions.txt"\
coin/provisioning/common/unix/install-vcpkg-ports.sh
+4
View File
@@ -23,6 +23,10 @@ cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
mkdir -p "$VCPKG_ROOT/installed"
cp -R $install_root/* "$VCPKG_ROOT/installed/"
python3 "${BASH_SOURCE%/*}/../shared/vcpkg_generate_attributions.py" \
--install-root "$VCPKG_ROOT/installed" \
--triplet "$1"
SetEnvVar "VCPKG_INSTALLED_DIR" "$VCPKG_ROOT/installed/"
rm -rf $install_root
coin/provisioning/common/windows/install-vcpkg-ports-android.ps1
+3
View File
@@ -13,6 +13,9 @@ Run-Executable "$vcpkgExe" "install --triplet armeabi-v7a-android-qt --x-install
New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force
Copy-Item -Path "$vcpkgInstallRoot\*" -Destination "$vcpkgRoot\installed" -Recurse -Force
$pythonExe = "$([System.Environment]::GetEnvironmentVariable('PYTHON3_PATH', 'Machine'))\python.exe"
Run-Executable "$pythonExe" "$PSScriptRoot\..\shared\vcpkg_generate_attributions.py --install-root $vcpkgRoot\installed --triplet armeabi-v7a-android-qt"
Run-Executable "cmake" "-DVCPKG_EXECUTABLE=$vcpkgExe -DVCPKG_INSTALL_ROOT=$vcpkgInstallRoot -DOUTPUT=$env:USERPROFILE\versions.txt -P $PSScriptRoot\..\shared\vcpkg_parse_packages.cmake"
Remove-Item -Path "$vcpkgInstallRoot" -Recurse -Force
coin/provisioning/common/windows/install-vcpkg-ports.ps1
+3
View File
@@ -16,6 +16,9 @@ Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root
New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force
Copy-Item -Path "$vcpkginstallroot\*" -Destination "$vcpkgRoot\installed" -Recurse -Force
$pythonExe = "$([System.Environment]::GetEnvironmentVariable('PYTHON3_PATH', 'Machine'))\python.exe"
Run-Executable "$pythonExe" "$PSScriptRoot\..\shared\vcpkg_generate_attributions.py --install-root $vcpkgRoot\installed --triplet $arch-windows-qt"
Run-Executable "cmake" "-DVCPKG_EXECUTABLE=$vcpkgExe -DVCPKG_INSTALL_ROOT=$vcpkgInstallRoot -DOUTPUT=$env:USERPROFILE\versions.txt -P $PSScriptRoot\..\shared\vcpkg_parse_packages.cmake"
Set-EnvironmentVariable "VCPKG_INSTALLED_DIR" "$vcpkgRoot\installed"