Reorganized directories

Readded .editorconfig
C wrapper can be built again
Delphi library can be built again
Initial cleanup of cmake files

.clang-format

@@ -19,7 +19,7 @@ AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
-BraceWrapping:
+BraceWrapping:   
   AfterClass:      true
   AfterControlStatement: true
   AfterEnum:       true
@@ -55,13 +55,13 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros:
+ForEachMacros:   
   - forever
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
 IncludeBlocks:   Preserve
-IncludeCategories:
+IncludeCategories: 
   - Regex:           '^<Q.*'
     Priority:        200
   - Regex:           '^(<|"(gtest|gmock|isl|json)/)'

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 2

.gitattributes

@@ -1,7 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.cpp text eol=crlf
-*.h text eol=crlf

.github/workflows/build.yml

@@ -1,64 +0,0 @@
-name: Build libbsarch
-
-on:
-  push:
-    branches: [master]
-    tags:
-      - "*"
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-env:
-  VCPKG_BINARY_SOURCES: clear;x-azblob,${{ vars.AZ_BLOB_VCPKG_URL }},${{ secrets.AZ_BLOB_SAS }},readwrite
-
-jobs:
-  build:
-    runs-on: windows-2022
-    steps:
-      - name: "Set environmental variables"
-        shell: bash
-        run: |
-          echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
-
-      - uses: actions/checkout@v4
-
-      - run: cmake --preset vs2022-windows "-DCMAKE_INSTALL_PREFIX=install"
-
-      # build both Debug and Release for package
-      - name: Build libbsarch
-        run: |
-          cmake --build vsbuild --config Debug --verbose
-          cmake --build vsbuild --config Release --verbose
-
-      - name: Install libbsarch
-        run: |
-          cmake --install vsbuild --config Debug
-          cmake --install vsbuild --config Release
-
-      - name: Upload libbsarch artifact
-        uses: actions/upload-artifact@master
-        with:
-          name: libbsarch
-          path: ./install
-
-  publish:
-    if: github.ref_type == 'tag'
-    needs: build
-    runs-on: windows-2022
-    permissions:
-      contents: write
-    steps:
-      - name: Download Artifact
-        uses: actions/download-artifact@master
-        with:
-          name: libbsarch
-          path: ./install
-
-      - name: Create libbsarch archive
-        run: 7z a libbsarch_${{ github.ref_name }}.7z ./install/*
-
-      - name: Publish Release
-        env:
-          GH_TOKEN: ${{ github.token }}
-          GH_REPO: ${{ github.repository }}
-        run: gh release create --draft=false --notes="${{ github.ref_name }}" "${{ github.ref_name }}" ./libbsarch_${{ github.ref_name }}.7z

.github/workflows/linting.yml

@@ -1,17 +0,0 @@
-name: Lint libbsarch
-
-on:
-  push:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Check format
-        uses: ModOrganizer2/check-formatting-action@master
-        with:
-          check-path: "."
-          exclude-regex: "third-party"

.gitignore

@@ -49,7 +49,6 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 
-
 ### CMake Patch ###
 # External projects
 *-prefix/
@@ -135,7 +134,6 @@ ui_*.h
 *.jsc
 Makefile*
 *build-*
-vsbuild
 
 # Qt unit tests
 target_wrapper.*
@@ -532,8 +530,4 @@ MigrationBackup/
 
 # End of https://www.gitignore.io/api/qt,c++,cmake,delphi,qtcreator,visualstudio
 
-install
-examples/build
-examples/vsbuild
-examples/test_ba1
-examples/test_ba2
+**/build

.pre-commit-config.yaml

@@ -1,20 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
-    hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-merge-conflict
-      - id: check-case-conflict
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.5
-    hooks:
-    - id: clang-format
-      'types_or': [c++, c]
-
-ci:
-  autofix_commit_msg: "[pre-commit.ci] Auto fixes from pre-commit.com hooks."
-  autofix_prs: true
-  autoupdate_commit_msg: "[pre-commit.ci] Pre-commit autoupdate."
-  autoupdate_schedule: quarterly
-  submodules: false

CMakeLists.txt

