Commit 8b950524 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

Android: small tooling refactor

parent 3e83dc88
......@@ -2,56 +2,14 @@
set -e
# trap 'err_report echo "error: ${BASH_SOURCE}":"${LINENO}"' exit 1
function buildExternalDependencies
{
deps=$(python3 ci-tooling/helpers/getsetting.py --project $1 --product $2 --platform AndroidQt5.11 --key externalDependencies)
if [[ "$deps" ]]; then
echo "running: $deps"
$deps
else
echo "No dependencies"
fi
}
package=$1
shift
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PATH=$DIR:$PATH
export PERSIST=1
# we get the repositories for the dependencies
git clone kde:sysadmin/ci-tooling || true
pushd ci-tooling
git clone kde:sysadmin/repo-metadata || true
git clone kde:kde-build-metadata || true
popd
# we figure out the dependencies
all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $package $EXTRA_PKGS --platform AndroidQt5.11)
echo "Dependencies to build: $all_packages"
blacklist="`cat $DIR/skip` $SKIP $package"
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
buildExternalDependencies $a Frameworks
package=$1
shift
arguments=$(python3 ci-tooling/helpers/getsetting.py --project $a --product Frameworks --platform AndroidQt5.11 --key cmake-options)
build-cmake $a kde:$a $arguments -DBUILD_TESTING=OFF -GNinja $EXTRA
done
build-kde-dependencies $package
# we now do the actual application separately
......@@ -78,10 +36,8 @@ then
targetname=`python3 $DIR/target-from-appdata.py $appdataFile | tr '\n' ';' | head -c -1`
fi
buildExternalDependencies $package Applications
build-kde-project $package Applications -DQTANDROID_EXPORTED_TARGET=$targetname $EXTRA $@
arguments=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.11 --key cmake-options)
build-cmake $package kde:$package -DQTANDROID_EXPORTED_TARGET=$targetname $EXTRA $arguments $@
pushd build/$package
if [ -f /keys/${package}keystore-config ]; then
......
#!/bin/bash
set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PATH=$DIR:$PATH
export PERSIST=1
# we get the repositories for the dependencies
git clone kde:sysadmin/ci-tooling || true
pushd ci-tooling
git clone kde:sysadmin/repo-metadata || true
git clone kde:kde-build-metadata || true
popd
# we figure out the dependencies
all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $@ $EXTRA_PKGS --platform AndroidQt5.11)
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
#!/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.11 --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.11 --key cmake-options)
build-cmake $project kde:$project $arguments $@
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