Commit 6820eb81 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

Rename AndroidQt5.13 mentions to AndroidQt5.14

parent bc4920fd
......@@ -13,5 +13,5 @@ cacheLocation:
SUSEQt5.12: "/srv/archives/production/SUSEQt5.12/"
SUSEQt5.13: "/srv/archives/production/SUSEQt5.13/"
FreeBSDQt5.13: "/usr/home/jenkins/archives/production/"
AndroidQt5.13: "/srv/archives/production/AndroidQt5.13/"
AndroidQt5.14: "/srv/archives/production/AndroidQt5.14/"
ABIReference: "/srv/archives/production/ABIReference"
......@@ -13,5 +13,5 @@ cacheLocation:
SUSEQt5.12: "/srv/archives/sandbox/SUSEQt5.12/"
SUSEQt5.13: "/srv/archives/sandbox/SUSEQt5.13/"
FreeBSDQt5.13: "/usr/home/jenkins/archives/sandbox/"
AndroidQt5.13: "/srv/archives/sandbox/AndroidQt5.13/"
AndroidQt5.14: "/srv/archives/sandbox/AndroidQt5.14/"
ABIReference: "/srv/archives/sandbox/ABIReference/"
......@@ -16,7 +16,7 @@ allPlatforms = {
'FreeBSDQt5.13': 'FreeBSD',
'WindowsMSVCQt5.14': 'Windows',
None: 'MacOSX',
'AndroidQt5.13': 'Android'
'AndroidQt5.14': 'Android'
}
resolver = Buildable.DependencyResolver()
......
......@@ -8,5 +8,5 @@ android kf5-qt5 qt5.13:
- master
- merge_requests
variables:
PLATFORM: AndroidQt5.13
PLATFORM: AndroidQt5.14
BRANCH_GROUP: kf5-qt5
......@@ -36,7 +36,7 @@
- "frameworks/syndication"
- "frameworks/kpeople"
platforms:
- "AndroidQt5.13"
- "AndroidQt5.14"
branchGroups:
- "kf5-qt5"
notifications:
......@@ -119,7 +119,7 @@
- repositories:
- "kde/kdemultimedia/elisa"
platforms:
- "AndroidQt5.13"
- "AndroidQt5.14"
branchGroups:
- "kf5-qt5"
- "stable-kf5-qt5"
......@@ -232,7 +232,7 @@
platforms:
- "SUSEQt5.13"
- "FreeBSDQt5.13"
- "AndroidQt5.13"
- "AndroidQt5.14"
branchGroups:
- "kf5-qt5"
- "stable-kf5-qt5"
......
......@@ -31,7 +31,7 @@
- 'kde/kdegraphics/libs/libkgeomap'
- 'kde/kdenetwork/kio-extras'
'AndroidQt5.13':
'AndroidQt5.14':
- 'frameworks/kross' # ld: error: cannot find -lc++
- 'frameworks/polkit-qt-1' # requires glib2
- 'frameworks/kwallet' # requires gpgme
......
SUSEQt5.12.template
\ No newline at end of file
......@@ -12,7 +12,7 @@ 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.13)
all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $@ $EXTRA_PKGS --platform AndroidQt5.14)
echo "Dependencies to build: $all_packages"
echo -n "" > /tmp/built
......@@ -33,7 +33,7 @@ do
fi
product=Frameworks
if [[ -f ci-tooling/build-specs/Applications/$a-AndroidQt5.13.yaml ]]; then
if [[ -f ci-tooling/build-specs/Applications/$a-AndroidQt5.14.yaml ]]; then
product=Applications
fi
......
......@@ -9,7 +9,7 @@ shift
product=$1
shift
deps=$(python3 ci-tooling/helpers/getsetting.py --project $project --product $product --platform AndroidQt5.13 --key externalDependencies)
deps=$(python3 ci-tooling/helpers/getsetting.py --project $project --product $product --platform AndroidQt5.14 --key externalDependencies)
if [[ "$deps" ]]; then
echo "running: $deps"
$deps
......@@ -17,7 +17,7 @@ else
echo "No dependencies"
fi
arguments=$(python3 ci-tooling/helpers/getsetting.py --project $project --product $product --platform AndroidQt5.13 --key cmake-options)
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
......@@ -26,7 +26,7 @@ hasTools=$?
set -e
if [ $hasTools -eq 0 ]; then
all_packages=$(python3 ci-tooling/helpers/list-dependencies.py --withProject $project --platform AndroidQt5.13)
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
......
......@@ -7,7 +7,7 @@ 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.13 --key target-name || true)
targetname=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.14 --key target-name || true)
if [[ -z "$targetname" && -n "$manifestFile" ]]
then
targetname=`python3 $DIR/target-from-manifest.py $manifestFile | tr '\n' ';' | head -c -1`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment