From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 22 Feb 2022 19:10:13 +0000 (-0500)
Subject: Update Windows CI and installer config
X-Git-Tag: krb5-1.21-beta1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=649e3372d2505027dafd27b0fe9db573c21c735a;p=thirdparty%2Fkrb5.git

Update Windows CI and installer config

Add a VCVer case for the new Visual Studio version.  Use
ilammy/msvc-dev-cmd to set up the build environments.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48c13a5980..e7a58485ac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
                 fi
 
     windows:
-        runs-on: windows-2019
+        runs-on: windows-latest
         env:
             KRB_INSTALL_DIR: C:\kfw
         steps:
@@ -71,11 +71,13 @@ jobs:
               shell: cmd
               run: |
                 mkdir %KRB_INSTALL_DIR%
+            - uses: ilammy/msvc-dev-cmd@v1
+              with:
+                arch: x86
             - name: Build 32-bit
               shell: cmd
               run: |
                 cd src
-                call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
                 set
                 set PATH=%PATH%;%wix%bin
                 nmake -f Makefile.in prep-windows
@@ -84,11 +86,13 @@ jobs:
                 cd windows\installer\wix
                 nmake
                 rename kfw.msi kfw32.msi
+            - uses: ilammy/msvc-dev-cmd@v1
+              with:
+                arch: x64
             - name: Build 64-bit
               shell: cmd
               run: |
                 cd src
-                call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
                 set
                 set PATH=%PATH%;%wix%bin;"%WindowsSdkVerBinPath%"\x86
                 nmake clean
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index c789668bea..579de4399a 100644
--- a/src/windows/installer/wix/config.wxi
+++ b/src/windows/installer/wix/config.wxi
@@ -51,6 +51,8 @@
         <?define VCVer="141"?>
     <?elseif $(env.VISUALSTUDIOVERSION) = "16.0"?>
         <?define VCVer="142"?>
+    <?elseif $(env.VISUALSTUDIOVERSION) = "17.0"?>
+        <?define VCVer="143"?>
     <?else?>
         <?error Unknown MFC version?>
     <?endif?>