Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework buildmw() to use named arguments #205

Merged
merged 1 commit into from
Mar 1, 2019
Merged

Rework buildmw() to use named arguments #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 37 additions & 21 deletions helpers/build_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function usage() {
echo " -v, --version build droid-hal-version"
echo " -b, --build=PKG build one package (PKG can include path)"
echo " -s, --spec=SPEC optionally used with -m or -b"
echo " can be supplied multiple times to build multiple .spec files at once"
echo " No options assumes building for all areas."
exit 1
}
Expand All @@ -62,6 +63,7 @@ if [ "$#" == "1" ]; then
BUILDVERSION=1
fi

BUILDSPEC_FILE=()
while true; do
case "$1" in
-h|--help) usage ;;
Expand All @@ -79,7 +81,7 @@ while true; do
shift;;
-s|--spec) BUILDSPEC=1
case "$2" in
*) BUILDSPEC_FILE=$2;;
*) BUILDSPEC_FILE+=("$2");;
ix5 marked this conversation as resolved.
Show resolved Hide resolved
esac
shift;;
-v|--version) BUILDVERSION=1 ;;
Expand Down Expand Up @@ -110,7 +112,8 @@ if [ "$BUILDCONFIGS" == "1" ]; then
ret=$?
if [ $ret -eq 104 ]; then
BUILDALL=y
buildmw https://github.com/mer-hybris/community-adaptation.git rpm/community-adaptation-localbuild.spec || die
buildmw -u "https://github.com/mer-hybris/community-adaptation.git" \
-s rpm/community-adaptation-localbuild.spec || die
BUILDALL=n
elif [ $ret -ne 0 ]; then
die "Could not determine if community-adaptation package is available, exiting."
Expand Down Expand Up @@ -142,38 +145,51 @@ if [ "$BUILDMW" == "1" ]; then
pushd $ANDROID_ROOT/hybris/mw > /dev/null

if [ "$BUILDMW_REPO" == "" ]; then
buildmw libhybris || die
buildmw -u "https://github.com/mer-hybris/libhybris" || die

if [ $android_version_major -ge 8 ]; then
buildmw "https://git.merproject.org/mer-core/libglibutil.git" || die
buildmw "https://github.com/mer-hybris/libgbinder" || die
buildmw "https://github.com/mer-hybris/libgbinder-radio" || die
buildmw "https://github.com/mer-hybris/bluebinder" || die
buildmw "https://github.com/mer-hybris/ofono-ril-binder-plugin" || die
buildmw -u "https://git.merproject.org/mer-core/libglibutil.git" || die
buildmw -u "https://github.com/mer-hybris/libgbinder" || die
buildmw -u "https://github.com/mer-hybris/libgbinder-radio" || die
buildmw -u "https://github.com/mer-hybris/bluebinder" || die
buildmw -u "https://github.com/mer-hybris/ofono-ril-binder-plugin" || die
fi
buildmw "https://github.com/mer-hybris/pulseaudio-modules-droid.git" rpm/pulseaudio-modules-droid.spec || die
buildmw "https://github.com/nemomobile/mce-plugin-libhybris.git" || die
buildmw ngfd-plugin-droid-vibrator rpm/ngfd-plugin-native-vibrator.spec || die
buildmw qt5-feedback-haptics-droid-vibrator rpm/qt5-feedback-haptics-native-vibrator.spec || die
buildmw qt5-qpa-hwcomposer-plugin || die
buildmw qt5-qpa-surfaceflinger-plugin || die
buildmw "https://git.merproject.org/mer-core/qtscenegraph-adaptation.git" rpm/qtscenegraph-adaptation-droid.spec || die
buildmw "https://git.merproject.org/mer-core/sensorfw.git" rpm/sensorfw-qt5-hybris.spec || die
buildmw -u "https://github.com/mer-hybris/pulseaudio-modules-droid.git" \
-s rpm/pulseaudio-modules-droid.spec || die
buildmw -u "https://github.com/nemomobile/mce-plugin-libhybris.git" || die
buildmw -u "https://github.com/mer-hybris/ngfd-plugin-droid-vibrator" \
-s rpm/ngfd-plugin-native-vibrator.spec || die
buildmw -u "https://github.com/mer-hybris/qt5-feedback-haptics-droid-vibrator" \
-s rpm/qt5-feedback-haptics-native-vibrator.spec || die
buildmw -u "https://github.com/mer-hybris/qt5-qpa-hwcomposer-plugin" || die
buildmw -u "https://github.com/mer-hybris/qt5-qpa-surfaceflinger-plugin" || die
buildmw -u "https://git.merproject.org/mer-core/qtscenegraph-adaptation.git" \
-s rpm/qtscenegraph-adaptation-droid.spec || die
buildmw -u "https://git.merproject.org/mer-core/sensorfw.git" \
-s rpm/sensorfw-qt5-hybris.spec || die
if [ $android_version_major -ge 8 ]; then
buildmw geoclue-providers-hybris rpm/geoclue-providers-hybris-binder.spec || die
buildmw -u "https://gitub.com/mer-hybris/geoclue-providers-hybris" \
-s rpm/geoclue-providers-hybris-binder.spec || die
else
buildmw geoclue-providers-hybris rpm/geoclue-providers-hybris.spec || die
buildmw -u "https://github.com/mer-hybris/geoclue-providers-hybris" \
-s rpm/geoclue-providers-hybris.spec || die
fi
# build kf5bluezqt-bluez4 if not yet provided by Sailfish OS itself
sb2 -t $VENDOR-$DEVICE-$PORT_ARCH -m sdk-install -R zypper se kf5bluezqt-bluez4 > /dev/null
ret=$?
if [ $ret -eq 104 ]; then
buildmw "https://git.merproject.org/mer-core/kf5bluezqt.git" rpm/kf5bluezqt-bluez4.spec || die
buildmw -u "https://git.merproject.org/mer-core/kf5bluezqt.git" \
-s rpm/kf5bluezqt-bluez4.spec || die
# pull device's bluez4 configs correctly
sb2 -t $VENDOR-$DEVICE-$PORT_ARCH -m sdk-install -R zypper remove bluez-configs-mer
fi
else
buildmw $BUILDMW_REPO $BUILDSPEC_FILE || die
if [[ -z "$BUILDSPEC_FILE" ]]; then
buildmw -u $BUILDMW_REPO || die
else
# Supply all given spec files from $BUILDSPEC_FILE array prefixed with "-s"
buildmw -u $BUILDMW_REPO "${BUILDSPEC_FILE[@]/#/-s }" || die
sledges marked this conversation as resolved.
Show resolved Hide resolved
fi
fi
popd > /dev/null
fi
Expand All @@ -187,7 +203,7 @@ if [ "$BUILDPKG" == "1" ]; then
if [ -z $BUILDPKG_PATH ]; then
echo "--build requires an argument (path to package)"
else
buildpkg $BUILDPKG_PATH $BUILDSPEC_FILE
buildpkg $BUILDPKG_PATH ${BUILDSPEC_FILE[@]}
fi
fi

