From eeace9183215e8b14689c6b2a9c3eba8f97884e3 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Tue, 10 Dec 2019 01:31:07 +0700
Subject: [PATCH] [+] new submodule libdap-chain-common [*] Movements between
submodules [-] Some useless files
---
.gitmodules | 4 ++++
CMakeLists.txt | 5 +++--
libdap-chain-common | 1 +
libdap-chain-net-srv-vpn | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
create mode 160000 libdap-chain-common
diff --git a/.gitmodules b/.gitmodules
index 89dd57406..aac10606b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -122,3 +122,7 @@
path = libdap-server-http-db
url = https://gitlab.demlabs.net/cellframe/libdap-server-http-db
branch = master
+[submodule "libdap-chain-common"]
+ path = libdap-chain-common
+ url = https://gitlab.demlabs.net/cellframe/libdap-chain-common
+ branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a9fb3aaa..80ef9c029 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ SET( CPACK_GENERATOR "DEB")
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 2)
SET( CPACK_PACKAGE_VERSION_MINOR 6)
-SET( CPACK_PACKAGE_VERSION_PATCH 23)
+SET( CPACK_PACKAGE_VERSION_PATCH 24)
SET( CPACK_SYSTEM_NAME "debian-9.9-amd64")
SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
@@ -141,8 +141,9 @@ add_subdirectory(libdap-server-udp)
add_subdirectory(libdap-server)
-add_subdirectory(libdap-chain)
add_subdirectory(libdap-chain-crypto)
+add_subdirectory(libdap-chain-common)
+add_subdirectory(libdap-chain)
add_subdirectory(libdap-chain-wallet)
add_subdirectory(libdap-chain-cs-dag)
add_subdirectory(libdap-chain-cs-dag-poa)
diff --git a/libdap-chain-common b/libdap-chain-common
new file mode 160000
index 000000000..cea7aa6e4
--- /dev/null
+++ b/libdap-chain-common
@@ -0,0 +1 @@
+Subproject commit cea7aa6e47002f5aa65451689d0dea37d108b80c
diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn
index ecabf1c82..6d8da648c 160000
--- a/libdap-chain-net-srv-vpn
+++ b/libdap-chain-net-srv-vpn
@@ -1 +1 @@
-Subproject commit ecabf1c82b2f2ad3acd28b00833238b03a7d34ac
+Subproject commit 6d8da648ced7801cbbe78956051021bba24eae49
--
GitLab