MSI version number

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

.appveyor.yml

@@ -36,9 +36,9 @@ install:
         https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
         throw "There are newer queued builds for this pull request, failing early." }
-  - ps: $env:PACKAGE_NAME=(git describe --tags --abbrev=0)
+  - ps: $env:PACKAGE_VERSION=(git describe --tags --abbrev=0)
   - ps: $env:OPENSSL_PF = If ($env:Platform -eq "x86") { "Win32" } Else { "Win64" }
-  - ps: $env:ARTIFACT="OpenSC-${env:PACKAGE_NAME}_${env:OPENSSL_PF}"
+  - ps: $env:ARTIFACT="OpenSC-${env:PACKAGE_VERSION}_${env:OPENSSL_PF}"
   - ps: >-
       If ($env:Configuration -Like "*Light*") {
         $env:ARTIFACT+="-Light"
@@ -91,7 +91,7 @@ build_script:
         $env:OPENPACE_DIR="C:\openpace-${env:OPENSSL_PF}"
       }
   - nmake /nologo /f Makefile.mak opensc.msi
-  - move win32\OpenSC.msi %ARTIFACT%.msi
+  - move win32\OpenSC*.msi %ARTIFACT%.msi
   # put all pdb files for dump analysis, but this consumes approx 100 MB per build
   - md %ARTIFACT%-Debug
   - ps: >-

.github/workflows/windows.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         platform: [x86, x64, arm64]
         configuration: [Light, Release]
-        image: [windows-2022]
+        image: [windows-2025]
         include:
           - platform: x86
             setenv: amd64_x86
@@ -37,9 +37,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
-      - name: Git describe
-        id: ghd
-        uses: proudust/gh-describe@v2
       - name: Package name
         shell: bash
         run: |
@@ -52,7 +49,7 @@ jobs:
           else
             SUFFIX="-${{ github.base_ref }}-pr${{ github.event.number }}"
           fi
-          echo ARTIFACT=${{ steps.ghd.outputs.tag }}${SUFFIX}_${{ matrix.platform }}${{ matrix.configuration == 'Light' && '-Light' || '' }} >> $GITHUB_ENV
+          echo "DIST_SUFFIX=${{ matrix.configuration == 'Light' && '-Light' || '' }}${SUFFIX}" >> $GITHUB_ENV
       - name: Install CPDK
         run: choco install windows-cryptographic-provider-development-kit -y > $null
       - name: Setup dev env
@@ -64,7 +61,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{ matrix.configuration }}-${{ matrix.platform }}-${{ hashFiles('.github/workflows/windows.yml', '.github/vcpkg.json') }}
+          key: vcpkg-${{ matrix.configuration }}-${{ matrix.platform }}-${{ hashFiles('.github/vcpkg.json') }}
       - name: Prepare vcpkg
         if: matrix.configuration == 'Release'
         uses: lukka/run-vcpkg@v11
@@ -117,18 +114,16 @@ jobs:
           echo "OPENPACE_DEF=/DENABLE_OPENPACE" >> $env:GITHUB_ENV
           echo "OPENPACE_DIR=${env:GITHUB_WORKSPACE}\openpace-${env:OPENPACE_VER}" >> $env:GITHUB_ENV
       - name: Build OpenSC
-        run: |
-          nmake /nologo /f Makefile.mak opensc.msi
-          move win32\OpenSC.msi OpenSC-${env:ARTIFACT}.msi
+        run: nmake /nologo /f Makefile.mak opensc.msi
       - name: Archive artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: msi_${{ matrix.image }}_${{ matrix.platform }}_${{ matrix.configuration }}
-          path: ./*.msi
+          path: ./win32/*.msi
       - name: Archive debug artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
-          name: OpenSC-${{ env.ARTIFACT }}-Debug
+          name: debug_${{ matrix.image }}_${{ matrix.platform }}_${{ matrix.configuration }}
           path: |
             ./src/**/*.pdb
             ./win32/*.pdb

src/tests/Makefile.mak

@@ -17,5 +17,4 @@ opensc-minidriver-test.exe:
 	link $(LINKFLAGS) /out:$@ $*.obj bcrypt.lib ncrypt.lib crypt32.lib winscard.lib
 
 .c.exe:
-	cl $(COPTS) /c $<
-	link $(LINKFLAGS) /out:$@ $*.obj $(OBJECTS) $(LIBS)
+	cl $(COPTS) $< $(SOURCES) $(LIBS) /link $(LINKFLAGS)

win32/Make.rules.mak

@@ -18,6 +18,7 @@ MINIDRIVER_DEF = /DENABLE_MINIDRIVER
 WIXFLAGS = -d ENABLE_MINIDRIVER $(WIXFLAGS)
 
 #Build MSI with the Windows Installer XML (WIX) toolkit
+MSI_NAME = $(PRODUCT_NAME)-$(PACKAGE_VERSION_MAJOR).$(PACKAGE_VERSION_MINOR).$(PACKAGE_VERSION_FIX)_$(PLATFORM)$(DIST_SUFFIX).msi
 !IF "$(WIX_PACKAGES)" == ""
 WIX_PACKAGES = $(TOPDIR)\win32\packages
 WIX_VERSION = 6.0.2

win32/Makefile.mak

@@ -10,8 +10,10 @@ config.h: winconfig.h
 customactions.dll: versioninfo-customactions.res $*.obj $*.def
 	link /dll $(LINKFLAGS) /out:$@ /def:$*.def versioninfo-customactions.res customactions.obj msi.lib $(WIX_LIBS) Advapi32.lib User32.lib Version.lib Shell32.lib
 
-OpenSC.msi: OpenSC.wxs customactions.dll
-	wix build -arch $(PLATFORM) -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext -d SOURCE_DIR=$(TOPDIR) $(WIXFLAGS) OpenSC.wxs
+$(MSI_NAME): OpenSC.wxs customactions.dll
+	wix build -arch $(PLATFORM) -o $(MSI_NAME) -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext -d SOURCE_DIR=$(TOPDIR) $(WIXFLAGS) OpenSC.wxs
+
+OpenSC.msi: $(MSI_NAME)
 
 clean::
 	del /Q config.h *.msi *.wixobj *.wixpdb