backend: change backend dir

* backend is now in /backend instead of /grpc/server * update readme * change BUILD_DRONECORESERVER to BUILD_BACKEND in Makefile
mavlink · Mar 6, 2018 · 16d5f79 · 16d5f79
1 parent d19f0c8
commit 16d5f79
Show file tree

Hide file tree

Showing 33 changed files with 23 additions and 38 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -11,7 +11,7 @@
 	path = core/third_party/tinyxml2
 	url = https://github.com/leethomason/tinyxml2.git
 [submodule "dronecore-proto"]
-	path = grpc/server/proto
+	path = backend/proto
 	url = https://github.com/dronecore/DroneCore-Proto.git
 [submodule "zlib"]
 	path = third_party/zlib

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,11 +52,11 @@ if(BUILD_TESTS)
     include(cmake/unit_tests.cmake)
 endif()
 
-if (CMAKE_BUILD_DRONECORESERVER)
+if (CMAKE_BUILD_BACKEND)
     message(STATUS "Building dronecore server")
-    add_subdirectory(grpc/server)
+    add_subdirectory(backend)
 else()
-    message(STATUS "BUILD_DRONECORESERVER not set: not building dronecore server")
+    message(STATUS "BUILD_BACKEND not set: not building grpc backend")
 endif()
 
 if (DROP_DEBUG EQUAL 1)

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ CURL_BUILD_DIR := $(ROOT_DIR)/core/third_party/curl-android-ios
 CMAKE_BIN = cmake
 
 INSTALL_PREFIX ?= /usr/local
-BUILD_DRONECORESERVER ?= NO
+BUILD_BACKEND ?= NO
 
 # Function to create build_* directory and call make there.
 define cmake-build
@@ -55,7 +55,7 @@ define cmake-build
         -DEXTERNAL_DIR:STRING=$(EXTERNAL_DIR) \
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
         -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) \
-		-DCMAKE_BUILD_DRONECORESERVER=$(BUILD_DRONECORESERVER) \
+		-DCMAKE_BUILD_BACKEND=$(BUILD_BACKEND) \
 		-DDROP_DEBUG=$(DROP_DEBUG) \
         -G$(CMAKE_GENERATOR)) \
 	|| (rm -rf $(BUILD_DIR)) \

diff --git a/grpc/server/CMakeLists.txt → backend/CMakeLists.txt b/grpc/server/CMakeLists.txt → backend/CMakeLists.txt
diff --git a/backend/README.md b/backend/README.md
@@ -0,0 +1,15 @@
+# DroneCore with GRPC
+
+### Build with backend
+
+```
+make BUILD_BACKEND=YES
+```
+
+### Run the backend
+
+The backend is built as an executable:
+
+```
+./build/default/backend/src/backend_bin
+```
diff --git a/...erver/cmake/helpers/build_boringssl.cmake → backend/cmake/helpers/build_boringssl.cmake b/...erver/cmake/helpers/build_boringssl.cmake → backend/cmake/helpers/build_boringssl.cmake
diff --git a/grpc/server/cmake/helpers/build_cares.cmake → backend/cmake/helpers/build_cares.cmake b/grpc/server/cmake/helpers/build_cares.cmake → backend/cmake/helpers/build_cares.cmake
diff --git a/...server/cmake/helpers/build_external.cmake → backend/cmake/helpers/build_external.cmake b/...server/cmake/helpers/build_external.cmake → backend/cmake/helpers/build_external.cmake
diff --git a/grpc/server/cmake/helpers/build_grpc.cmake → backend/cmake/helpers/build_grpc.cmake b/grpc/server/cmake/helpers/build_grpc.cmake → backend/cmake/helpers/build_grpc.cmake
diff --git a/...server/cmake/helpers/build_protobuf.cmake → backend/cmake/helpers/build_protobuf.cmake b/...server/cmake/helpers/build_protobuf.cmake → backend/cmake/helpers/build_protobuf.cmake
diff --git a/grpc/server/cmake/helpers/build_target.cmake → backend/cmake/helpers/build_target.cmake b/grpc/server/cmake/helpers/build_target.cmake → backend/cmake/helpers/build_target.cmake
diff --git a/...make/third_party/boringssl/CMakeLists.txt → ...make/third_party/boringssl/CMakeLists.txt b/...make/third_party/boringssl/CMakeLists.txt → ...make/third_party/boringssl/CMakeLists.txt
diff --git a/...er/cmake/third_party/cares/CMakeLists.txt → ...nd/cmake/third_party/cares/CMakeLists.txt b/...er/cmake/third_party/cares/CMakeLists.txt → ...nd/cmake/third_party/cares/CMakeLists.txt
diff --git a/...ver/cmake/third_party/grpc/CMakeLists.txt → ...end/cmake/third_party/grpc/CMakeLists.txt b/...ver/cmake/third_party/grpc/CMakeLists.txt → ...end/cmake/third_party/grpc/CMakeLists.txt
diff --git a/...cmake/third_party/protobuf/CMakeLists.txt → ...cmake/third_party/protobuf/CMakeLists.txt b/...cmake/third_party/protobuf/CMakeLists.txt → ...cmake/third_party/protobuf/CMakeLists.txt
diff --git a/grpc/server/proto → backend/proto b/grpc/server/proto → backend/proto
diff --git a/grpc/server/src/CMakeLists.txt → backend/src/CMakeLists.txt b/grpc/server/src/CMakeLists.txt → backend/src/CMakeLists.txt
@@ -45,7 +45,7 @@ target_include_directories(backend
     PRIVATE
     ${CMAKE_SOURCE_DIR}/core
     ${CMAKE_SOURCE_DIR}/plugins
-    ${CMAKE_BINARY_DIR}/grpc/server/src
+    ${CMAKE_BINARY_DIR}/backend/src
     ${PLUGINS_DIR}
 )
 

