diff --git a/system-images/android/sdk/Dockerfile-kf5 b/system-images/android/sdk/Dockerfile-kf5 index 737bf64..5746fca 100644 --- a/system-images/android/sdk/Dockerfile-kf5 +++ b/system-images/android/sdk/Dockerfile-kf5 @@ -1,3 +1,3 @@ FROM kdeorg/android-sdk -RUN /opt/helpers/build-kde-dependencies kf5umbrella && rm -rf src/* && rm -rf build/* +RUN /opt/helpers/build-kde-dependencies kf5umbrella && rm -rf src/* && rm -rf build-*/* RUN cat /opt/helpers/skip /tmp/built > /tmp/newskip && sudo mv /tmp/newskip /opt/helpers/ diff --git a/system-images/android/sdk/build-kde-project b/system-images/android/sdk/build-kde-project index 0cb94a7..b813645 100755 --- a/system-images/android/sdk/build-kde-project +++ b/system-images/android/sdk/build-kde-project @@ -1,37 +1,37 @@ #!/bin/bash set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH=$DIR:$PATH project=$1 shift product=$1 shift deps=$(python3 ci-tooling/helpers/getsetting.py --project $project --product $product --platform AndroidQt5.14 --key externalDependencies) if [[ "$deps" ]]; then echo "running: $deps" $deps else echo "No dependencies" fi arguments=$(python3 ci-tooling/helpers/getsetting.py --project $project --product $product --platform AndroidQt5.14 --key cmake-options) build-cmake $project kde:$project $arguments $@ set +e -grep ToolsTargets.cmake$ build/$project/install_manifest.txt > /dev/null +grep ToolsTargets.cmake$ build-*/$project/install_manifest.txt > /dev/null hasTools=$? set -e if [ $hasTools -eq 0 ]; then all_packages=$(python3 ci-tooling/helpers/list-dependencies.py --withProject $project --platform AndroidQt5.14) echo "Dependencies to build for native $project: $all_packages" for a in $all_packages; do BUILD=build-native build-cmake-native $a kde:$a -DCMAKE_INSTALL_PREFIX=/opt/nativetooling -DBUILD_TESTING=OFF -DQt5_DIR=/opt/nativetooling/lib/cmake/Qt5 -DKCONFIG_USE_GUI=OFF -DQt5Core_DIR=/opt/nativetooling/lib/cmake/Qt5Core -DQt5Qml_DIR=/opt/nativetooling/lib/cmake/Qt5Qml -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=ON done else echo "No tooling $hasTools" fi