refactor: rename cortex-cpp to engine

janhq · Aug 26, 2024 · 9d2b02d · 9d2b02d
1 parent 952c0eb
commit 9d2b02d
Show file tree

Hide file tree

Showing 62 changed files with 63 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ cortex-js/package-lock.json
 .vscode
 cortex-js/command
 cortex-js/src/infrastructure/commanders/test/test_data
+**/vcpkg_installed
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "engine/vcpkg"]
+	path = engine/vcpkg
+	url = https://github.com/microsoft/vcpkg.git
diff --git a/cortex-cpp/.clang-format → engine/.clang-format b/cortex-cpp/.clang-format → engine/.clang-format
diff --git a/cortex-cpp/.gitignore → engine/.gitignore b/cortex-cpp/.gitignore → engine/.gitignore
diff --git a/cortex-cpp/CMakeLists.txt → engine/CMakeLists.txt b/cortex-cpp/CMakeLists.txt → engine/CMakeLists.txt
@@ -33,9 +33,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(OPENSSL_USE_STATIC_LIBS TRUE)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build-deps/_install)
+# set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build-deps/_install)
 # This is the critical line for installing another package
 
+if(MSVC)
+  add_compile_options(
+      $<$<CONFIG:>:/MT> #---------|
+      $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
+      $<$<CONFIG:Release>:/MT> #--|
+  )
+endif()
+
 if(LLAMA_CUDA)
   cmake_minimum_required(VERSION 3.17)
 
@@ -75,6 +83,16 @@ add_compile_definitions(CORTEX_CPP_VERSION="${CORTEX_CPP_VERSION}")
 
 # add_subdirectory(test)
 
+find_package(jsoncpp CONFIG REQUIRED)
+find_package(Drogon CONFIG REQUIRED)
+find_package(yaml-cpp CONFIG REQUIRED)
+find_package(jinja2cpp CONFIG REQUIRED)
+find_package(httplib CONFIG REQUIRED)
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(CLI11 CONFIG REQUIRED)
+find_package(unofficial-minizip CONFIG REQUIRED)
+find_package(LibArchive REQUIRED)
+
 # Build using CMAKE-JS
 if(DEFINED CMAKE_JS_INC)
   if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") OR("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU"))
@@ -109,8 +127,12 @@ endif()
 #
 # and comment out the following lines
 
-find_package(Drogon CONFIG REQUIRED)
-
+target_link_libraries(${PROJECT_NAME} PRIVATE httplib::httplib)
+target_link_libraries(${PROJECT_NAME} PRIVATE nlohmann_json::nlohmann_json)
+target_link_libraries(${PROJECT_NAME} PRIVATE jinja2cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE CLI11::CLI11)
+target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::minizip::minizip)
+target_link_libraries(${PROJECT_NAME} PRIVATE LibArchive::LibArchive)
 
 # Build using CMAKE-JS
 if(DEFINED CMAKE_JS_INC)
@@ -124,7 +146,7 @@ if(DEFINED CMAKE_JS_INC)
     execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
   endif()
 else()
-  target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon
+  target_link_libraries(${PROJECT_NAME} PRIVATE JsonCpp::JsonCpp Drogon::Drogon OpenSSL::SSL OpenSSL::Crypto yaml-cpp::yaml-cpp
   ${CMAKE_THREAD_LIBS_INIT})
 endif()
 # ##############################################################################

diff --git a/cortex-cpp/CONTRIBUTING.md → engine/CONTRIBUTING.md b/cortex-cpp/CONTRIBUTING.md → engine/CONTRIBUTING.md
diff --git a/cortex-cpp/LICENSE → engine/LICENSE b/cortex-cpp/LICENSE → engine/LICENSE
diff --git a/cortex-cpp/Makefile → engine/Makefile b/cortex-cpp/Makefile → engine/Makefile
diff --git a/cortex-cpp/README.md → engine/README.md b/cortex-cpp/README.md → engine/README.md
diff --git a/cortex-cpp/addon.cc → engine/addon.cc b/cortex-cpp/addon.cc → engine/addon.cc
diff --git a/cortex-cpp/audio.md → engine/audio.md b/cortex-cpp/audio.md → engine/audio.md
diff --git a/cortex-cpp/binding/index.d.ts → engine/binding/index.d.ts b/cortex-cpp/binding/index.d.ts → engine/binding/index.d.ts
diff --git a/cortex-cpp/binding/index.js → engine/binding/index.js b/cortex-cpp/binding/index.js → engine/binding/index.js
diff --git a/cortex-cpp/common/base.h → engine/common/base.h b/cortex-cpp/common/base.h → engine/common/base.h
diff --git a/cortex-cpp/controllers/health.cc → engine/controllers/health.cc b/cortex-cpp/controllers/health.cc → engine/controllers/health.cc
diff --git a/cortex-cpp/controllers/health.h → engine/controllers/health.h b/cortex-cpp/controllers/health.h → engine/controllers/health.h
diff --git a/cortex-cpp/controllers/prelight.cc → engine/controllers/prelight.cc b/cortex-cpp/controllers/prelight.cc → engine/controllers/prelight.cc
diff --git a/cortex-cpp/controllers/prelight.h → engine/controllers/prelight.h b/cortex-cpp/controllers/prelight.h → engine/controllers/prelight.h
diff --git a/cortex-cpp/controllers/processManager.cc → engine/controllers/processManager.cc b/cortex-cpp/controllers/processManager.cc → engine/controllers/processManager.cc
diff --git a/cortex-cpp/controllers/processManager.h → engine/controllers/processManager.h b/cortex-cpp/controllers/processManager.h → engine/controllers/processManager.h
diff --git a/cortex-cpp/controllers/server.cc → engine/controllers/server.cc b/cortex-cpp/controllers/server.cc → engine/controllers/server.cc
diff --git a/cortex-cpp/controllers/server.h → engine/controllers/server.h b/cortex-cpp/controllers/server.h → engine/controllers/server.h
diff --git a/cortex-cpp/cortex-common/EngineI.h → engine/cortex-common/EngineI.h b/cortex-cpp/cortex-common/EngineI.h → engine/cortex-common/EngineI.h
diff --git a/cortex-cpp/cortex-common/cortexpythoni.h → engine/cortex-common/cortexpythoni.h b/cortex-cpp/cortex-common/cortexpythoni.h → engine/cortex-common/cortexpythoni.h
diff --git a/cortex-cpp/cortex-cpp-deps/.gitignore → engine/cortex-cpp-deps/.gitignore b/cortex-cpp/cortex-cpp-deps/.gitignore → engine/cortex-cpp-deps/.gitignore
diff --git a/cortex-cpp/cortex-cpp-deps/CMakeLists.txt → engine/cortex-cpp-deps/CMakeLists.txt b/cortex-cpp/cortex-cpp-deps/CMakeLists.txt → engine/cortex-cpp-deps/CMakeLists.txt
diff --git a/cortex-cpp/cortex-cpp-deps/README.md → engine/cortex-cpp-deps/README.md b/cortex-cpp/cortex-cpp-deps/README.md → engine/cortex-cpp-deps/README.md
diff --git a/...ex-cpp/examples/example-docker/Dockerfile → engine/examples/example-docker/Dockerfile b/...ex-cpp/examples/example-docker/Dockerfile → engine/examples/example-docker/Dockerfile
diff --git a/...examples/example-docker/alpine.Dockerfile → ...examples/example-docker/alpine.Dockerfile b/...examples/example-docker/alpine.Dockerfile → ...examples/example-docker/alpine.Dockerfile
diff --git a/...p/examples/example-docker/cuda.Dockerfile → ...e/examples/example-docker/cuda.Dockerfile b/...p/examples/example-docker/cuda.Dockerfile → ...e/examples/example-docker/cuda.Dockerfile
diff --git a/cortex-cpp/examples/grammars/json.gbnf → engine/examples/grammars/json.gbnf b/cortex-cpp/examples/grammars/json.gbnf → engine/examples/grammars/json.gbnf
diff --git a/cortex-cpp/examples/interface/README.md → engine/examples/interface/README.md b/cortex-cpp/examples/interface/README.md → engine/examples/interface/README.md
diff --git a/cortex-cpp/examples/interface/app.py → engine/examples/interface/app.py b/cortex-cpp/examples/interface/app.py → engine/examples/interface/app.py
diff --git a/cortex-cpp/examples/interface/avatar.png → engine/examples/interface/avatar.png b/cortex-cpp/examples/interface/avatar.png → engine/examples/interface/avatar.png
diff --git a/cortex-cpp/install.bat → engine/install.bat b/cortex-cpp/install.bat → engine/install.bat
diff --git a/cortex-cpp/install.sh → engine/install.sh b/cortex-cpp/install.sh → engine/install.sh
diff --git a/cortex-cpp/install_deps.sh → engine/install_deps.sh b/cortex-cpp/install_deps.sh → engine/install_deps.sh
diff --git a/cortex-cpp/main.cc → engine/main.cc b/cortex-cpp/main.cc → engine/main.cc
diff --git a/cortex-cpp/package.json → engine/package.json b/cortex-cpp/package.json → engine/package.json
diff --git a/cortex-cpp/test/CMakeLists.txt → engine/test/CMakeLists.txt b/cortex-cpp/test/CMakeLists.txt → engine/test/CMakeLists.txt
diff --git a/cortex-cpp/test/components/CMakeLists.txt → engine/test/components/CMakeLists.txt b/cortex-cpp/test/components/CMakeLists.txt → engine/test/components/CMakeLists.txt
diff --git a/cortex-cpp/test/components/main.cc → engine/test/components/main.cc b/cortex-cpp/test/components/main.cc → engine/test/components/main.cc
diff --git a/...-cpp/test/components/test_cortex_utils.cc → engine/test/components/test_cortex_utils.cc b/...-cpp/test/components/test_cortex_utils.cc → engine/test/components/test_cortex_utils.cc
diff --git a/cortex-cpp/utils/cortex_utils.h → engine/utils/cortex_utils.h b/cortex-cpp/utils/cortex_utils.h → engine/utils/cortex_utils.h
diff --git a/cortex-cpp/utils/cpuid/cpu_info.cc → engine/utils/cpuid/cpu_info.cc b/cortex-cpp/utils/cpuid/cpu_info.cc → engine/utils/cpuid/cpu_info.cc
diff --git a/cortex-cpp/utils/cpuid/cpu_info.h → engine/utils/cpuid/cpu_info.h b/cortex-cpp/utils/cpuid/cpu_info.h → engine/utils/cpuid/cpu_info.h
diff --git a/...ex-cpp/utils/cpuid/detail/cpu_info_impl.h → engine/utils/cpuid/detail/cpu_info_impl.h b/...ex-cpp/utils/cpuid/detail/cpu_info_impl.h → engine/utils/cpuid/detail/cpu_info_impl.h
diff --git a/...pp/utils/cpuid/detail/extract_x86_flags.h → ...ne/utils/cpuid/detail/extract_x86_flags.h b/...pp/utils/cpuid/detail/extract_x86_flags.h → ...ne/utils/cpuid/detail/extract_x86_flags.h
diff --git a/cortex-cpp/utils/cpuid/detail/init_gcc_x86.h → engine/utils/cpuid/detail/init_gcc_x86.h b/cortex-cpp/utils/cpuid/detail/init_gcc_x86.h → engine/utils/cpuid/detail/init_gcc_x86.h
diff --git a/...p/utils/cpuid/detail/init_ios_clang_arm.h → ...e/utils/cpuid/detail/init_ios_clang_arm.h b/...p/utils/cpuid/detail/init_ios_clang_arm.h → ...e/utils/cpuid/detail/init_ios_clang_arm.h
diff --git a/...p/utils/cpuid/detail/init_linux_gcc_arm.h → ...e/utils/cpuid/detail/init_linux_gcc_arm.h b/...p/utils/cpuid/detail/init_linux_gcc_arm.h → ...e/utils/cpuid/detail/init_linux_gcc_arm.h
diff --git a/...ex-cpp/utils/cpuid/detail/init_msvc_arm.h → engine/utils/cpuid/detail/init_msvc_arm.h b/...ex-cpp/utils/cpuid/detail/init_msvc_arm.h → engine/utils/cpuid/detail/init_msvc_arm.h
diff --git a/...ex-cpp/utils/cpuid/detail/init_msvc_x86.h → engine/utils/cpuid/detail/init_msvc_x86.h b/...ex-cpp/utils/cpuid/detail/init_msvc_x86.h → engine/utils/cpuid/detail/init_msvc_x86.h
diff --git a/cortex-cpp/utils/cpuid/detail/init_unknown.h → engine/utils/cpuid/detail/init_unknown.h b/cortex-cpp/utils/cpuid/detail/init_unknown.h → engine/utils/cpuid/detail/init_unknown.h
diff --git a/cortex-cpp/utils/cpuid/platform.h → engine/utils/cpuid/platform.h b/cortex-cpp/utils/cpuid/platform.h → engine/utils/cpuid/platform.h
diff --git a/cortex-cpp/utils/dr_wav.h → engine/utils/dr_wav.h b/cortex-cpp/utils/dr_wav.h → engine/utils/dr_wav.h
diff --git a/cortex-cpp/utils/dylib.h → engine/utils/dylib.h b/cortex-cpp/utils/dylib.h → engine/utils/dylib.h
diff --git a/cortex-cpp/utils/json.hpp → engine/utils/json.hpp b/cortex-cpp/utils/json.hpp → engine/utils/json.hpp
diff --git a/cortex-cpp/utils/logging_utils.h → engine/utils/logging_utils.h b/cortex-cpp/utils/logging_utils.h → engine/utils/logging_utils.h
diff --git a/engine/vcpkg b/engine/vcpkg
diff --git a/engine/vcpkg-configuration.json b/engine/vcpkg-configuration.json
@@ -0,0 +1,14 @@
+{
+    "default-registry": {
+      "kind": "git",
+      "baseline": "a76e5d9e1c62a23b9e92353e5e25d8c34cda2b74",
+      "repository": "https://github.com/Cheaterdev/vcpkg"
+    },
+    "registries": [
+      {
+        "kind": "artifact",
+        "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip",
+        "name": "microsoft"
+      }
+    ]
+  }
diff --git a/engine/vcpkg.json b/engine/vcpkg.json
@@ -0,0 +1,18 @@
+{
+    "dependencies": [
+      "cli11",
+      {
+        "name": "cpp-httplib",
+        "features": [
+          "openssl"
+        ]
+      },
+      "drogon",
+      "jinja2cpp",
+      "jsoncpp",
+      "minizip",
+      "nlohmann-json",
+      "yaml-cpp",
+      "libarchive"
+    ]
+  }