@@ -1,127 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-
-include(CMakePackageConfigHelpers)
-
-project(libbsarch CXX)
-
-find_package(mo2-dds-header CONFIG REQUIRED)
-
-get_target_property(SRCS mo2::dds-header SOURCES)
-
-# libbsarch
-add_library(libbsarch SHARED)
-target_sources(libbsarch
-    PRIVATE
-        src/libbsarch.cpp
-        src/libbsarch.def
-    PUBLIC
-        FILE_SET HEADERS
-        BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
-        FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.h
-)
-target_include_directories(libbsarch PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch)
-set_target_properties(libbsarch PROPERTIES DEBUG_POSTFIX "d" CXX_STANDARD 11)
-target_link_libraries(libbsarch PUBLIC mo2::dds-header)
-target_compile_definitions(libbsarch PRIVATE BSARCH_DLL_EXPORT)
-
-# preprocessor definitions
-if(MSVC)
-    target_compile_options(libbsarch PRIVATE
-        /W3 /EHsc /MP
-        $<$<CONFIG:DEBUG>:/MDd /Od>
-        $<$<CONFIG:RELEASE>:/Zi>
-    )
-endif()
-
-
-# libbsarch_OOP
-add_library(libbsarch_OOP STATIC)
-
-target_sources(libbsarch_OOP
-    PRIVATE
-        src/bs_archive_entries.cpp
-        src/utils/string_convert.cpp
-        src/utils/convertible_ostream.cpp
-        src/utils/convertible_string.cpp
-        src/bs_archive_auto.cpp
-        src/bs_archive.cpp
-    PUBLIC
-        FILE_SET HEADERS
-        BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
-        FILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/base_types.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive_auto.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive_entries.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/convertible_string.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/convertible_ostream.hpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/string_convert.hpp
-)
-target_include_directories(libbsarch_OOP PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils)
-target_link_libraries(libbsarch_OOP PUBLIC mo2::dds-header)
-
-set_target_properties(libbsarch_OOP PROPERTIES
-    DEBUG_POSTFIX "d"
-    CXX_STANDARD 17
-)
-
-if (MSVC)
-    target_compile_options(libbsarch_OOP PRIVATE /MP)
-endif()
-
-# target_link_libraries(libbsarch_OOP PUBLIC libbsarch)
-
-# install
-
-# finding 32 or 64bits
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    # 64 bits
-    set(lib_delphi "${CMAKE_CURRENT_SOURCE_DIR}/delphi/lib64")
-    message("libbsarch: using 64bits DLL")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    # 32 bits
-    set(lib_delphi "${CMAKE_CURRENT_SOURCE_DIR}/delphi/lib")
-    message("libbsarch: using 32bits DLL")
-endif()
-
-install(TARGETS libbsarch libbsarch_OOP EXPORT libbsarchTargets FILE_SET HEADERS)
-install(FILES $<TARGET_PDB_FILE:libbsarch> DESTINATION pdb OPTIONAL)
-install(EXPORT libbsarchTargets
-        FILE mo2-libbsarch-targets.cmake
-        NAMESPACE mo2::
-        DESTINATION lib/cmake/mo2-libbsarch
-)
-
-# install the true DLLs
-install(FILES ${lib_delphi}/libbsarch.dll DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-install(FILES ${lib_delphi}/libbsarchd.dll DESTINATION bin CONFIGURATIONS Debug)
-
-configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.cmake.in
-  "${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config.cmake"
-  INSTALL_DESTINATION "lib/cmake/mo2-libbsarch"
-  NO_SET_AND_CHECK_MACRO
-  NO_CHECK_REQUIRED_COMPONENTS_MACRO
-)
-
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/Version.cmake)
-set(LIBBSARCH_VERSION
-  ${LIBBSARCH_MAJOR_VERSION}.${LIBBSARCH_MINOR_VERSION}.${LIBBSARCH_PATCH_VERSION})
-
-
-write_basic_package_version_file(
-  "${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config-version.cmake"
-  VERSION "${LIBBSARCH_VERSION}"
-  COMPATIBILITY AnyNewerVersion
-  ARCH_INDEPENDENT
-)
-
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config-version.cmake
-  DESTINATION lib/cmake/mo2-libbsarch
-)

CMakePresets.json

@@ -1,17 +0,0 @@
-{
-  "configurePresets": [
-    {
-      "binaryDir": "${sourceDir}/vsbuild",
-      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-      "generator": "Visual Studio 17 2022",
-      "name": "vs2022-windows"
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "vs2022-windows",
-      "configurePreset": "vs2022-windows"
-    }
-  ],
-  "version": 4
-}

README.md

@@ -1,5 +1,4 @@
 # BSArchive DLL and C++ bindings
-
 BSArchive Dynamic Link Library and C++ bindings
 
 ## How to build
@@ -10,7 +9,7 @@ BSArchive Dynamic Link Library and C++ bindings
 
 ## How to use
 
-With CMake:
+With CMake: 
 Use ``add_subdirectory`` and ``target_link_library``
 Then ``#include "libbsarch.h"`` for the C wrapper, or ``#include "bs_archive_auto"`` for the C++ wrapper.
 See the example for code use.
@@ -21,5 +20,4 @@ Use `libbsarch.dll` (provided in delphi/lib), `libbsarch.lib` and `libbsarch.h`
 ## Credits
 
 The original BSArchive can be found at: https://github.com/TES5Edit/TES5Edit/tree/dev/Tools/BSArchive
-The version in this project had been modified for better compatibility with C/C++ and
-allow the users to allocate their own memory in some cases.
+The version in this project had been modified for better compatibility with C/C++ and allow the users to allocate their own memory in some cases.

Version.cmake

@@ -1,3 +0,0 @@
-set(LIBBSARCH_MAJOR_VERSION 0)
-set(LIBBSARCH_MINOR_VERSION 1)
-set(LIBBSARCH_PATCH_VERSION 2)

