diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-26 14:07:32 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-26 14:07:32 +0200 |
| commit | a0491c6b08a8df060aeca4c314a5e3be1096ecad (patch) | |
| tree | a833cf0b214d5ba73e8c2eb9e79cbee3e94a9504 | |
| parent | Split driver setup to EV signed (<Win10) and WHQL signed (>=Win10) (diff) | |
| download | wintun-a0491c6b08a8df060aeca4c314a5e3be1096ecad.tar.xz wintun-a0491c6b08a8df060aeca4c314a5e3be1096ecad.zip | |
installer: fix typos
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | README.md | 13 | ||||
| -rw-r--r-- | wintun.wixproj | 2 | ||||
| -rw-r--r-- | wintun.wxs | 4 |
3 files changed, 10 insertions, 9 deletions
@@ -53,7 +53,7 @@ msbuild wintun.proj [/t:<target>] - `DVL`: Runs the `SDV`, and creates a Driver Verification Log, only for AMD64 release configurations. - - `MSM`: Builds Microsoft Installer Merge Modules in `<output folder>\wintun-<platform>-<version>.msm`. Requires WHLK signed driver (See: [Building Microsoft Installer Merge Modules]). + - `MSM`: Builds Microsoft Installer Merge Modules in `<output folder>\wintun-<platform>-<version>.msm`. Requires WHQL signed driver. The driver output folders are: @@ -68,11 +68,12 @@ ARM64 Release | `arm64\Release\wintun` ### Building Microsoft Installer Merge Modules -1. `msbuild wintun.proj /t:DVL;Build` -2. Perform Windows Hardware Lab Kit tests; Submit submission package to Microsoft; Get WHQL signed driver. -3. Copy WHQL signed driver to `whql\x86` and `whql\amd64` subfolders. -4. `msbuild wintun.proj /t:MSM` -5. MSM files are placed in `dist` subfolder. +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. +5. `msbuild wintun.proj /t:MSM` +6. MSM files are placed in `dist` subfolder. ## Usage diff --git a/wintun.wixproj b/wintun.wixproj index 8474034..3626628 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 whwl_dir="whql\$(WintunPlatform)" $(LinkerAdditionalOptions)</LinkerAdditionalOptions> + <LinkerAdditionalOptions>-b output_dir="$(IntermediateOutputPath.TrimEnd('\'))" -b whql_dir="whql\$(WintunPlatform)" $(LinkerAdditionalOptions)</LinkerAdditionalOptions> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> <SuppressPdbOutput>true</SuppressPdbOutput> @@ -36,7 +36,7 @@ <File Id="wintun.cat.whql" Name="wintun.cat" - Source="!(bindpath.whwl_dir)wintun.cat" + Source="!(bindpath.whql_dir)wintun.cat" DefaultVersion="$(var.WINTUN_VERSION)" DefaultLanguage="0"/> <diffx:Driver @@ -77,7 +77,7 @@ <File Id="wintun.sys.whql" Name="wintun.sys" - Source="!(bindpath.whwl_dir)wintun.sys" + Source="!(bindpath.whql_dir)wintun.sys" DefaultVersion="$(var.WINTUN_VERSION)" DefaultLanguage="0"/> </Component> |