From 83d9420422856e6b65017c78b9586f03f55438e0 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 28 Apr 2025 18:10:57 +0100 Subject: [PATCH] Rename cxx directory to cpp Also update the crate name and references to it. This helps distinguish the C++ wrapper that's built using CXX from CXX itself. --- .github/workflows/ci.yml | 14 ++++------ Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 2 +- {cxx => cpp}/.cargo/msvc-debug-config.toml | 0 {cxx => cpp}/.clang-format | 0 {cxx => cpp}/.gitignore | 0 {cxx => cpp}/CMakeLists.txt | 28 ++++++++++--------- {cxx => cpp}/Cargo.toml | 2 +- {cxx => cpp}/README.md | 0 {cxx => cpp}/build.rs | 2 +- {cxx => cpp}/cmake/Config.cmake.in | 0 {cxx => cpp}/cmake/tests.cmake | 2 +- {cxx => cpp}/include/loot/api.h | 0 {cxx => cpp}/include/loot/api_decorator.h | 0 .../include/loot/database_interface.h | 0 {cxx => cpp}/include/loot/enum/edge_type.h | 0 {cxx => cpp}/include/loot/enum/game_type.h | 0 {cxx => cpp}/include/loot/enum/log_level.h | 0 {cxx => cpp}/include/loot/enum/message_type.h | 0 .../loot/exception/condition_syntax_error.h | 0 .../loot/exception/cyclic_interaction_error.h | 0 .../include/loot/exception/error_categories.h | 0 .../loot/exception/file_access_error.h | 0 .../loot/exception/undefined_group_error.h | 0 {cxx => cpp}/include/loot/game_interface.h | 0 {cxx => cpp}/include/loot/loot_version.h | 0 .../loot/metadata/conditional_metadata.h | 0 {cxx => cpp}/include/loot/metadata/file.h | 0 {cxx => cpp}/include/loot/metadata/filename.h | 0 {cxx => cpp}/include/loot/metadata/group.h | 0 {cxx => cpp}/include/loot/metadata/location.h | 0 {cxx => cpp}/include/loot/metadata/message.h | 0 .../include/loot/metadata/message_content.h | 0 .../loot/metadata/plugin_cleaning_data.h | 0 .../include/loot/metadata/plugin_metadata.h | 0 {cxx => cpp}/include/loot/metadata/tag.h | 0 {cxx => cpp}/include/loot/plugin_interface.h | 0 {cxx => cpp}/include/loot/vertex.h | 0 {cxx => cpp}/src/api/api.cpp | 2 +- {cxx => cpp}/src/api/convert.cpp | 0 {cxx => cpp}/src/api/convert.h | 2 +- {cxx => cpp}/src/api/database.cpp | 0 {cxx => cpp}/src/api/database.h | 2 +- {cxx => cpp}/src/api/error_categories.cpp | 0 {cxx => cpp}/src/api/exception.cpp | 0 {cxx => cpp}/src/api/exception.h | 0 {cxx => cpp}/src/api/game.cpp | 0 {cxx => cpp}/src/api/game.h | 2 +- .../src/api/metadata/conditional_metadata.cpp | 0 {cxx => cpp}/src/api/metadata/file.cpp | 0 {cxx => cpp}/src/api/metadata/filename.cpp | 2 +- {cxx => cpp}/src/api/metadata/group.cpp | 0 {cxx => cpp}/src/api/metadata/location.cpp | 0 {cxx => cpp}/src/api/metadata/message.cpp | 0 .../src/api/metadata/message_content.cpp | 0 .../src/api/metadata/plugin_cleaning_data.cpp | 0 .../src/api/metadata/plugin_metadata.cpp | 2 +- {cxx => cpp}/src/api/metadata/tag.cpp | 0 {cxx => cpp}/src/api/plugin.cpp | 0 {cxx => cpp}/src/api/plugin.h | 2 +- {cxx => cpp}/src/api/resource.rc | 0 .../api/sorting/cyclic_interaction_error.cpp | 0 .../src/api/sorting/undefined_group_error.cpp | 0 {cxx => cpp}/src/api/vertex.cpp | 0 {cxx => cpp}/src/database.rs | 0 {cxx => cpp}/src/error.rs | 0 {cxx => cpp}/src/game.rs | 0 {cxx => cpp}/src/lib.rs | 0 {cxx => cpp}/src/metadata.rs | 0 {cxx => cpp}/src/plugin.rs | 0 .../api/interface/api_game_operations_test.h | 0 .../api/interface/create_game_handle_test.h | 0 .../api/interface/database_interface_test.h | 0 .../tests/api/interface/game_interface_test.h | 0 .../tests/api/interface/is_compatible_test.h | 0 {cxx => cpp}/src/tests/api/interface/main.cpp | 0 {cxx => cpp}/src/tests/api/internals/main.cpp | 2 +- .../metadata/conditional_metadata_test.h | 0 .../tests/api/internals/metadata/file_test.h | 0 .../tests/api/internals/metadata/group_test.h | 0 .../api/internals/metadata/location_test.h | 0 .../internals/metadata/message_content_test.h | 0 .../api/internals/metadata/message_test.h | 0 .../metadata/plugin_cleaning_data_test.h | 0 .../internals/metadata/plugin_metadata_test.h | 0 .../tests/api/internals/metadata/tag_test.h | 0 .../src/tests/common_game_test_fixture.h | 0 {cxx => cpp}/src/tests/printers.h | 0 {cxx => cpp}/src/tests/test_helpers.h | 0 90 files changed, 34 insertions(+), 36 deletions(-) rename {cxx => cpp}/.cargo/msvc-debug-config.toml (100%) rename {cxx => cpp}/.clang-format (100%) rename {cxx => cpp}/.gitignore (100%) rename {cxx => cpp}/CMakeLists.txt (93%) rename {cxx => cpp}/Cargo.toml (93%) rename {cxx => cpp}/README.md (100%) rename {cxx => cpp}/build.rs (95%) rename {cxx => cpp}/cmake/Config.cmake.in (100%) rename {cxx => cpp}/cmake/tests.cmake (99%) rename {cxx => cpp}/include/loot/api.h (100%) rename {cxx => cpp}/include/loot/api_decorator.h (100%) rename {cxx => cpp}/include/loot/database_interface.h (100%) rename {cxx => cpp}/include/loot/enum/edge_type.h (100%) rename {cxx => cpp}/include/loot/enum/game_type.h (100%) rename {cxx => cpp}/include/loot/enum/log_level.h (100%) rename {cxx => cpp}/include/loot/enum/message_type.h (100%) rename {cxx => cpp}/include/loot/exception/condition_syntax_error.h (100%) rename {cxx => cpp}/include/loot/exception/cyclic_interaction_error.h (100%) rename {cxx => cpp}/include/loot/exception/error_categories.h (100%) rename {cxx => cpp}/include/loot/exception/file_access_error.h (100%) rename {cxx => cpp}/include/loot/exception/undefined_group_error.h (100%) rename {cxx => cpp}/include/loot/game_interface.h (100%) rename {cxx => cpp}/include/loot/loot_version.h (100%) rename {cxx => cpp}/include/loot/metadata/conditional_metadata.h (100%) rename {cxx => cpp}/include/loot/metadata/file.h (100%) rename {cxx => cpp}/include/loot/metadata/filename.h (100%) rename {cxx => cpp}/include/loot/metadata/group.h (100%) rename {cxx => cpp}/include/loot/metadata/location.h (100%) rename {cxx => cpp}/include/loot/metadata/message.h (100%) rename {cxx => cpp}/include/loot/metadata/message_content.h (100%) rename {cxx => cpp}/include/loot/metadata/plugin_cleaning_data.h (100%) rename {cxx => cpp}/include/loot/metadata/plugin_metadata.h (100%) rename {cxx => cpp}/include/loot/metadata/tag.h (100%) rename {cxx => cpp}/include/loot/plugin_interface.h (100%) rename {cxx => cpp}/include/loot/vertex.h (100%) rename {cxx => cpp}/src/api/api.cpp (98%) rename {cxx => cpp}/src/api/convert.cpp (100%) rename {cxx => cpp}/src/api/convert.h (98%) rename {cxx => cpp}/src/api/database.cpp (100%) rename {cxx => cpp}/src/api/database.h (98%) rename {cxx => cpp}/src/api/error_categories.cpp (100%) rename {cxx => cpp}/src/api/exception.cpp (100%) rename {cxx => cpp}/src/api/exception.h (100%) rename {cxx => cpp}/src/api/game.cpp (100%) rename {cxx => cpp}/src/api/game.h (98%) rename {cxx => cpp}/src/api/metadata/conditional_metadata.cpp (100%) rename {cxx => cpp}/src/api/metadata/file.cpp (100%) rename {cxx => cpp}/src/api/metadata/filename.cpp (97%) rename {cxx => cpp}/src/api/metadata/group.cpp (100%) rename {cxx => cpp}/src/api/metadata/location.cpp (100%) rename {cxx => cpp}/src/api/metadata/message.cpp (100%) rename {cxx => cpp}/src/api/metadata/message_content.cpp (100%) rename {cxx => cpp}/src/api/metadata/plugin_cleaning_data.cpp (100%) rename {cxx => cpp}/src/api/metadata/plugin_metadata.cpp (99%) rename {cxx => cpp}/src/api/metadata/tag.cpp (100%) rename {cxx => cpp}/src/api/plugin.cpp (100%) rename {cxx => cpp}/src/api/plugin.h (97%) rename {cxx => cpp}/src/api/resource.rc (100%) rename {cxx => cpp}/src/api/sorting/cyclic_interaction_error.cpp (100%) rename {cxx => cpp}/src/api/sorting/undefined_group_error.cpp (100%) rename {cxx => cpp}/src/api/vertex.cpp (100%) rename {cxx => cpp}/src/database.rs (100%) rename {cxx => cpp}/src/error.rs (100%) rename {cxx => cpp}/src/game.rs (100%) rename {cxx => cpp}/src/lib.rs (100%) rename {cxx => cpp}/src/metadata.rs (100%) rename {cxx => cpp}/src/plugin.rs (100%) rename {cxx => cpp}/src/tests/api/interface/api_game_operations_test.h (100%) rename {cxx => cpp}/src/tests/api/interface/create_game_handle_test.h (100%) rename {cxx => cpp}/src/tests/api/interface/database_interface_test.h (100%) rename {cxx => cpp}/src/tests/api/interface/game_interface_test.h (100%) rename {cxx => cpp}/src/tests/api/interface/is_compatible_test.h (100%) rename {cxx => cpp}/src/tests/api/interface/main.cpp (100%) rename {cxx => cpp}/src/tests/api/internals/main.cpp (98%) rename {cxx => cpp}/src/tests/api/internals/metadata/conditional_metadata_test.h (100%) rename {cxx => cpp}/src/tests/api/internals/metadata/file_test.h (100%) rename {cxx => cpp}/src/tests/api/internals/metadata/group_test.h (100%) rename {cxx => cpp}/src/tests/api/internals/metadata/location_test.h (100%) rename {cxx => cpp}/src/tests/api/internals/metadata/message_content_test.h (100%) rename {cxx => cpp}/src/tests/api/internals/metadata/message_test.h (100%) rename {cxx => cpp}/src/tests/api/internals/metadata/plugin_cleaning_data_test.h (100%) rename {cxx => cpp}/src/tests/api/internals/metadata/plugin_metadata_test.h (100%) rename {cxx => cpp}/src/tests/api/internals/metadata/tag_test.h (100%) rename {cxx => cpp}/src/tests/common_game_test_fixture.h (100%) rename {cxx => cpp}/src/tests/printers.h (100%) rename {cxx => cpp}/src/tests/test_helpers.h (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81bfe344..0e835e55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,10 +124,6 @@ jobs: working-directory: nodejs run: npm test - - name: Build the CXX wrapper layer - working-directory: cxx - run: cargo build --release --target ${{ matrix.target.triple }} - - name: Get descriptive libloot version id: get-libloot-version shell: bash @@ -138,7 +134,7 @@ jobs: echo "version=$LIBLOOT_SAFE_DESC_REF" >> $GITHUB_OUTPUT - name: Build the C++ wrapper (Linux) - working-directory: cxx + working-directory: cpp run: | cmake \ -DCMAKE_BUILD_TYPE=${{ env.CMAKE_CONFIG }} \ @@ -149,7 +145,7 @@ jobs: if: runner.os == 'Linux' - name: Build the C++ wrapper (Windows) - working-directory: cxx + working-directory: cpp run: | cmake -G "Visual Studio 16 2019" ` -A ${{ matrix.target.platform }} ` @@ -160,11 +156,11 @@ jobs: if: runner.os == 'Windows' - name: Run the C++ wrapper tests - working-directory: cxx + working-directory: cpp run: ctest --test-dir build --build-config ${{ env.CMAKE_CONFIG }} --output-on-failure --parallel - name: Package the C++ wrapper - working-directory: cxx/build + working-directory: cpp/build run: cpack -C ${{ env.CMAKE_CONFIG }} - name: Get archive name @@ -193,5 +189,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ steps.archive-name.outputs.filename }} - path: cxx/build/package/${{ steps.archive-name.outputs.filename }} + path: cpp/build/package/${{ steps.archive-name.outputs.filename }} if: github.event_name == 'push' diff --git a/Cargo.lock b/Cargo.lock index 0d506cdc..098ab28e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -565,7 +565,7 @@ dependencies = [ ] [[package]] -name = "libloot-cxx" +name = "libloot-cpp" version = "0.26.0" dependencies = [ "cxx", diff --git a/Cargo.toml b/Cargo.toml index bb69d325..d73b7cc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ parameterized-test = { path = "./parameterized-test" } tempfile = "3.17.1" [workspace] -members = ["cxx", "ffi-errors", "nodejs", "parameterized-test", "python"] +members = ["cpp", "ffi-errors", "nodejs", "parameterized-test", "python"] [workspace.dependencies] esplugin = "6.1.2" diff --git a/README.md b/README.md index f3114a65..a36bea18 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is an **experimental** reimplementation of [libloot](https://github.com/loot/libloot) using Rust instead of C++, that should match libloot v0.26.0. -See the `cxx` and `python` subdirectories for C++ and Python wrappers respectively. +See the `cpp` and `python` subdirectories for C++ and Python wrappers respectively. Expect: diff --git a/cxx/.cargo/msvc-debug-config.toml b/cpp/.cargo/msvc-debug-config.toml similarity index 100% rename from cxx/.cargo/msvc-debug-config.toml rename to cpp/.cargo/msvc-debug-config.toml diff --git a/cxx/.clang-format b/cpp/.clang-format similarity index 100% rename from cxx/.clang-format rename to cpp/.clang-format diff --git a/cxx/.gitignore b/cpp/.gitignore similarity index 100% rename from cxx/.gitignore rename to cpp/.gitignore diff --git a/cxx/CMakeLists.txt b/cpp/CMakeLists.txt similarity index 93% rename from cxx/CMakeLists.txt rename to cpp/CMakeLists.txt index 234a129e..5f234e79 100644 --- a/cxx/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -25,9 +25,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ############################## if(MSVC) - set(LIBLOOT_CXX_FILENAME "libloot_cxx.lib") + set(LIBLOOT_CPP_FILENAME "libloot_cpp.lib") else() - set(LIBLOOT_CXX_FILENAME "liblibloot_cxx.a") + set(LIBLOOT_CPP_FILENAME "liblibloot_cpp.a") endif() if(DEFINED RUST_TARGET) @@ -36,25 +36,27 @@ else() set(TARGET_PATH "${CMAKE_SOURCE_DIR}/../target") endif() -add_custom_target(libloot-cxx-build +add_custom_target(libloot-cpp-build COMMAND cargo build $<$>:--release> $<$,$>:--config> $<$,$>:${CMAKE_SOURCE_DIR}/.cargo/msvc-debug-config.toml> + $<$:--target> + $<$:${RUST_TARGET}> BYPRODUCTS - "${TARGET_PATH}/$,debug,release>/${LIBLOOT_CXX_FILENAME}" - "${TARGET_PATH}/cxxbridge/libloot-cxx/src/lib.rs.cc" - "${TARGET_PATH}/cxxbridge/libloot-cxx/src/lib.rs.h" + "${TARGET_PATH}/$,debug,release>/${LIBLOOT_CPP_FILENAME}" + "${TARGET_PATH}/cxxbridge/libloot-cpp/src/lib.rs.cc" + "${TARGET_PATH}/cxxbridge/libloot-cpp/src/lib.rs.h" "${TARGET_PATH}/cxxbridge/rust/cxx.h" ) -add_library(libloot-cxx INTERFACE) -add_dependencies(libloot-cxx libloot-cxx-build) +add_library(libloot-cpp INTERFACE) +add_dependencies(libloot-cpp libloot-cpp-build) -target_link_libraries(libloot-cxx INTERFACE - optimized "${TARGET_PATH}/release/${LIBLOOT_CXX_FILENAME}" - debug "${TARGET_PATH}/debug/${LIBLOOT_CXX_FILENAME}") -target_include_directories(libloot-cxx INTERFACE "${TARGET_PATH}/cxxbridge") +target_link_libraries(libloot-cpp INTERFACE + optimized "${TARGET_PATH}/release/${LIBLOOT_CPP_FILENAME}" + debug "${TARGET_PATH}/debug/${LIBLOOT_CPP_FILENAME}") +target_include_directories(libloot-cpp INTERFACE "${TARGET_PATH}/cxxbridge") ############################## @@ -142,7 +144,7 @@ set(LIBLOOT_ALL_SOURCES # Build API. add_library(loot ${LIBLOOT_ALL_SOURCES}) -target_link_libraries(loot PRIVATE libloot-cxx) +target_link_libraries(loot PRIVATE libloot-cpp) ############################## # Set Target-Specific Flags diff --git a/cxx/Cargo.toml b/cpp/Cargo.toml similarity index 93% rename from cxx/Cargo.toml rename to cpp/Cargo.toml index ae45aad3..6c44e949 100644 --- a/cxx/Cargo.toml +++ b/cpp/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "libloot-cxx" +name = "libloot-cpp" version = "0.26.0" edition = "2024" license = "GPL-3.0" diff --git a/cxx/README.md b/cpp/README.md similarity index 100% rename from cxx/README.md rename to cpp/README.md diff --git a/cxx/build.rs b/cpp/build.rs similarity index 95% rename from cxx/build.rs rename to cpp/build.rs index d805cf29..9e470942 100644 --- a/cxx/build.rs +++ b/cpp/build.rs @@ -3,7 +3,7 @@ fn main() { .std("c++17") .flag_if_supported("/Zc:__cplusplus") .flag_if_supported("/permissive-") - .compile("libloot-cxx"); + .compile("libloot-cpp"); // From if std::env::var("TARGET").is_ok_and(|s| s.contains("windows-msvc")) { diff --git a/cxx/cmake/Config.cmake.in b/cpp/cmake/Config.cmake.in similarity index 100% rename from cxx/cmake/Config.cmake.in rename to cpp/cmake/Config.cmake.in diff --git a/cxx/cmake/tests.cmake b/cpp/cmake/tests.cmake similarity index 99% rename from cxx/cmake/tests.cmake rename to cpp/cmake/tests.cmake index 8eed90d0..27c4636a 100644 --- a/cxx/cmake/tests.cmake +++ b/cpp/cmake/tests.cmake @@ -97,7 +97,7 @@ set(LIBLOOT_INTERFACE_TESTS_ALL_SOURCES # Build tests. add_executable(libloot_internals_tests ${LIBLOOT_INTERNALS_TESTS_ALL_SOURCES}) target_link_libraries(libloot_internals_tests PRIVATE - libloot-cxx + libloot-cpp GTest::gtest_main) # Build API tests. diff --git a/cxx/include/loot/api.h b/cpp/include/loot/api.h similarity index 100% rename from cxx/include/loot/api.h rename to cpp/include/loot/api.h diff --git a/cxx/include/loot/api_decorator.h b/cpp/include/loot/api_decorator.h similarity index 100% rename from cxx/include/loot/api_decorator.h rename to cpp/include/loot/api_decorator.h diff --git a/cxx/include/loot/database_interface.h b/cpp/include/loot/database_interface.h similarity index 100% rename from cxx/include/loot/database_interface.h rename to cpp/include/loot/database_interface.h diff --git a/cxx/include/loot/enum/edge_type.h b/cpp/include/loot/enum/edge_type.h similarity index 100% rename from cxx/include/loot/enum/edge_type.h rename to cpp/include/loot/enum/edge_type.h diff --git a/cxx/include/loot/enum/game_type.h b/cpp/include/loot/enum/game_type.h similarity index 100% rename from cxx/include/loot/enum/game_type.h rename to cpp/include/loot/enum/game_type.h diff --git a/cxx/include/loot/enum/log_level.h b/cpp/include/loot/enum/log_level.h similarity index 100% rename from cxx/include/loot/enum/log_level.h rename to cpp/include/loot/enum/log_level.h diff --git a/cxx/include/loot/enum/message_type.h b/cpp/include/loot/enum/message_type.h similarity index 100% rename from cxx/include/loot/enum/message_type.h rename to cpp/include/loot/enum/message_type.h diff --git a/cxx/include/loot/exception/condition_syntax_error.h b/cpp/include/loot/exception/condition_syntax_error.h similarity index 100% rename from cxx/include/loot/exception/condition_syntax_error.h rename to cpp/include/loot/exception/condition_syntax_error.h diff --git a/cxx/include/loot/exception/cyclic_interaction_error.h b/cpp/include/loot/exception/cyclic_interaction_error.h similarity index 100% rename from cxx/include/loot/exception/cyclic_interaction_error.h rename to cpp/include/loot/exception/cyclic_interaction_error.h diff --git a/cxx/include/loot/exception/error_categories.h b/cpp/include/loot/exception/error_categories.h similarity index 100% rename from cxx/include/loot/exception/error_categories.h rename to cpp/include/loot/exception/error_categories.h diff --git a/cxx/include/loot/exception/file_access_error.h b/cpp/include/loot/exception/file_access_error.h similarity index 100% rename from cxx/include/loot/exception/file_access_error.h rename to cpp/include/loot/exception/file_access_error.h diff --git a/cxx/include/loot/exception/undefined_group_error.h b/cpp/include/loot/exception/undefined_group_error.h similarity index 100% rename from cxx/include/loot/exception/undefined_group_error.h rename to cpp/include/loot/exception/undefined_group_error.h diff --git a/cxx/include/loot/game_interface.h b/cpp/include/loot/game_interface.h similarity index 100% rename from cxx/include/loot/game_interface.h rename to cpp/include/loot/game_interface.h diff --git a/cxx/include/loot/loot_version.h b/cpp/include/loot/loot_version.h similarity index 100% rename from cxx/include/loot/loot_version.h rename to cpp/include/loot/loot_version.h diff --git a/cxx/include/loot/metadata/conditional_metadata.h b/cpp/include/loot/metadata/conditional_metadata.h similarity index 100% rename from cxx/include/loot/metadata/conditional_metadata.h rename to cpp/include/loot/metadata/conditional_metadata.h diff --git a/cxx/include/loot/metadata/file.h b/cpp/include/loot/metadata/file.h similarity index 100% rename from cxx/include/loot/metadata/file.h rename to cpp/include/loot/metadata/file.h diff --git a/cxx/include/loot/metadata/filename.h b/cpp/include/loot/metadata/filename.h similarity index 100% rename from cxx/include/loot/metadata/filename.h rename to cpp/include/loot/metadata/filename.h diff --git a/cxx/include/loot/metadata/group.h b/cpp/include/loot/metadata/group.h similarity index 100% rename from cxx/include/loot/metadata/group.h rename to cpp/include/loot/metadata/group.h diff --git a/cxx/include/loot/metadata/location.h b/cpp/include/loot/metadata/location.h similarity index 100% rename from cxx/include/loot/metadata/location.h rename to cpp/include/loot/metadata/location.h diff --git a/cxx/include/loot/metadata/message.h b/cpp/include/loot/metadata/message.h similarity index 100% rename from cxx/include/loot/metadata/message.h rename to cpp/include/loot/metadata/message.h diff --git a/cxx/include/loot/metadata/message_content.h b/cpp/include/loot/metadata/message_content.h similarity index 100% rename from cxx/include/loot/metadata/message_content.h rename to cpp/include/loot/metadata/message_content.h diff --git a/cxx/include/loot/metadata/plugin_cleaning_data.h b/cpp/include/loot/metadata/plugin_cleaning_data.h similarity index 100% rename from cxx/include/loot/metadata/plugin_cleaning_data.h rename to cpp/include/loot/metadata/plugin_cleaning_data.h diff --git a/cxx/include/loot/metadata/plugin_metadata.h b/cpp/include/loot/metadata/plugin_metadata.h similarity index 100% rename from cxx/include/loot/metadata/plugin_metadata.h rename to cpp/include/loot/metadata/plugin_metadata.h diff --git a/cxx/include/loot/metadata/tag.h b/cpp/include/loot/metadata/tag.h similarity index 100% rename from cxx/include/loot/metadata/tag.h rename to cpp/include/loot/metadata/tag.h diff --git a/cxx/include/loot/plugin_interface.h b/cpp/include/loot/plugin_interface.h similarity index 100% rename from cxx/include/loot/plugin_interface.h rename to cpp/include/loot/plugin_interface.h diff --git a/cxx/include/loot/vertex.h b/cpp/include/loot/vertex.h similarity index 100% rename from cxx/include/loot/vertex.h rename to cpp/include/loot/vertex.h diff --git a/cxx/src/api/api.cpp b/cpp/src/api/api.cpp similarity index 98% rename from cxx/src/api/api.cpp rename to cpp/src/api/api.cpp index a2bcb6ae..a0252c34 100644 --- a/cxx/src/api/api.cpp +++ b/cpp/src/api/api.cpp @@ -3,7 +3,7 @@ #include "loot/api.h" #include "api/game.h" -#include "libloot-cxx/src/lib.rs.h" +#include "libloot-cpp/src/lib.rs.h" #include "rust/cxx.h" extern "C" { diff --git a/cxx/src/api/convert.cpp b/cpp/src/api/convert.cpp similarity index 100% rename from cxx/src/api/convert.cpp rename to cpp/src/api/convert.cpp diff --git a/cxx/src/api/convert.h b/cpp/src/api/convert.h similarity index 98% rename from cxx/src/api/convert.h rename to cpp/src/api/convert.h index 998c3d72..99cfae5c 100644 --- a/cxx/src/api/convert.h +++ b/cpp/src/api/convert.h @@ -1,7 +1,7 @@ #ifndef LOOT_API_CONVERT #define LOOT_API_CONVERT -#include "libloot-cxx/src/lib.rs.h" +#include "libloot-cpp/src/lib.rs.h" #include "loot/metadata/group.h" #include "loot/metadata/plugin_metadata.h" #include "loot/vertex.h" diff --git a/cxx/src/api/database.cpp b/cpp/src/api/database.cpp similarity index 100% rename from cxx/src/api/database.cpp rename to cpp/src/api/database.cpp diff --git a/cxx/src/api/database.h b/cpp/src/api/database.h similarity index 98% rename from cxx/src/api/database.h rename to cpp/src/api/database.h index 393625e9..34a370b0 100644 --- a/cxx/src/api/database.h +++ b/cpp/src/api/database.h @@ -1,7 +1,7 @@ #ifndef LOOT_API_DATABASE #define LOOT_API_DATABASE -#include "libloot-cxx/src/lib.rs.h" +#include "libloot-cpp/src/lib.rs.h" #include "loot/database_interface.h" #include "rust/cxx.h" diff --git a/cxx/src/api/error_categories.cpp b/cpp/src/api/error_categories.cpp similarity index 100% rename from cxx/src/api/error_categories.cpp rename to cpp/src/api/error_categories.cpp diff --git a/cxx/src/api/exception.cpp b/cpp/src/api/exception.cpp similarity index 100% rename from cxx/src/api/exception.cpp rename to cpp/src/api/exception.cpp diff --git a/cxx/src/api/exception.h b/cpp/src/api/exception.h similarity index 100% rename from cxx/src/api/exception.h rename to cpp/src/api/exception.h diff --git a/cxx/src/api/game.cpp b/cpp/src/api/game.cpp similarity index 100% rename from cxx/src/api/game.cpp rename to cpp/src/api/game.cpp diff --git a/cxx/src/api/game.h b/cpp/src/api/game.h similarity index 98% rename from cxx/src/api/game.h rename to cpp/src/api/game.h index 85fb4886..58c4e72c 100644 --- a/cxx/src/api/game.h +++ b/cpp/src/api/game.h @@ -5,7 +5,7 @@ #include "api/database.h" #include "api/plugin.h" -#include "libloot-cxx/src/lib.rs.h" +#include "libloot-cpp/src/lib.rs.h" #include "loot/game_interface.h" #include "loot/metadata/filename.h" #include "rust/cxx.h" diff --git a/cxx/src/api/metadata/conditional_metadata.cpp b/cpp/src/api/metadata/conditional_metadata.cpp similarity index 100% rename from cxx/src/api/metadata/conditional_metadata.cpp rename to cpp/src/api/metadata/conditional_metadata.cpp diff --git a/cxx/src/api/metadata/file.cpp b/cpp/src/api/metadata/file.cpp similarity index 100% rename from cxx/src/api/metadata/file.cpp rename to cpp/src/api/metadata/file.cpp diff --git a/cxx/src/api/metadata/filename.cpp b/cpp/src/api/metadata/filename.cpp similarity index 97% rename from cxx/src/api/metadata/filename.cpp rename to cpp/src/api/metadata/filename.cpp index 54a34964..9d24d90e 100644 --- a/cxx/src/api/metadata/filename.cpp +++ b/cpp/src/api/metadata/filename.cpp @@ -27,7 +27,7 @@ #include // #include "api/helpers/text.h" -#include "libloot-cxx/src/lib.rs.h" +#include "libloot-cpp/src/lib.rs.h" namespace loot { Filename::Filename(std::string_view filename) : filename_(filename) {} diff --git a/cxx/src/api/metadata/group.cpp b/cpp/src/api/metadata/group.cpp similarity index 100% rename from cxx/src/api/metadata/group.cpp rename to cpp/src/api/metadata/group.cpp diff --git a/cxx/src/api/metadata/location.cpp b/cpp/src/api/metadata/location.cpp similarity index 100% rename from cxx/src/api/metadata/location.cpp rename to cpp/src/api/metadata/location.cpp diff --git a/cxx/src/api/metadata/message.cpp b/cpp/src/api/metadata/message.cpp similarity index 100% rename from cxx/src/api/metadata/message.cpp rename to cpp/src/api/metadata/message.cpp diff --git a/cxx/src/api/metadata/message_content.cpp b/cpp/src/api/metadata/message_content.cpp similarity index 100% rename from cxx/src/api/metadata/message_content.cpp rename to cpp/src/api/metadata/message_content.cpp diff --git a/cxx/src/api/metadata/plugin_cleaning_data.cpp b/cpp/src/api/metadata/plugin_cleaning_data.cpp similarity index 100% rename from cxx/src/api/metadata/plugin_cleaning_data.cpp rename to cpp/src/api/metadata/plugin_cleaning_data.cpp diff --git a/cxx/src/api/metadata/plugin_metadata.cpp b/cpp/src/api/metadata/plugin_metadata.cpp similarity index 99% rename from cxx/src/api/metadata/plugin_metadata.cpp rename to cpp/src/api/metadata/plugin_metadata.cpp index 7430b95b..5163d278 100644 --- a/cxx/src/api/metadata/plugin_metadata.cpp +++ b/cpp/src/api/metadata/plugin_metadata.cpp @@ -29,7 +29,7 @@ #include #include "api/convert.h" -#include "libloot-cxx/src/lib.rs.h" +#include "libloot-cpp/src/lib.rs.h" namespace { // Append second to first, skipping any elements that are already present in diff --git a/cxx/src/api/metadata/tag.cpp b/cpp/src/api/metadata/tag.cpp similarity index 100% rename from cxx/src/api/metadata/tag.cpp rename to cpp/src/api/metadata/tag.cpp diff --git a/cxx/src/api/plugin.cpp b/cpp/src/api/plugin.cpp similarity index 100% rename from cxx/src/api/plugin.cpp rename to cpp/src/api/plugin.cpp diff --git a/cxx/src/api/plugin.h b/cpp/src/api/plugin.h similarity index 97% rename from cxx/src/api/plugin.h rename to cpp/src/api/plugin.h index 32107e02..d77321f3 100644 --- a/cxx/src/api/plugin.h +++ b/cpp/src/api/plugin.h @@ -8,7 +8,7 @@ #include #include -#include "libloot-cxx/src/lib.rs.h" +#include "libloot-cpp/src/lib.rs.h" #include "loot/metadata/tag.h" #include "loot/plugin_interface.h" diff --git a/cxx/src/api/resource.rc b/cpp/src/api/resource.rc similarity index 100% rename from cxx/src/api/resource.rc rename to cpp/src/api/resource.rc diff --git a/cxx/src/api/sorting/cyclic_interaction_error.cpp b/cpp/src/api/sorting/cyclic_interaction_error.cpp similarity index 100% rename from cxx/src/api/sorting/cyclic_interaction_error.cpp rename to cpp/src/api/sorting/cyclic_interaction_error.cpp diff --git a/cxx/src/api/sorting/undefined_group_error.cpp b/cpp/src/api/sorting/undefined_group_error.cpp similarity index 100% rename from cxx/src/api/sorting/undefined_group_error.cpp rename to cpp/src/api/sorting/undefined_group_error.cpp diff --git a/cxx/src/api/vertex.cpp b/cpp/src/api/vertex.cpp similarity index 100% rename from cxx/src/api/vertex.cpp rename to cpp/src/api/vertex.cpp diff --git a/cxx/src/database.rs b/cpp/src/database.rs similarity index 100% rename from cxx/src/database.rs rename to cpp/src/database.rs diff --git a/cxx/src/error.rs b/cpp/src/error.rs similarity index 100% rename from cxx/src/error.rs rename to cpp/src/error.rs diff --git a/cxx/src/game.rs b/cpp/src/game.rs similarity index 100% rename from cxx/src/game.rs rename to cpp/src/game.rs diff --git a/cxx/src/lib.rs b/cpp/src/lib.rs similarity index 100% rename from cxx/src/lib.rs rename to cpp/src/lib.rs diff --git a/cxx/src/metadata.rs b/cpp/src/metadata.rs similarity index 100% rename from cxx/src/metadata.rs rename to cpp/src/metadata.rs diff --git a/cxx/src/plugin.rs b/cpp/src/plugin.rs similarity index 100% rename from cxx/src/plugin.rs rename to cpp/src/plugin.rs diff --git a/cxx/src/tests/api/interface/api_game_operations_test.h b/cpp/src/tests/api/interface/api_game_operations_test.h similarity index 100% rename from cxx/src/tests/api/interface/api_game_operations_test.h rename to cpp/src/tests/api/interface/api_game_operations_test.h diff --git a/cxx/src/tests/api/interface/create_game_handle_test.h b/cpp/src/tests/api/interface/create_game_handle_test.h similarity index 100% rename from cxx/src/tests/api/interface/create_game_handle_test.h rename to cpp/src/tests/api/interface/create_game_handle_test.h diff --git a/cxx/src/tests/api/interface/database_interface_test.h b/cpp/src/tests/api/interface/database_interface_test.h similarity index 100% rename from cxx/src/tests/api/interface/database_interface_test.h rename to cpp/src/tests/api/interface/database_interface_test.h diff --git a/cxx/src/tests/api/interface/game_interface_test.h b/cpp/src/tests/api/interface/game_interface_test.h similarity index 100% rename from cxx/src/tests/api/interface/game_interface_test.h rename to cpp/src/tests/api/interface/game_interface_test.h diff --git a/cxx/src/tests/api/interface/is_compatible_test.h b/cpp/src/tests/api/interface/is_compatible_test.h similarity index 100% rename from cxx/src/tests/api/interface/is_compatible_test.h rename to cpp/src/tests/api/interface/is_compatible_test.h diff --git a/cxx/src/tests/api/interface/main.cpp b/cpp/src/tests/api/interface/main.cpp similarity index 100% rename from cxx/src/tests/api/interface/main.cpp rename to cpp/src/tests/api/interface/main.cpp diff --git a/cxx/src/tests/api/internals/main.cpp b/cpp/src/tests/api/internals/main.cpp similarity index 98% rename from cxx/src/tests/api/internals/main.cpp rename to cpp/src/tests/api/internals/main.cpp index 4a09bb8a..1b0774e6 100644 --- a/cxx/src/tests/api/internals/main.cpp +++ b/cpp/src/tests/api/internals/main.cpp @@ -2,7 +2,7 @@ #include -#include "libloot-cxx/src/lib.rs.h" +#include "libloot-cpp/src/lib.rs.h" #include "rust/cxx.h" #include "tests/api/internals/metadata/conditional_metadata_test.h" #include "tests/api/internals/metadata/file_test.h" diff --git a/cxx/src/tests/api/internals/metadata/conditional_metadata_test.h b/cpp/src/tests/api/internals/metadata/conditional_metadata_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/conditional_metadata_test.h rename to cpp/src/tests/api/internals/metadata/conditional_metadata_test.h diff --git a/cxx/src/tests/api/internals/metadata/file_test.h b/cpp/src/tests/api/internals/metadata/file_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/file_test.h rename to cpp/src/tests/api/internals/metadata/file_test.h diff --git a/cxx/src/tests/api/internals/metadata/group_test.h b/cpp/src/tests/api/internals/metadata/group_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/group_test.h rename to cpp/src/tests/api/internals/metadata/group_test.h diff --git a/cxx/src/tests/api/internals/metadata/location_test.h b/cpp/src/tests/api/internals/metadata/location_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/location_test.h rename to cpp/src/tests/api/internals/metadata/location_test.h diff --git a/cxx/src/tests/api/internals/metadata/message_content_test.h b/cpp/src/tests/api/internals/metadata/message_content_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/message_content_test.h rename to cpp/src/tests/api/internals/metadata/message_content_test.h diff --git a/cxx/src/tests/api/internals/metadata/message_test.h b/cpp/src/tests/api/internals/metadata/message_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/message_test.h rename to cpp/src/tests/api/internals/metadata/message_test.h diff --git a/cxx/src/tests/api/internals/metadata/plugin_cleaning_data_test.h b/cpp/src/tests/api/internals/metadata/plugin_cleaning_data_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/plugin_cleaning_data_test.h rename to cpp/src/tests/api/internals/metadata/plugin_cleaning_data_test.h diff --git a/cxx/src/tests/api/internals/metadata/plugin_metadata_test.h b/cpp/src/tests/api/internals/metadata/plugin_metadata_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/plugin_metadata_test.h rename to cpp/src/tests/api/internals/metadata/plugin_metadata_test.h diff --git a/cxx/src/tests/api/internals/metadata/tag_test.h b/cpp/src/tests/api/internals/metadata/tag_test.h similarity index 100% rename from cxx/src/tests/api/internals/metadata/tag_test.h rename to cpp/src/tests/api/internals/metadata/tag_test.h diff --git a/cxx/src/tests/common_game_test_fixture.h b/cpp/src/tests/common_game_test_fixture.h similarity index 100% rename from cxx/src/tests/common_game_test_fixture.h rename to cpp/src/tests/common_game_test_fixture.h diff --git a/cxx/src/tests/printers.h b/cpp/src/tests/printers.h similarity index 100% rename from cxx/src/tests/printers.h rename to cpp/src/tests/printers.h diff --git a/cxx/src/tests/test_helpers.h b/cpp/src/tests/test_helpers.h similarity index 100% rename from cxx/src/tests/test_helpers.h rename to cpp/src/tests/test_helpers.h