From fe7114437702fac0d03e03d17598d5987d4575ce Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sun, 15 Aug 2021 20:16:59 -0700 Subject: [PATCH] Update to DokanY 1.2.2.1001 --- .../workflows/actions/setup_windows/action.yaml | 2 +- .github/workflows/main.yaml | 2 +- CMakeSettings.json | 2 +- ChangeLog.txt | 1 + README.md | 14 ++++++++++---- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/actions/setup_windows/action.yaml b/.github/workflows/actions/setup_windows/action.yaml index cf0f963d..5314a8e0 100644 --- a/.github/workflows/actions/setup_windows/action.yaml +++ b/.github/workflows/actions/setup_windows/action.yaml @@ -7,4 +7,4 @@ runs: shell: bash run: | choco install -y ninja - choco install -y dokany --version 1.2.1.2000 --installargs INSTALLDEVFILES=1 + choco install -y dokany --version 1.2.2.1001 --installargs INSTALLDEVFILES=1 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 91f675e5..b7b3201f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -533,7 +533,7 @@ jobs: # TODO CMAKE_SYSTEM_VERSION is probably not needed anymore mkdir build cd build - cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_TESTING=on -DDOKAN_PATH="C:/Program Files/Dokan/DokanLibrary-1.2.1" -A ${{matrix.arch}} -DCMAKE_SYSTEM_VERSION="10.0.18362.0" + cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_TESTING=on -DDOKAN_PATH="C:/Program Files/Dokan/DokanLibrary-1.2.2" -A ${{matrix.arch}} -DCMAKE_SYSTEM_VERSION="10.0.18362.0" cmake --build . --config ${{matrix.build_type}} # - name: Show ccache statistics # shell: bash diff --git a/CMakeSettings.json b/CMakeSettings.json index 4b3a7ff4..e7ec23db 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -45,4 +45,4 @@ "ctestCommandArgs": "" } ] -} \ No newline at end of file +} diff --git a/ChangeLog.txt b/ChangeLog.txt index a26cf048..2d2daa69 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,6 +4,7 @@ Bugfix: * Fix building of the range-v3 dependency. The conan remote URL for this dependency changed and we have to use the new URL. See https://github.com/cryfs/cryfs/issues/398 * Update to CryptoPP 8.6. This fixes a rare bug where CryptoPP 8.5 encrypts data wrongly, see https://github.com/weidai11/cryptopp/issues/1069 * cryfs-unmount correctly unmounts paths that contain spaces, see https://github.com/cryfs/cryfs/issues/372 +* Updated to DokanY 1.2.2.1001 Version 0.11.0 --------------- diff --git a/README.md b/README.md index f6217258..111e34f0 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ Build & Install 2. Build - $ mkdir cmake && cd cmake + $ mkdir build && cd build $ cmake .. $ make @@ -132,11 +132,17 @@ You can pass the following variables to the *cmake* command (using *-Dvariablena Building on Windows (experimental) ---------------------------------- -Build with Visual Studio 2019 and pass in the following flags to CMake: +1. Install conan. If you want to use "pip install conan", you may have to install Python first. +2. Install DokanY 1.2.2. Other versions may not work. +3. Run CMake to generate Visual Studio 2019 project files (this may not be necessary, but it makes sure everything works as expected and you can see potential errors happening during this step) - -DDOKAN_PATH=[dokan library location, e.g. "C:\Program Files\Dokan\DokanLibrary-1.2.1"] +$ mkdir build && cd build +$ cmake .. -G "Visual Studio 16 2019" -DDOKAN_PATH=[dokan library location, e.g. "C:\Program Files\Dokan\DokanLibrary-1.2.2"] -If you set these variables correctly in the `CMakeSettings.json` file, you should be able to open the cryfs source folder with Visual Studio 2019. +4. Potentially modify CMakeSettings.json file to fit your needs +5. Open the cryfs source folder with Visual Studio 2019, or alternatively build on command line using + +$ cd build && cmake --build . --config RelWithDebInfo Troubleshooting ---------------