From cc76400edc93c23f6b715cda7521ed475f80fc3c Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sun, 9 Jul 2023 23:49:59 -0700 Subject: [PATCH] Update to DokanY 1.5.1.1000 --- .github/workflows/actions/setup_windows/action.yaml | 4 ++-- .github/workflows/main.yaml | 2 +- CMakeSettings.json | 8 ++++---- ChangeLog.txt | 2 +- README.md | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/actions/setup_windows/action.yaml b/.github/workflows/actions/setup_windows/action.yaml index 20c9a6bb..1a8093f6 100644 --- a/.github/workflows/actions/setup_windows/action.yaml +++ b/.github/workflows/actions/setup_windows/action.yaml @@ -7,8 +7,8 @@ runs: shell: bash run: | choco install -y ninja wget - wget https://github.com/dokan-dev/dokany/releases/download/v1.3.0.1000/Dokan_x64.msi - if [ $(sha512sum Dokan_x64.msi | awk '{print $1;}') == "2daec91599a331f21bd44a6f06727a1839ec7fca5ed448536c65c86f9808ed6fd8afa947a8b153233c4220e29463533f0665e4c62718599cec8a12e60f0adc39" ]; then + wget https://github.com/dokan-dev/dokany/releases/download/v1.5.1.1000/Dokan_x64.msi + if [ $(sha512sum Dokan_x64.msi | awk '{print $1;}') == "492f4560c1505ada9d5c79ad0c098159af473de7567048e7dc48559328c9970641cd5e2eb8f749ce04918a9a0bb1a0bd943915abd686ea8824191c0747fafe1f" ]; then echo Correct sha512sum else echo Wrong sha512sum diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index dcdb4c92..9f25bebf 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -632,7 +632,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.3.0" -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.5.1" -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 496bee4d..5ccf11fd 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -7,7 +7,7 @@ "inheritEnvironments": [ "msvc_x86" ], "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", - "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.3.0\"", + "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.5.1\"", "buildCommandArgs": "-v", "ctestCommandArgs": "" }, @@ -18,7 +18,7 @@ "inheritEnvironments": [ "msvc_x86" ], "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", - "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.3.0\"", + "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.5.1\"", "buildCommandArgs": "-v", "ctestCommandArgs": "" }, @@ -29,7 +29,7 @@ "inheritEnvironments": [ "msvc_x64_x64" ], "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", - "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.3.0\"", + "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.5.1\"", "buildCommandArgs": "-v", "ctestCommandArgs": "" }, @@ -40,7 +40,7 @@ "inheritEnvironments": [ "msvc_x64_x64" ], "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", - "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.3.0\"", + "cmakeCommandArgs": "-DBUILD_TESTING=on -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\Dokan Library-1.5.1\"", "buildCommandArgs": "-v", "ctestCommandArgs": "" } diff --git a/ChangeLog.txt b/ChangeLog.txt index 3a07d497..cc370798 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -3,7 +3,7 @@ Version 0.12.0 (unreleased) * Added a man page for `cryfs-unmount` * Fixed small inaccuracy in calculation of free space in statvfs * Updated dependencies to - * DokanY 1.3.0.1000 + * DokanY 1.5.1.1000 * range-v3/0.12.0 * boost 1.79 diff --git a/README.md b/README.md index b6e36b92..d2a8bc2e 100644 --- a/README.md +++ b/README.md @@ -136,11 +136,11 @@ Building on Windows (experimental) ---------------------------------- 1. Install conan. If you want to use "pip install conan", you may have to install Python first. -2. Install DokanY 1.3.0.1000. Other versions may not work. +2. Install DokanY 1.5.1.1000. 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) $ mkdir build && cd build -$ cmake .. -G "Visual Studio 16 2019" -DDOKAN_PATH=[dokan library location, e.g. "C:\Program Files\Dokan\DokanLibrary-1.3.0"] +$ cmake .. -G "Visual Studio 16 2019" -DDOKAN_PATH=[dokan library location, e.g. "C:\Program Files\Dokan\DokanLibrary-1.5.1"] 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