diff --git a/grpc/server/src/backend.cpp → backend/src/backend.cpp b/grpc/server/src/backend.cpp → backend/src/backend.cpp
diff --git a/grpc/server/src/backend.h → backend/src/backend.h b/grpc/server/src/backend.h → backend/src/backend.h
diff --git a/grpc/server/src/backend_api.cpp → backend/src/backend_api.cpp b/grpc/server/src/backend_api.cpp → backend/src/backend_api.cpp
diff --git a/grpc/server/src/backend_api.h → backend/src/backend_api.h b/grpc/server/src/backend_api.h → backend/src/backend_api.h
diff --git a/grpc/server/src/cmake/compile_proto.cmake → backend/src/cmake/compile_proto.cmake b/grpc/server/src/cmake/compile_proto.cmake → backend/src/cmake/compile_proto.cmake
diff --git a/grpc/server/src/connection_initiator.h → backend/src/connection_initiator.h b/grpc/server/src/connection_initiator.h → backend/src/connection_initiator.h
diff --git a/grpc/server/src/core/corerpc_impl.h → backend/src/core/corerpc_impl.h b/grpc/server/src/core/corerpc_impl.h → backend/src/core/corerpc_impl.h
diff --git a/grpc/server/src/dronecore_server.cpp → backend/src/dronecore_server.cpp b/grpc/server/src/dronecore_server.cpp → backend/src/dronecore_server.cpp
diff --git a/grpc/server/src/module.modulemap → backend/src/module.modulemap b/grpc/server/src/module.modulemap → backend/src/module.modulemap
diff --git a/.../src/plugins/action/action_service_impl.h → .../src/plugins/action/action_service_impl.h b/.../src/plugins/action/action_service_impl.h → .../src/plugins/action/action_service_impl.h
diff --git a/...ver/src/plugins/mission/missionrpc_impl.h → ...end/src/plugins/mission/missionrpc_impl.h b/...ver/src/plugins/mission/missionrpc_impl.h → ...end/src/plugins/mission/missionrpc_impl.h
diff --git a/...src/plugins/telemetry/telemetryrpc_impl.h → ...src/plugins/telemetry/telemetryrpc_impl.h b/...src/plugins/telemetry/telemetryrpc_impl.h → ...src/plugins/telemetry/telemetryrpc_impl.h
diff --git a/grpc/server/test/CMakeLists.txt → backend/test/CMakeLists.txt b/grpc/server/test/CMakeLists.txt → backend/test/CMakeLists.txt
@@ -12,7 +12,7 @@ target_include_directories(unit_tests_backend
     ${CMAKE_CURRENT_SOURCE_DIR}/../src
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/plugins
     ${CMAKE_SOURCE_DIR}/plugins
-    ${CMAKE_BINARY_DIR}/grpc/server/src
+    ${CMAKE_BINARY_DIR}/backend/src
 )
 
 target_link_libraries(unit_tests_backend

diff --git a/.../server/test/action_service_impl_test.cpp → backend/test/action_service_impl_test.cpp b/.../server/test/action_service_impl_test.cpp → backend/test/action_service_impl_test.cpp
diff --git a/...server/test/connection_initiator_test.cpp → backend/test/connection_initiator_test.cpp b/...server/test/connection_initiator_test.cpp → backend/test/connection_initiator_test.cpp
diff --git a/grpc/README.md b/grpc/README.md