BWEAS 0.2.0

.clang-format

@@ -9,4 +9,9 @@ BraceWrapping :
     AfterEnum: False
     BeforeElse: True
 
-StatementMacros: [call_err_tk_inf_lex, wrap_interpreter, debug_init_time, debug_mark_time_func]
+AlignConsecutiveAssignments:
+  Enabled: true
+  AcrossEmptyLines: false 
+  AcrossComments: false
+
+StatementMacros: [call_err_tk_inf_lex, wrap_interpreter, debug_init_time, debug_mark_time_func]

.github/workflows/cmake-linux.yml

@@ -1,6 +1,6 @@
 # This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
 # See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
-name: CMake on multiple platforms
+name: CMake build on linux
 
 on:
   push:
@@ -25,12 +25,12 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         build_type: [Release]
-        c_compiler: [gcc, clang]
-        cpp_compiler: [g++, clang++]
+        c_compiler: [clang]
+        cpp_compiler: [clang++]
         include:
           - os: ubuntu-latest
-            c_compiler: gcc
-            cpp_compiler: g++
+            c_compiler: clang
+            cpp_compiler: clang++
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/cmake-windows.yml

@@ -1,6 +1,6 @@
 # This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage.
 # See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml
-name: CMake on a single platform
+name: CMake build on windows
 
 on:
   push:
@@ -31,7 +31,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -DBWEAS_BUILD_VCPKG=ON -DBWEAS_TEST=ON -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -DBWEAS_TEST=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -B ${{github.workspace}}/build
 
     - name: Build
       # Build your program with the given configuration

.gitignore

@@ -5,6 +5,7 @@ build_linux/
 external/LuaJIT/
 external/json/
 external/lz4/
+docs/doxygen
 vcpkg_installed/
 vcpkg/
 

CMakeLists.txt

@@ -1,44 +1,69 @@
-option(BWEAS_BUILD_VCPKG "Build bweas with vcpkg" OFF)
-if(WIN32 AND BWEAS_BUILD_VCPKG AND EXISTS "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E chdir vcpkg vcpkg/bootstrap-vcpkg.bat WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-
-    set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
-    set(BWEAS_BUILD_VCPKG_N TRUE)
-endif()
-
-set(BW_NAME_PRJ bweas)
-
-cmake_minimum_required(VERSION 3.20)
-project(${BW_NAME_PRJ} LANGUAGES CXX C)
-
 option(USER_BUILD_LZ4 "Rep LZ4 on external" OFF)
 option(USER_BUILD_JSON "Rep JSON_C on external" OFF)
 option(USER_BUILD_LUA "Rep LuaJit on external" OFF)
 option(BWEAS_TEST "Build of bweas test" OFF)
 
-set(CMAKE_CXX_STANDARD 17)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+
+set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_CXX_STANDARD 23)
+
+set(BW_NAME_PRJ bweas)
 set(BWEAS_SLIB slbweas)
 
+project(${BW_NAME_PRJ} LANGUAGES CXX)
+
 add_subdirectory(src/)
 add_executable(${BW_NAME_PRJ} src/bweas.cpp)
 
 target_link_libraries(${BW_NAME_PRJ} PRIVATE slbweas)
 
-include_directories(${BWEAS_INCLUDE})
+include_directories(${BWEAS_INCLUDE} "src/bs/")
+
+if(BWEAS_TEST)
+    enable_testing()
+    add_subdirectory(test/)
+endif()
 
 if(WIN32)
-    file(COPY ${CMAKE_SOURCE_DIR}/bweas-config.json DESTINATION ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+    set(CURRENT_BINARY_DIR ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
 else()
-    file(COPY ${CMAKE_SOURCE_DIR}/bweas-config.json DESTINATION ${CMAKE_BINARY_DIR})
+    set(CURRENT_BINARY_DIR ${CMAKE_BINARY_DIR})
+endif()
 
-    install(TARGETS ${BW_NAME_PRJ} DESTINATION bin)
-    install(TARGETS bwhook_safe DESTINATION bin)
-    install(FILES ${CMAKE_SOURCE_DIR}/bweas-config.json DESTINATION bin)
+file(COPY ${CMAKE_SOURCE_DIR}/bweas-config.json DESTINATION ${CURRENT_BINARY_DIR})
+file(MAKE_DIRECTORY ${CURRENT_BINARY_DIR}/packages)
 
-    set_target_properties(bweas PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/bin")
-endif()
+file(GLOB SOURCE_FILES_PACKAGES ${CMAKE_SOURCE_DIR}/packages/*.json)
+foreach(SOURCE_FILE IN LISTS SOURCE_FILES_PACKAGES)
+    file(READ ${SOURCE_FILE} JSON_CONFIG_PACKAGE)
+    string(JSON NAME_PACKAGE GET ${JSON_CONFIG_PACKAGE} "package-name")
+    list(APPEND BWEAS_PACKAGES_OUTPUT "${NAME_PACKAGE}.bweas-package")
+endforeach()
 
-if(BWEAS_TEST)
-    enable_testing()
-    add_subdirectory(test/)
-endif()
+add_custom_target(
+    BWEAS_PACKAGES ALL 
+    WORKING_DIRECTORY ${CURRENT_BINARY_DIR} 
+    DEPENDS ${BWEAS_PACKAGES_OUTPUT}
+)
+
+set(I_SOURCE_FILE 0)
+foreach(SOURCE_FILE IN LISTS SOURCE_FILES_PACKAGES)
+    list(GET BWEAS_PACKAGES_OUTPUT ${I_SOURCE_FILE} NAME_PACKAGE)
+    add_custom_command(
+        OUTPUT ${BWEAS_PACKAGES_OUTPUT}
+        WORKING_DIRECTORY ${CURRENT_BINARY_DIR}/packages
+        COMMAND ${CURRENT_BINARY_DIR}/bweas --nolog --package ${SOURCE_FILE}
+        DEPENDS ${SOURCE_FILE} ${CURRENT_BINARY_DIR}/bweas
+        COMMENT "Compiled ${BWEAS_PACKAGES_OUTPUT}"
+    )
+    set(I_SOURCE_FILE ${I_SOURCE_FILE}+1)
+endforeach()
+
+add_dependencies(BWEAS_PACKAGES ${BW_NAME_PRJ})
+
+install(TARGETS ${BW_NAME_PRJ} DESTINATION bin)
+install(FILES ${CMAKE_SOURCE_DIR}/bweas-config.json DESTINATION bin)
+install(DIRECTORY ${CURRENT_BINARY_DIR}/packages DESTINATION bin)
+
+set_target_properties(bweas PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/bin")