Update directory structure of server/core

paxbun · Oct 25, 2021 · f3ba21a · f3ba21a
1 parent 76c5d25
commit f3ba21a
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 27 deletions.
diff --git a/server/build.rs b/server/build.rs
@@ -14,7 +14,7 @@ fn main() -> Result<()> {
  // Configure and build the CMake project
  run_cmake("core", "laplace-eq-therm-server-core");
  // Generate bindings from core/Lib.hh
- generate_bindings("core/Lib.hh")
+ generate_bindings("./core/Public/leth/Lib.hh", "-I./core/Public")
 }
 
 #[cfg(target_os = "windows")]
@@ -78,10 +78,11 @@ fn run_cmake(source_dir: &str, target_name: &str) {
  println!("cargo:rustc-link-lib=static={}", target_name);
 }
 
-fn generate_bindings(header_path: &str) -> Result<()> {
+fn generate_bindings(header_path: &str, include_path: &str) -> Result<()> {
  // generate bindings
  let bindings = bindgen::Builder::default()
  .header(header_path)
+ .clang_arg(include_path)
  .parse_callbacks(Box::new(bindgen::CargoCallbacks))
  .generate_comments(false)
  .generate()

diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
@@ -16,13 +16,18 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 add_library(
  laplace-eq-therm-server-core
- ${CMAKE_SOURCE_DIR}/Config.cc
- ${CMAKE_SOURCE_DIR}/Server.cc
+ ${CMAKE_SOURCE_DIR}/Source/Config.cc
+ ${CMAKE_SOURCE_DIR}/Source/Server.cc
 
  # Spaces
- ${CMAKE_SOURCE_DIR}/MatrixSpace.cc
- ${CMAKE_SOURCE_DIR}/MonteCarloSpace.cc
- ${CMAKE_SOURCE_DIR}/SuccessiveOverRelaxationSpace.cc
+ ${CMAKE_SOURCE_DIR}/Source/MatrixSpace.cc
+ ${CMAKE_SOURCE_DIR}/Source/MonteCarloSpace.cc
+ ${CMAKE_SOURCE_DIR}/Source/SuccessiveOverRelaxationSpace.cc
+)
+
+target_include_directories(
+ laplace-eq-therm-server-core
+ PUBLIC ${CMAKE_SOURCE_DIR}/Public
 )
 
 install(
@@ -46,7 +51,7 @@ if (ENABLE_LAPLACE_EQ_THERM_SERVER_CORE_TEST)
  string(REGEX REPLACE "([^-])([A-Z][a-z]+)" "\\1-\\2" EXE_NAME "${EXE_NAME}")
  string(TOLOWER "${EXE_NAME}" EXE_NAME)
 
- add_executable(${EXE_NAME} "Tests/${FILE_NAME}.cc")
+ add_executable(${EXE_NAME} "${CMAKE_SOURCE_DIR}/Tests/${FILE_NAME}.cc")
  target_link_libraries(${EXE_NAME} GTest::gtest_main laplace-eq-therm-server-core)
  add_test(NAME ${TEST_NAME} COMMAND ${EXE_NAME})
 

diff --git a/server/core/IntegerTypes.hh → server/core/Public/leth/IntegerTypes.hh b/server/core/IntegerTypes.hh → server/core/Public/leth/IntegerTypes.hh
diff --git a/server/core/Lib.hh → server/core/Public/leth/Lib.hh b/server/core/Lib.hh → server/core/Public/leth/Lib.hh
@@ -4,8 +4,9 @@
 #ifndef LAPLACE_EQ_THERM_SERVER_CORE_LIB_HH
 #define LAPLACE_EQ_THERM_SERVER_CORE_LIB_HH
 
-#include "IntegerTypes.hh"
-#include "Point.hh"
+#include <leth/IntegerTypes.hh>
+#include <leth/Point.hh>
+
 #include <cstdint>
 
 using ServerHandle = void*;

diff --git a/server/core/MatrixSpace.hh → server/core/Public/leth/MatrixSpace.hh b/server/core/MatrixSpace.hh → server/core/Public/leth/MatrixSpace.hh
@@ -4,7 +4,8 @@
 #ifndef LAPLACE_EQ_THERM_SERVER_CORE_MATRIX_SPACE_HH
 #define LAPLACE_EQ_THERM_SERVER_CORE_MATRIX_SPACE_HH
 
-#include "Space.hh"
+#include <leth/Space.hh>
+
 #include <random>
 #include <vector>
 

diff --git a/server/core/MonteCarloSpace.hh → server/core/Public/leth/MonteCarloSpace.hh b/server/core/MonteCarloSpace.hh → server/core/Public/leth/MonteCarloSpace.hh
@@ -4,7 +4,8 @@
 #ifndef LAPLACE_EQ_THERM_SERVER_CORE_MONTE_CARLO_SPACE_HH
 #define LAPLACE_EQ_THERM_SERVER_CORE_MONTE_CARLO_SPACE_HH
 
-#include "Space.hh"
+#include <leth/Space.hh>
+
 #include <random>
 
 class MonteCarloSpace : public Space

diff --git a/server/core/Point.hh → server/core/Public/leth/Point.hh b/server/core/Point.hh → server/core/Public/leth/Point.hh
diff --git a/server/core/Server.hh → server/core/Public/leth/Server.hh b/server/core/Server.hh → server/core/Public/leth/Server.hh
@@ -4,8 +4,9 @@
 #ifndef LAPLACE_EQ_THERM_SERVER_CORE_SERVER_HH
 #define LAPLACE_EQ_THERM_SERVER_CORE_SERVER_HH
 
-#include "IntegerTypes.hh"
-#include "Space.hh"
+#include <leth/IntegerTypes.hh>
+#include <leth/Space.hh>
+
 #include <atomic>
 #include <cstdint>
 #include <deque>

diff --git a/server/core/Space.hh → server/core/Public/leth/Space.hh b/server/core/Space.hh → server/core/Public/leth/Space.hh
@@ -4,8 +4,9 @@
 #ifndef LAPLACE_EQ_THERM_SERVER_CORE_SPACE_HH
 #define LAPLACE_EQ_THERM_SERVER_CORE_SPACE_HH
 
-#include "IntegerTypes.hh"
-#include "Point.hh"
+#include <leth/IntegerTypes.hh>
+#include <leth/Point.hh>
+
 #include <cstddef>
 #include <cstdint>
 

diff --git a/server/core/SuccessiveOverRelaxationSpace.hh → ...lic/leth/SuccessiveOverRelaxationSpace.hh b/server/core/SuccessiveOverRelaxationSpace.hh → ...lic/leth/SuccessiveOverRelaxationSpace.hh
@@ -4,7 +4,8 @@
 #ifndef LAPLACE_EQ_THERM_SERVER_CORE_SUCCESSIVE_OVER_RELAXATION_SPACE_HH
 #define LAPLACE_EQ_THERM_SERVER_CORE_SUCCESSIVE_OVER_RELAXATION_SPACE_HH
 
-#include "MatrixSpace.hh"
+#include <leth/MatrixSpace.hh>
+
 #include <vector>
 
 class SuccessiveOverRelaxationSpace : public MatrixSpace

diff --git a/server/core/Config.cc → server/core/Source/Config.cc b/server/core/Config.cc → server/core/Source/Config.cc
@@ -1,12 +1,12 @@
 // Copyright (c) 2021 Chanjung Kim. All rights reserved.
 // Licensed under the MIT License.
 
-#include "Lib.hh"
-#include "Server.hh"
+#include <leth/Lib.hh>
+#include <leth/Server.hh>
 
 // Spaces
-#include "MonteCarloSpace.hh"
-#include "SuccessiveOverRelaxationSpace.hh"
+#include <leth/MonteCarloSpace.hh>
+#include <leth/SuccessiveOverRelaxationSpace.hh>
 
 ServerHandle leth_create(uint16_t width, uint16_t height) noexcept
 try

diff --git a/server/core/MatrixSpace.cc → server/core/Source/MatrixSpace.cc b/server/core/MatrixSpace.cc → server/core/Source/MatrixSpace.cc
@@ -1,7 +1,7 @@
 // Copyright (c) 2021 Chanjung Kim. All rights reserved.
 // Licensed under the MIT License.
 
-#include "MatrixSpace.hh"
+#include <leth/MatrixSpace.hh>
 
 #include <limits>
 #include <random>

diff --git a/server/core/MonteCarloSpace.cc → server/core/Source/MonteCarloSpace.cc b/server/core/MonteCarloSpace.cc → server/core/Source/MonteCarloSpace.cc
@@ -1,7 +1,7 @@
 // Copyright (c) 2021 Chanjung Kim. All rights reserved.
 // Licensed under the MIT License.
 
-#include "MonteCarloSpace.hh"
+#include <leth/MonteCarloSpace.hh>
 
 #include <limits>
 #include <random>

diff --git a/server/core/Server.cc → server/core/Source/Server.cc b/server/core/Server.cc → server/core/Source/Server.cc
@@ -1,10 +1,10 @@
 // Copyright (c) 2021 Chanjung Kim. All rights reserved.
 // Licensed under the MIT License.
 
-#include "Server.hh"
+#include <leth/Lib.hh>
+#include <leth/Point.hh>
+#include <leth/Server.hh>
 
-#include "Lib.hh"
-#include "Point.hh"
 #include <cstring>
 
 #define CAST_SERVER() \

diff --git a/server/core/SuccessiveOverRelaxationSpace.cc → ...e/Source/SuccessiveOverRelaxationSpace.cc b/server/core/SuccessiveOverRelaxationSpace.cc → ...e/Source/SuccessiveOverRelaxationSpace.cc
@@ -1,7 +1,7 @@
 // Copyright (c) 2021 Chanjung Kim. All rights reserved.
 // Licensed under the MIT License.
 
-#include "SuccessiveOverRelaxationSpace.hh"
+#include <leth/SuccessiveOverRelaxationSpace.hh>
 
 char const* SuccessiveOverRelaxationSpace::GetName() noexcept
 {