[unet-capnp]: initial commit

Etersoft · Jul 10, 2021 · 3c81ac3 · 3c81ac3
1 parent d9a0a80
commit 3c81ac3
Show file tree

Hide file tree

Showing 20 changed files with 1,380 additions and 142 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: install packages
         run: |
-          sudo apt-get install libcomedi-dev libpoco-dev libmysqlclient-dev libomniorb4-dev libprotobuf-dev protobuf-compiler \
+          sudo apt-get install libcomedi-dev libpoco-dev libmysqlclient-dev libomniorb4-dev libcapnp-dev capnproto \
           libev-dev omniidl xsltproc librrd-dev libsigc++-2.0-dev \
           libsqlite3-dev python-dev libmosquittopp-dev libpoco-dev swig
           wget https://github.com/catchorg/Catch2/releases/download/v1.11.0/catch.hpp -O include/catch.hpp
@@ -57,7 +57,7 @@ jobs:
          # due broken comedi
          export CXXFLAGS="$CXXFLAGS -Wl,--unresolved-symbols=ignore-in-shared-libs"
          # regenerate proto files
-         cd extensions/UNetUDP/proto && make && cd -;
+         cd extensions/UNetUDP/capnp && make && cd -;
          autoreconf -fiv
          ./configure --disable-python --disable-netdata --disable-pgsql
          make

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
@@ -17,7 +17,7 @@ jobs:
             apt-get update && apt-get -y install etersoft-build-utils su sudo \
             git-core ccache gcc-c++ etersoft-build-utils catch-devel \
             libcomedi-devel libmariadb-devel libpqxx-devel librrd-devel libsqlite3-devel \
-            libxml2-devel libsigc++2-devel libpoco-devel libev-devel libomniORB-devel libmosquitto-devel libprotobuf-devel \
+            libxml2-devel libsigc++2-devel libpoco-devel libev-devel libomniORB-devel libmosquitto-devel capnproto capnproto-devel \
             xsltproc python-devel python-module-distribute libomniORB-names libomniORB-idl libomniORB-utils swig
       - uses: actions/checkout@v2
       - name: configure

diff --git a/conf/libuniset2.spec b/conf/libuniset2.spec
@@ -40,11 +40,14 @@ Source: %name-%version.tar
 
 # Automatically added by buildreq on Fri Aug 26 2016
 # optimized out: fontconfig libgpg-error libsasl2-3 libsqlite3-devel libstdc++-devel libwayland-client libwayland-server perl pkg-config python-base python-devel python-module-omniidl python-modules python3
-BuildRequires: gcc-c++ libev-devel libomniORB-devel libpoco-devel libsigc++2-devel libxml2-devel xsltproc libprotobuf-devel
+BuildRequires: gcc-c++ libev-devel libomniORB-devel libpoco-devel libsigc++2-devel libxml2-devel xsltproc capnproto-devel
 
 # for uniset2-codegen
 BuildPreReq: xsltproc
 
+# for capnp
+BuildPreReq: capnproto
+
 # due -std=c++11 using
 # BuildPreReq: gcc5 >= 4.8
 # Must be gcc >= 4.7
@@ -369,7 +372,7 @@ Libraries needed to develop for uniset MQTT extension
 %setup
 
 %build
-cd extensions/UNetUDP/proto && make && cd -;
+cd extensions/UNetUDP/capnp && make && cd -;
 %autoreconf
 %configure %{subst_enable docs} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable pgsql} %{subst_enable python} %{subst_enable rrd} %{subst_enable io} %{subst_enable logicproc} %{subst_enable tests} %{subst_enable mqtt} %{subst_enable api} %{subst_enable netdata} %{subst_enable logdb} %{subst_enable com485f} %{subst_enable opentsdb} %{subst_enable uwebsocket}
 %make_build

diff --git a/configure.ac b/configure.ac
@@ -40,7 +40,7 @@ AC_SUBST(ASTYLE_OPT)
 PKG_CHECK_MODULES(XML, libxml-2.0)
 PKG_CHECK_MODULES(OMNI, omniORB4)
 PKG_CHECK_MODULES(SIGC, sigc++-2.0)
