Commit 8b3aa09c authored by Peter Putz's avatar Peter Putz

build on amd64 with clickable --desktop

parent 6d903c64
Pipeline #29411287 failed with stage
in 3 minutes and 37 seconds
......@@ -10,3 +10,12 @@ git submodule update --init --recursive upstream/
clickable
```
# on the desktop
changed clickable.json enclosed
`clickable --desktop`
`./run-dekko2`
but, no, no luck, errors out:
http://paste.ubuntu.com/p/NwrgbRnmzj/
#!/bin/bash
BUILDDIR=.build-armhf
BUILDDIR=.build-amd64
function install_python_deps
{
PYTHON_DEPS="bs4 cssutils encutils html2text jinja2 markdown markupsafe pygments pynliner"
PYTHON_DEPS_DIR=pylibs/lib/python3.5/site-packages/
#DEKKO_PYTHON_DIR=${BUILDDIR}/release/install-root/lib/arm-linux-gnueabihf/Dekko/Python/
#DEKKO_PYTHON_DIR=${BUILDDIR}/release/install-root/lib/x86_64-linux-gnu/Dekko/Python/
DEKKO_PYTHON_DIR=${BUILDDIR}/release/install-root/lib/Dekko/Python/
for dep in $PYTHON_DEPS; do
cp -r $PYTHON_DEPS_DIR/$dep $DEKKO_PYTHON_DIR
done
}
# to be executed from ${BUILDDIR}/release/install-root/
cd ../../..
#qbs setup-toolchains /usr/bin/arm-linux-gnueabihf-gcc gcc-armhf
#qbs setup-qt /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake dekkoqt5-armhf
#qbs config profiles.dekkoqt5-armhf.baseProfile gcc-armhf
#qbs config profiles.dekkoqt5-armhf.Qt.core.binPath /usr/lib/x86_64-linux-gnu/qt5/bin
qbs setup-toolchains --detect
export QT_SELECT=qt5
qbs setup-qt /usr/bin/qmake dekkoqt5
qbs config profiles.dekkoqt5.baseProfile gcc
# export DIR_PREFIX=/lib/arm-linux-gnueabihf
export DIR_PREFIX=/lib
export BIN_DIR=$DIR_PREFIX/bin
export LIB_DIR=$DIR_PREFIX
export DATA_DIR=/usr/share/dekko
export QML_DIR=$LIB_DIR
export BUILD_DIR=$(pwd)/${BUILDDIR}
qbs build -d $BUILD_DIR -f . --clean-install-root --show-progress release project.click:true project.pyotherside:false project.binDir:$BIN_DIR project.libDir:$LIB_DIR project.qmlDir:$QML_DIR project.dataDir:$DATA_DIR profile:dekkoqt5
install_python_deps
{
"template": "custom",
"build": "../../../build-armhf.sh",
"build": "../../../build-amd64.sh",
"specificDependencies": "true",
"dir": ".build-armhf/release/install-root/",
"dir": ".build-amd64/release/install-root/",
"sdk": "ubuntu-sdk-16.04",
"dependencies": [
"binfmt-support", "libaccounts-qt5-dev:armhf", "libconnectivity-qt1-dev:armhf", "libexpat1-dev", "libpipeline1", "libpython3-dev", "libpython3.5", "libpython3.5-dev", "libqbscore1.10", "libqbsqtprofilesetup1.10", "libqt5script5", "libsasl2-dev:armhf", "libsasl2-modules:armhf", "libsignon-plugins-common1:armhf", "libsignon-qt5-dev:armhf", "libsnappy-dev:armhf", "libsnappy1v5:armhf", "python-pip-whl", "python3-dev", "python3-pip", "python3-setuptools", "python3-wheel", "python3.5-dev", "qbs", "qbs-common", "qemu-user-static", "qml-module-qtquick-privatewidgets:armhf", "qt5-qmake-bin:armhf", "signon-plugin-oauth2:armhf", "signon-plugin-oauth2-dev:armhf", "signon-plugin-sasl:armhf", "signon-plugin-sasl-dev:armhf", "zlib1g-dev"
"binfmt-support", "libaccounts-qt5-dev", "libconnectivity-qt1-dev", "libexpat1-dev", "libpipeline1", "libpython3-dev", "libpython3.5", "libpython3.5-dev", "libqbscore1.10", "libqbsqtprofilesetup1.10", "libqt5script5", "libsasl2-dev", "libsasl2-modules", "libsignon-plugins-common1", "libsignon-qt5-dev", "libsnappy-dev", "libsnappy1v5", "python-pip-whl", "python3-dev", "python3-pip", "python3-setuptools", "python3-wheel", "python3.5-dev", "qbs", "qbs-common", "qemu-user-static", "qml-module-qtquick-privatewidgets", "qt5-qmake-bin", "signon-plugin-oauth2", "signon-plugin-oauth2-dev", "signon-plugin-sasl", "signon-plugin-sasl-dev", "zlib1g-dev", "python3-pip", "python-dev"
]
}
#! /bin/bash
BUILD=__dekko_build
BUILD=.build-amd64
DBGREL=debug
DBGREL=release
set -e
qbs build -d ../__dekko_build -f . --clean-install-root debug profile:dekkoqt5
# for click qbs build -d ../__dekko_build -f . --clean-install-root debug project.click:true profile:dekkoqt5
qbs build -d ../${BUILD} -f . --clean-install-root ${DBGREL} profile:dekkoqt5
# for click qbs build -d ../${BUILD} -f . --clean-install-root debug project.click:true profile:dekkoqt5
export LD_LIBRARY_PATH=$PWD/../__dekko_build/dekkoqt5-debug/install-root/lib
export LD_LIBRARY_PATH=$PWD/../${BUILD}/dekkoqt5-${DBGREL}/install-root/lib
export QML2_IMPORT_PATH=$LD_LIBRARY_PATH
export QMF_PLUGINS=$LD_LIBRARY_PATH/qmf/plugins5
export DEKKO_PLUGINS=$LD_LIBRARY_PATH/Dekko/plugins
......@@ -19,7 +23,7 @@ echo $1
if [ "$1" == "daemon" ]; then
echo "Starting daemon"
exec $PWD/../__dekko_build/dekkoqt5-debug/install-root/bin/dekkod
exec $PWD/../${BUILD}/dekkoqt5-${DBGREL}/install-root/bin/dekkod
else
exec $PWD/../__dekko_build/dekkoqt5-debug/install-root/bin/dekko $@
exec $PWD/../${BUILD}/dekkoqt5-${DBGREL}/install-root/bin/dekko $@
fi
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