ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #422: Enable building on Ubuntu 21.04

Browse Source
This commit is contained in:
Jenkins nymea 2021-05-21 15:13:51 +02:00
commit c5eee7844e
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -7,7 +7,6 @@ Homepage: https://nymea.io
Vcs-Git: https://github.com/nymea/nymea.git Vcs-Git: https://github.com/nymea/nymea.git
Build-Depends: debhelper (>= 9.0.0), Build-Depends: debhelper (>= 9.0.0),
dbus-test-runner, dbus-test-runner,
dh-systemd,
dpkg-dev (>= 1.16.1~), dpkg-dev (>= 1.16.1~),
libnymea-mqtt-dev (>= 0.1.2), libnymea-mqtt-dev (>= 0.1.2),
libnymea-networkmanager-dev (>= 0.4.0), libnymea-networkmanager-dev (>= 0.4.0),
@ -22,7 +21,6 @@ Build-Depends: debhelper (>= 9.0.0),
rsync, rsync,
qml-module-qtquick2, qml-module-qtquick2,
qtchooser, qtchooser,
qt5-default,
qt5-qmake:native, qt5-qmake:native,
qtbase5-dev, qtbase5-dev,
qttools5-dev-tools, qttools5-dev-tools,

2
debian/nymea-tests.install.in vendored
View File

@ -1,3 +1,3 @@
usr/tests/* usr/lib/@DEB_HOST_MULTIARCH@/nymea/tests usr/tests/*
usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginmock.so usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginmock.so
usr/lib/@DEB_HOST_MULTIARCH@/libnymea-testlib.so* usr/lib/@DEB_HOST_MULTIARCH@/libnymea-testlib.so*

4
debian/rules vendored
View File

@ -42,9 +42,9 @@ override_dh_auto_build:
override_dh_install: $(PREPROCESS_FILES:.in=) override_dh_install: $(PREPROCESS_FILES:.in=)
# libnymea-core isn't public api... delete dev lib and just keep runtime libs. # libnymea-core isn't public api... delete dev lib and just keep runtime libs.
rm $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnymea-core.so rm $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnymea-core.so
# Make sure the docs directory exists, even if we didn't build them
mkdir -p $(CURDIR)/doc/html
dh_install --fail-missing dh_install --fail-missing
# installing the documentation as there is no extra install target
cp -a $(CURDIR)/doc/html $(CURDIR)/debian/nymea-doc/usr/share/doc/nymea/ || true
override_dh_auto_test: override_dh_auto_test:
dh_auto_test -- -k TESTARGS="-m 120 -p -o -p -,txt -p -o -p test-results.xml,xunitxml" TESTRUNNER="dbus-test-runner --bus-type=both --task" dh_auto_test -- -k TESTARGS="-m 120 -p -o -p -,txt -p -o -p test-results.xml,xunitxml" TESTRUNNER="dbus-test-runner --bus-type=both --task"