39 changes: 27 additions & 12 deletions helpers/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,29 @@ function yesnoall() {
esac
}

function buildmw {

GIT_URL="$1"
shift
GIT_BRANCH=""
if [[ "$1" != "" && "$1" != *.spec ]]; then
GIT_BRANCH="-b $1"
shift;
fi
function buildmw() {
# Usage:
# -u URL to use. Will check whether a folder with the same name as the
# git repo is already present in $ANDROID_ROOT/external/* and
# re-use that one.
# -b Branch to use. If none supplied, use default.
# -s .spec file to use. Can be supplied multiple times.
# If empty, will use all .spec files from $PKG/rpm/*.

local GIT_URL=""
local GIT_BRANCH=""
local MW_BUILDSPEC=""
# This is important for getopt or it will fail on the second invocation!
local OPTIND
while getopts 'u:b:s:' _flag
do
case "${_flag}" in
u) GIT_URL="$OPTARG" ;;
b) GIT_BRANCH="-b $OPTARG" ;;
s) MW_BUILDSPEC+="$OPTARG " ;;
*) echo "buildmw(): Unexpected option $_flag"; exit 1; ;;
esac
done

[ -z "$GIT_URL" ] && die "Please give me the git URL (or directory name, if it's already installed)."

Expand Down Expand Up @@ -215,7 +229,7 @@ function buildmw {
sed "s/%{?qa_stage_devel:--enable-arm-tracing}/--enable-arm-tracing/g" -i rpm/libhybris.spec
fi

build $1
build "$MW_BUILDSPEC"

deploy $PKG

Expand All @@ -225,7 +239,7 @@ function buildmw {
}

function build {
SPECS=$1
SPECS=$@
sledges marked this conversation as resolved.
Show resolved Hide resolved
if [ -z "$SPECS" ]; then
minfo "No spec file for package building specified, building all I can find."
SPECS="rpm/*.spec"
Expand Down Expand Up @@ -278,7 +292,8 @@ function buildpkg {
pushd $1 > /dev/null || die "Path not found: $1"
PKG=$(basename $1)
initlog $PKG $(dirname `pwd`)
build $2
shift
build $@
deploy $PKG
popd > /dev/null
}
Expand Down