diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-26 14:20:22 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-26 14:53:20 +0200 |
| commit | aeb0657dff8a0c8bdbb69dc0819286cee95ecd70 (patch) | |
| tree | 0fcaf001ee38a7202aebdcf872777f9823b83405 | |
| parent | Note sha256 issue (diff) | |
| download | wintun-aeb0657dff8a0c8bdbb69dc0819286cee95ecd70.tar.xz wintun-aeb0657dff8a0c8bdbb69dc0819286cee95ecd70.zip | |
installer: put whql assets in reasonable place
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | wintun.wixproj | 2 |
3 files changed, 2 insertions, 6 deletions
@@ -18,7 +18,3 @@ # Driver Verification Log /wintun.DVL.XML - -# WHQL Driver -/whql/x86 -/whql/amd64 @@ -71,7 +71,7 @@ ARM64 Release | `arm64\Release\wintun` 1. `msbuild wintun.proj /t:DVL;Build`. 2. Perform Windows Hardware Lab Kit tests. 3. Submit submission package to Microsoft. -4. Copy WHQL-signed driver to `whql\x86` and `whql\amd64` subfolders. +4. Copy WHQL-signed driver to `x86\Release\whql\` and `amd64\Release\whql\` subfolders. 5. `msbuild wintun.proj /t:MSM` 6. MSM files are placed in `dist` subfolder. diff --git a/wintun.wixproj b/wintun.wixproj index 3626628..7e8c7f2 100644 --- a/wintun.wixproj +++ b/wintun.wixproj @@ -28,7 +28,7 @@ <SuppressSpecificWarnings>1006;1086;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> <LinkerSuppressSpecificWarnings>1103;$(LinkerSuppressSpecificWarnings)</LinkerSuppressSpecificWarnings> <SuppressIces>ICE30;$(SuppressIces)</SuppressIces> - <LinkerAdditionalOptions>-b output_dir="$(IntermediateOutputPath.TrimEnd('\'))" -b whql_dir="whql\$(WintunPlatform)" $(LinkerAdditionalOptions)</LinkerAdditionalOptions> + <LinkerAdditionalOptions>-b output_dir="$(IntermediateOutputPath.TrimEnd('\'))" -b whql_dir="$(WintunPlatform)\$(Configuration)\whql" $(LinkerAdditionalOptions)</LinkerAdditionalOptions> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> <SuppressPdbOutput>true</SuppressPdbOutput> |