Use the new nymea-plugininfocompiler for building the matadata.

This commit is contained in:
Michael Zanetti 2019-06-26 21:43:45 +02:00
parent f6a1c77e24
commit 8204e1d3ec
3 changed files with 15 additions and 15 deletions

5
debian/changelog vendored
View File

@ -1,3 +1,8 @@
nymea-plugins (0.14.0) UNRELEASED; urgency=medium
-- Michael Zanetti <michael.zanetti@guh.io> Wed, 26 Jun 2019 21:44:29 +0200
nymea-plugins (0.12.3) xenial; urgency=medium
[ Michael Zanetti ]

2
debian/control vendored
View File

@ -7,6 +7,8 @@ Build-depends: libboblight-dev,
libnymea1-dev,
libnymea-mqtt-dev,
libqt5serialport5-dev,
libqt5websockets5-dev,
nymea-dev-tools:native,
pkg-config,
python:any,
qtbase5-dev,

View File

@ -10,11 +10,6 @@ PKGCONFIG += nymea
HEADERS += $${OUT_PWD}/plugininfo.h \
$${OUT_PWD}/extern-plugininfo.h
# Check if this is a snap build
snappy{
INCLUDEPATH+=$$(SNAPCRAFT_STAGE)/usr/include/nymea
}
# Make the device plugin json file visible in the Qt Creator
OTHER_FILES += $$PWD/$${TARGET}/deviceplugin"$$TARGET".json
@ -23,19 +18,17 @@ OTHER_FILES += $$PWD/$${TARGET}/deviceplugin"$$TARGET".json
# Create plugininfo file
plugininfo.target = $$OUT_PWD/plugininfo.h
extern-plugininfo.target = $$OUT_PWD/extern-plugininfo.h
plugininfo_dummy.target = plugininfo.h
extern-plugininfo_dummy.target = extern-plugininfo.h
plugininfo.depends = FORCE
plugininfo.commands = nymea-generateplugininfo --filetype i --jsonfile $$PWD/$${TARGET}/deviceplugin"$$TARGET".json --output plugininfo.h --builddir $$OUT_PWD
plugininfo.commands = nymea-plugininfocompiler \
$$PWD/$${TARGET}/deviceplugin"$$TARGET".json \
--output $$OUT_PWD/plugininfo.h \
--extern $$OUT_PWD/extern-plugininfo.h
plugininfo_dummy.commands = $$plugininfo.commands
QMAKE_EXTRA_TARGETS += plugininfo plugininfo_dummy
# Create extern-plugininfo file
extern_plugininfo.target = $$OUT_PWD/extern-plugininfo.h
extern_plugininfo_dummy.target = extern-plugininfo.h
extern_plugininfo.depends = FORCE
extern_plugininfo.commands = nymea-generateplugininfo --filetype e --jsonfile $$PWD/$${TARGET}/deviceplugin"$$TARGET".json --output extern-plugininfo.h --builddir $$OUT_PWD
extern_plugininfo_dummy.commands = $$extern_plugininfo.commands
QMAKE_EXTRA_TARGETS += extern_plugininfo extern_plugininfo_dummy
extern-plugininfo.depends = plugininfo
QMAKE_EXTRA_TARGETS += plugininfo plugininfo_dummy extern-plugininfo extern-plugininfo_dummy
# Clean up autogenerated plugin info files
plugininfo_clean.commands = rm -fv $$OUT_PWD/plugininfo.h $$OUT_PWD/extern-plugininfo.h