diff --git a/system-images/android/sdk/build-kde-dependencies b/system-images/android/sdk/build-kde-dependencies index 8eed86f..c0c7902 100755 --- a/system-images/android/sdk/build-kde-dependencies +++ b/system-images/android/sdk/build-kde-dependencies @@ -1,35 +1,35 @@ #!/bin/bash set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH=$DIR:$PATH # we get the repositories for the dependencies git clone --depth 1 kde:sysadmin/ci-tooling || true pushd ci-tooling git clone --depth 1 kde:sysadmin/repo-metadata || true git clone --depth 1 kde:kde-build-metadata || true popd # we figure out the dependencies -all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $@ $EXTRA_PKGS --platform AndroidQt5.12) +all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $@ $EXTRA_PKGS --platform AndroidQt5.13) echo "Dependencies to build: $all_packages" blacklist="`cat $DIR/skip` $SKIP" for a in $extrapackages $all_packages $EXTRA_PKGS do skip=0 for x in $blacklist do if [[ $a =~ ^$x$ ]]; then skip=1 break fi done if [ $skip == 1 ]; then echo "Skipping $a $skip" continue fi build-kde-project $a Frameworks -DBUILD_TESTING=OFF done diff --git a/system-images/android/sdk/build-kde-project b/system-images/android/sdk/build-kde-project index 1868728..ad92c15 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.12 --key externalDependencies) +deps=$(python3 ci-tooling/helpers/getsetting.py --project $project --product $product --platform AndroidQt5.13 --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.12 --key cmake-options) +arguments=$(python3 ci-tooling/helpers/getsetting.py --project $project --product $product --platform AndroidQt5.13 --key cmake-options) build-cmake $project kde:$project $arguments $@ set +e 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.12) + all_packages=$(python3 ci-tooling/helpers/list-dependencies.py --withProject $project --platform AndroidQt5.13) 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 -DCMAKE_PREFIX_PATH=/opt/kdeandroid-deps/ -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 diff --git a/system-images/android/sdk/get-apk-args b/system-images/android/sdk/get-apk-args index 3abb395..1ef677c 100755 --- a/system-images/android/sdk/get-apk-args +++ b/system-images/android/sdk/get-apk-args @@ -1,27 +1,27 @@ #!/bin/bash set -e package=$1 shift DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" manifestFile=`find $(pwd)/src/$package -name AndroidManifest.xml` -targetname=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.12 --key target-name || true) +targetname=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.13 --key target-name || true) if [[ -z "$targetname" && -n "$manifestFile" ]] then targetname=`python3 $DIR/target-from-manifest.py $manifestFile | tr '\n' ';' | head -c -1` EXTRA+=" "-DANDROID_APK_DIR=$(dirname $manifestFile | tr '\n' ';' | head -c -1 ) fi if [[ -z "$targetname" || "$targetname" =~ ".*%%.*" ]] then appdataFile=$(find $(pwd)/src/$package -name "*.appdata.xml") if [[ -z "$appdataFile" ]]; then echo "error: No AndroidManifest.xml or *.appdata.xml file :(" exit 1 fi targetname=`python3 $DIR/target-from-appdata.py $appdataFile | tr '\n' ';' | head -c -1` fi echo "-DQTANDROID_EXPORTED_TARGET=$targetname $EXTRA"