cmake/config.cmake.in

@@ -1,37 +0,0 @@
-@PACKAGE_INIT@
-
-include ( "${CMAKE_CURRENT_LIST_DIR}/mo2-libbsarch-targets.cmake" )
-
-target_link_libraries(mo2::libbsarch INTERFACE mo2::libbsarch_OOP)
-
-# libbsarch is usually be build in Debug or Release/RelWithDebInfo, so we need to map
-# missing configurations to avoid issue with CMP0111
-get_target_property(_LIBBSARCH_CONFIGURATIONS mo2::libbsarch IMPORTED_CONFIGURATIONS)
-list(FIND _LIBBSARCH_CONFIGURATIONS "RELEASE" _LIBBSARCH_HAS_RELEASE)
-if (_LIBBSARCH_HAS_RELEASE EQUAL -1)
-    set_target_properties(mo2::libbsarch PROPERTIES
-        MAP_IMPORTED_CONFIG_MINSIZEREL RelWithDebInfo
-        MAP_IMPORTED_CONFIG_RELEASE    RelWithDebInfo
-    )
-    set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
-    set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    set_target_properties(mo2::libbsarch_OOP PROPERTIES
-        MAP_IMPORTED_CONFIG_MINSIZEREL RelWithDebInfo
-        MAP_IMPORTED_CONFIG_RELEASE    RelWithDebInfo
-    )
-    set_property(TARGET mo2::libbsarch_OOP APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
-    set_property(TARGET mo2::libbsarch_OOP APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-else()
-    set_target_properties(mo2::libbsarch PROPERTIES
-        MAP_IMPORTED_CONFIG_MINSIZEREL      Release
-        MAP_IMPORTED_CONFIG_RELWITHDEBINFO  Release
-    )
-    set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
-    set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS RELWITHDEBINFO)
-    set_target_properties(mo2::libbsarch_OOP PROPERTIES
-        MAP_IMPORTED_CONFIG_MINSIZEREL      Release
-        MAP_IMPORTED_CONFIG_RELWITHDEBINFO  Release
-    )
-    set_property(TARGET mo2::libbsarch_OOP APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
-    set_property(TARGET mo2::libbsarch_OOP APPEND PROPERTY IMPORTED_CONFIGURATIONS RELWITHDEBINFO)
-endif()

cpp/bs_archive.h

@@ -62,17 +62,17 @@ public:
                                    void *context)
     {
         const auto &path = *static_cast<convertible_string *>(context) + '/' + convertible_string(file_path);
-
+    
         auto image = std::make_unique<DirectX::ScratchImage>();
         DirectX::TexMetadata info;
-
+        
         const auto hr = LoadFromDDSFile(PREPARE_PATH_LIBBSARCH(path), DirectX::DDS_FLAGS_BAD_DXTN_TAILS, &info, *image);
         if (FAILED(hr))
         {
             //Do not throw here. Exceptions will be ignored
             return;
         }
-
+        
         dds_info->width = info.width;
         dds_info->height = info.height;
         dds_info->mipmaps = info.mipLevels;

cpp/bs_archive_auto.cpp

@@ -69,12 +69,14 @@ void bs_archive_auto::save_to_disk(const convertible_string &archive_path)
     {
         switch (file.data.index())
         {
-            case 0: {
+            case 0:
+            {
                 const auto &blob = std::get<memory_blob>(file.data);
                 bs_archive::add_file_from_memory(file.path_in_archive, blob);
                 break;
             }
-            case 1: {
+            case 1:
+            {
                 const auto &file_path = std::get<convertible_string>(file.data);
                 const auto &blob = disk_blob(file.path_in_archive, file_path, bool());
                 bs_archive::add_file_from_disk(blob);

cpp/bs_archive_auto.hpp

@@ -8,7 +8,7 @@
 
 namespace libbsarch {
 /*!
- * \brief The bs_archive_auto class is a convenience class. It manages both bs_archive and bs_archive_entries.
+ * \brief The bs_archive_auto class is a convenience class. It manages both bs_archive and bs_archive_entries. 
  * It is recommended when packing from disk/extracting to disk
  * Otherwise, if using memory, the use of these two separate classes is recommended
  */

cpp/bs_archive_entries.cpp

@@ -3,7 +3,8 @@
 namespace libbsarch {
 bs_archive_entries::bs_archive_entries()
     : _entries(bsa_entry_list_create())
-{}
+{
+}
 
 bs_archive_entries::bs_archive_entries(const std::vector<convertible_string> &entries)
     : _entries(bsa_entry_list_create())
@@ -14,7 +15,8 @@ bs_archive_entries::bs_archive_entries(const std::vector<convertible_string> &en
 
 bs_archive_entries::bs_archive_entries(const bsa_entry_list_t &entries)
     : _entries(entries)
-{}
+{
+}
 
 bs_archive_entries::~bs_archive_entries()
 {