-PKG_CHECK_MODULES(PROTOBUF, protobuf)
+PKG_CHECK_MODULES(CAPNP, capnp)
 
 checklibev=true
 PKG_CHECK_MODULES(EV, libev, [ checklibev=false; ], [ checklibev=true; ])

diff --git a/extensions/UNetUDP/Makefile.am b/extensions/UNetUDP/Makefile.am
@@ -8,32 +8,32 @@ libUniSet2UNetUDP_la_LDFLAGS  = -version-info $(UNETUDP_VER)
 libUniSet2UNetUDP_la_LIBADD   = $(top_builddir)/lib/libUniSet2.la \
 				$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 				$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-                                $(SIGC_LIBS) $(POCO_LIBS) $(PROTOBUF_LIBS)
-libUniSet2UNetUDP_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS) $(PROTOBUF_CFLAGS)
-libUniSet2UNetUDP_la_SOURCES 	= proto/unet.pb.cc UDPPacket.cc UDPTransport.cc MulticastTransport.cc UNetReceiver.cc UNetSender.cc UNetExchange.cc
+                                $(SIGC_LIBS) $(POCO_LIBS) $(CAPNP_LIBS)
+libUniSet2UNetUDP_la_CXXFLAGS	= -I$(srcdir)/capnp/src -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS) $(CAPNP_CFLAGS)
+libUniSet2UNetUDP_la_SOURCES 	= capnp/src/unet.capnp.c++ UDPPacket.cc UDPTransport.cc MulticastTransport.cc UNetReceiver.cc UNetSender.cc UNetExchange.cc
 
 @PACKAGE@_unetexchange_SOURCES 		= unetexchange.cc
 @PACKAGE@_unetexchange_LDADD 		= libUniSet2UNetUDP.la $(top_builddir)/lib/libUniSet2.la \
 									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 									$(SIGC_LIBS) $(POCO_LIBS)
-@PACKAGE@_unetexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
+@PACKAGE@_unetexchange_CXXFLAGS	= -I$(srcdir)/capnp/src -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
 
 
-@PACKAGE@_unet_udp_tester_SOURCES	= proto/unet.pb.cc UDPPacket.cc unet-udp-tester.cc
-@PACKAGE@_unet_udp_tester_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS) $(PROTOBUF_LIBS)
-@PACKAGE@_unet_udp_tester_CXXFLAGS	= $(POCO_CFLAGS) $(PROTOBUF_CFLAGS)
+@PACKAGE@_unet_udp_tester_SOURCES	= capnp/src/unet.capnp.c++ UDPPacket.cc unet-udp-tester.cc
+@PACKAGE@_unet_udp_tester_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS) $(CAPNP_LIBS)
+@PACKAGE@_unet_udp_tester_CXXFLAGS	= -I$(srcdir)/capnp/src $(POCO_CFLAGS) $(CAPNP_CFLAGS)
 
-@PACKAGE@_unet_multicast_tester_SOURCES	 = proto/unet.pb.cc UDPPacket.cc MulticastTransport.cc unet-multicast-tester.cc
-@PACKAGE@_unet_multicast_tester_LDADD 	 = $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS) $(PROTOBUF_LIBS)
-@PACKAGE@_unet_multicast_tester_CXXFLAGS = $(POCO_CFLAGS) $(PROTOBUF_CFLAGS)
+@PACKAGE@_unet_multicast_tester_SOURCES	 = capnp/src/unet.capnp.c++ UDPPacket.cc MulticastTransport.cc unet-multicast-tester.cc
+@PACKAGE@_unet_multicast_tester_LDADD 	 = $(top_builddir)/lib/libUniSet2.la $(POCO_LIBS) $(CAPNP_LIBS)
+@PACKAGE@_unet_multicast_tester_CXXFLAGS = -I$(srcdir)/capnp/src $(POCO_CFLAGS) $(CAPNP_CFLAGS)
 
 # install
 devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 
-proto_include_HEADERS = proto/unet.pb.h proto/unet.proto
-proto_includedir = $(pkgincludedir)/extensions/proto
+proto_include_HEADERS = capnp/src/unet.capnp.h
+proto_includedir = $(pkgincludedir)/extensions/capnp
 
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2UNetUDP.pc