Normalize windows package name and strip version number from git tag

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

.github/build.sh

@@ -17,7 +17,9 @@ if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
 	fi
 else
 	BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
-	if [ "$BRANCH" != "master" ]; then
+	if [ "$GITHUB_REF_TYPE" == "tag" ] && [[ "$BRANCH" =~ ^[0-9]+\.[0-9]+\.[0-9]+(.+)$ ]]; then
+		SUFFIX="${BASH_REMATCH[1]}"
+	elif [ "$BRANCH" != "master" ]; then
 		SUFFIX="$BRANCH"
 	fi
 fi

.github/workflows/windows.yml

@@ -38,19 +38,25 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-      - name: Package name
+      - name: Package suffix
         shell: bash
         run: |
-          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == "master" ]]; then
-            SUFFIX=""
-          elif [[ "${{ github.event_name }}" == "push" ]]; then
-            SUFFIX="-${{ github.ref_name }}"
-          elif [[ "${{ github.event_name }}" == "pull_request" && "${{ github.base_ref }}" == "master" ]]; then
-            SUFFIX="-pr${{ github.event.number }}"
-          else
-            SUFFIX="-${{ github.base_ref }}-pr${{ github.event.number }}"
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            if [[ "${{ github.ref_type }}" == "tag" && "${{ github.ref_name }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(.+)$ ]]; then
+              SUFFIX="${BASH_REMATCH[1]}"
+            elif [[ "${{ github.ref_name }}" != "master" ]]; then
+              SUFFIX="-${{ github.ref_name }}"
+            fi
+          elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            if [[ "${{ github.base_ref }}" == "master" ]]; then
+              SUFFIX="-pr${{ github.event.number }}"
+            else
+              SUFFIX="-${{ github.base_ref }}-pr${{ github.event.number }}"
+            fi
           fi
-          echo "DIST_SUFFIX=${{ matrix.configuration == 'Light' && '-Light' || '' }}${SUFFIX}" >> $GITHUB_ENV
+          PACKAGE_SUFFIX="${{ matrix.configuration == 'Light' && '-Light' || '' }}${SUFFIX}"
+          sed -i.bak "s/^PACKAGE_SUFFIX=\([-~]*[0-9a-zA-Z]*\)$/PACKAGE_SUFFIX=$PACKAGE_SUFFIX/g" VERSION.mk
+          cat VERSION.mk
       - name: Install CPDK
         run: choco install windows-cryptographic-provider-development-kit -y > $null
       - name: Setup dev env

.gitignore

@@ -64,6 +64,7 @@ ChangeLog
 .cache
 compile_commands.json
 .dirstamp
+VERSION.mk.bak
 
 doc/tools/*-tool
 doc/tools/eidenv

win32/Make.rules.mak

@@ -18,7 +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
+MSI_NAME = $(PRODUCT_NAME)-$(PACKAGE_VERSION_MAJOR).$(PACKAGE_VERSION_MINOR).$(PACKAGE_VERSION_FIX)$(PACKAGE_SUFFIX)_$(PLATFORM).msi
 !IF "$(WIX_PACKAGES)" == ""
 WIX_PACKAGES = $(TOPDIR)\win32\packages
 WIX_VERSION = 6.0.2