diff --git a/archive-configs/production.yaml b/archive-configs/production.yaml --- a/archive-configs/production.yaml +++ b/archive-configs/production.yaml @@ -14,4 +14,4 @@ SUSEQt5.9: "/srv/archives/production/SUSEQt5.9/" SUSEQt5.10: "/srv/archives/production/SUSEQt5.10/" FreeBSDQt5.9: "/usr/home/jenkins/archives/production/" - AndroidQt5.9: "/srv/archives/production/AndroidQt5.9/" + AndroidQt5.10: "/srv/archives/production/AndroidQt5.10/" diff --git a/archive-configs/sandbox.yaml b/archive-configs/sandbox.yaml --- a/archive-configs/sandbox.yaml +++ b/archive-configs/sandbox.yaml @@ -14,4 +14,4 @@ SUSEQt5.9: "/srv/archives/sandbox/SUSEQt5.9/" SUSEQt5.10: "/srv/archives/sandbox/SUSEQt5.10/" FreeBSDQt5.9: "/usr/home/jenkins/archives/sandbox/" - AndroidQt5.9: "/srv/archives/sandbox/AndroidQt5.9/" + AndroidQt5.10: "/srv/archives/sandbox/AndroidQt5.10/" diff --git a/build-specs/Frameworks/kcoreaddons-AndroidQt5.9.yaml b/build-specs/Frameworks/kcoreaddons-AndroidQt5.10.yaml rename from build-specs/Frameworks/kcoreaddons-AndroidQt5.9.yaml rename to build-specs/Frameworks/kcoreaddons-AndroidQt5.10.yaml diff --git a/helpers/check-platform.py b/helpers/check-platform.py --- a/helpers/check-platform.py +++ b/helpers/check-platform.py @@ -15,7 +15,7 @@ 'FreeBSDQt5.9': 'FreeBSD', 'WindowsMSVCQt5.10': 'Windows', None: 'MacOSX', - 'AndroidQt5.9': 'Android' + 'AndroidQt5.10': 'Android' } resolver = Buildable.DependencyResolver() diff --git a/local-metadata/product-definitions.yaml b/local-metadata/product-definitions.yaml --- a/local-metadata/product-definitions.yaml +++ b/local-metadata/product-definitions.yaml @@ -27,7 +27,7 @@ - "frameworks/kjobwidgets" - "frameworks/kcompletion" platforms: - - "AndroidQt5.9" + - "AndroidQt5.10" branchGroups: - "kf5-qt5" notifications: diff --git a/local-metadata/project-ignore-rules.yaml b/local-metadata/project-ignore-rules.yaml --- a/local-metadata/project-ignore-rules.yaml +++ b/local-metadata/project-ignore-rules.yaml @@ -32,7 +32,7 @@ - 'kde/kdeutils/kgpg' - 'kde/kdeedu/marble' - 'kde/kdegraphics/libs/libkgeomap' -'AndroidQt5.9': +'AndroidQt5.10': #requires dbus - 'frameworks/kwallet' - 'frameworks/kbookmarks' diff --git a/pipeline-templates/AndroidQt5.9.template b/pipeline-templates/AndroidQt5.10.template rename from pipeline-templates/AndroidQt5.9.template rename to pipeline-templates/AndroidQt5.10.template diff --git a/pipeline-templates/dependency-build/AndroidQt5.9.template b/pipeline-templates/dependency-build/AndroidQt5.10.template rename from pipeline-templates/dependency-build/AndroidQt5.9.template rename to pipeline-templates/dependency-build/AndroidQt5.10.template diff --git a/system-images/android/sdk/Dockerfile b/system-images/android/sdk/Dockerfile --- a/system-images/android/sdk/Dockerfile +++ b/system-images/android/sdk/Dockerfile @@ -1,5 +1,5 @@ -# https://github.com/rabits/dockerfiles/blob/master/5.9-android/Dockerfile -FROM rabits/qt:5.9-android +# https://github.com/rabits/dockerfiles/blob/master/5.10-android/Dockerfile +FROM rabits/qt:5.10-android LABEL Description="KDE Android SDK" MAINTAINER Aleix Pol Gonzalez @@ -28,12 +28,12 @@ COPY gitconfig $HOME/.gitconfig # pull some generally required deps -RUN GIT_EXTRA="--single-branch --branch 5.9" /opt/helpers/build-qt qtscript git://code.qt.io/qt/qtscript.git +RUN GIT_EXTRA="--single-branch --branch 5.10" /opt/helpers/build-qt qtscript git://code.qt.io/qt/qtscript.git RUN /opt/helpers/build-cmake-native extra-cmake-modules kde:extra-cmake-modules -DCMAKE_INSTALL_PREFIX=/opt/kdeandroid-deps -DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/kdeandroid-deps" RUN /opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git # compile kf5 tooling -RUN cd && git clone git://code.qt.io/qt/qtbase.git --single-branch --branch 5.9 && cd qtbase \ +RUN cd && git clone git://code.qt.io/qt/qtbase.git --single-branch --branch 5.10 && cd qtbase \ && QMAKESPEC= ./configure -prefix /opt/nativetooling -opensource -confirm-license -no-gui -release -optimize-size -nomake tests -nomake examples -no-feature-concurrent \ && QMAKESPEC= make -j4 && QMAKESPEC= make install && rm -rf ~/qtbase RUN /opt/helpers/build-cmake-native kconfig kde:kconfig -DCMAKE_INSTALL_PREFIX=/opt/nativetooling -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH=/opt/kdeandroid-deps/ -DBUILD_TESTING=OFF -DQt5_DIR=/opt/nativetooling/lib/cmake/Qt5 -DKCONFIG_USE_GUI=OFF diff --git a/system-images/android/sdk/build-generic b/system-images/android/sdk/build-generic --- a/system-images/android/sdk/build-generic +++ b/system-images/android/sdk/build-generic @@ -16,7 +16,7 @@ popd # we figure out the dependencies -all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $package --platform AndroidQt5.9) +all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $package --platform AndroidQt5.10) echo "Dependencies to build: $all_packages" blacklist="extra-cmake-modules oxygen breeze $package" @@ -26,7 +26,7 @@ continue fi - arguments=$(python3 ci-tooling/helpers/getsetting.py --project $a --product Frameworks --platform AndroidQt5.9 --key cmake-options) + arguments=$(python3 ci-tooling/helpers/getsetting.py --project $a --product Frameworks --platform AndroidQt5.10 --key cmake-options) build-cmake $a kde:$a $arguments -DBUILD_TESTING=OFF done @@ -38,7 +38,7 @@ popd manifestFile=`find $(pwd)/src/$package -name AndroidManifest.xml` targetname=`python3 $DIR/target-from-manifest.py $manifestFile` -arguments=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.9 --key cmake-options) +arguments=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.10 --key cmake-options) PERSIST=1 build-cmake $package kde:$package -DANDROID_SDK_BUILD_TOOLS_REVISION=21.1.2 -DQTANDROID_EXPORTED_TARGET=$targetname -DANDROID_APK_DIR=$(dirname $manifestFile) $arguments $@ pushd build/$package