Remove autotools dependency from NMake build

metsma · Jakuje · commit 1b6889ff3c6b · 2025-10-31T21:03:18.000+01:00
Signed-off-by: Raul Metsma &lt;raul@metsma.ee&gt;
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -92,12 +92,6 @@ build_script:
         $env:OPENPACE_DEF="/DENABLE_OPENPACE"
         $env:OPENPACE_DIR="C:\openpace-${env:OPENSSL_PF}"
       }
-  - bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" == \"master\" -a -z \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap; fi"
-  - bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" == \"master\" -a -n \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-pr$APPVEYOR_PULL_REQUEST_NUMBER\"; fi"
-  - bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" != \"master\" -a -z \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-$APPVEYOR_REPO_BRANCH\"; fi"
-  - bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" != \"master\" -a -n \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-$APPVEYOR_REPO_BRANCH-prAPPVEYOR_PULL_REQUEST_NUMBER\"; fi"
-  # disable features to speed up the script
-  - bash -c "exec 0</dev/null && ./configure --with-cygwin-native --disable-openssl --disable-readline --disable-zlib || cat config.log"
   - nmake /nologo /f Makefile.mak opensc.msi
   - move win32\OpenSC.msi %ARTIFACT%.msi
   # put all pdb files for dump analysis, but this consumes approx 100 MB per build
diff --git a/.github/setup-wix.ps1 b/.github/setup-wix.ps1
@@ -1,5 +1,5 @@
 param(
-  [string]$version = '6.0.0'
+  [string]$version = '6.0.2'
 )
 & dotnet tool install -g --version $version wix
 & wix extension add -g WixToolset.UI.wixext/$version
diff --git a/.github/vcpkg.json b/.github/vcpkg.json
@@ -1,8 +1,8 @@
 {
-  "name": "opensc",
-  "dependencies": [
-    "openssl",
-    "zlib"
-  ],
-  "builtin-baseline": "0d5cae153065957df7f382de7c1549ccc88027e5"
+	"name": "opensc",
+	"dependencies": [
+		"openssl",
+		"zlib"
+	],
+	"builtin-baseline": "bc38a15b0bee8bc48a49ea267cc32fbb49aedfc4"
 }
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -33,49 +33,46 @@ jobs:
     env:
       OPENPACE_VER: 1.1.3
       VCPKG_INSTALLED: ${{ github.workspace }}\vcpkg_installed
+      BUILD_NUMBER: ${{ github.run_number }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Git describe
         id: ghd
         uses: proudust/gh-describe@v2
       - name: Package name
         shell: bash
-        run: |
-          echo ARTIFACT=OpenSC-${{ steps.ghd.outputs.tag }}_${{ matrix.platform }}${{ matrix.configuration == 'Light' && '-Light' || '' }} >> $GITHUB_ENV
-      - name: Install CPDK
-        run: choco install windows-cryptographic-provider-development-kit -y > $null
-      - name: Install autotools
-        uses: msys2/setup-msys2@v2
-        with:
-          install: autotools mingw-w64-x86_64-pkg-config
-      - name: Bootstrap
-        shell: msys2 {0}
         run: |
           if [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == "master" ]]; then
-            ./bootstrap
+            SUFFIX=""
           elif [[ "${{ github.event_name }}" == "push" ]]; then
-            ./bootstrap.ci -s "-${{ github.ref_name }}"
+            SUFFIX="-${{ github.ref_name }}"
           elif [[ "${{ github.event_name }}" == "pull_request" && "${{ github.base_ref }}" == "master" ]]; then
-            ./bootstrap.ci -s "-pr${{ github.event.number }}"
+            SUFFIX="-pr${{ github.event.number }}"
           else
-            ./bootstrap.ci -s "-${{ github.base_ref }}-pr${{ github.event.number }}"
+            SUFFIX="-${{ github.base_ref }}-pr${{ github.event.number }}"
           fi
-      - name: Configure
-        shell: bash
-        run: ./configure --disable-openssl --disable-readline --disable-zlib || cat config.log
+          echo ARTIFACT=${{ steps.ghd.outputs.tag }}${SUFFIX}_${{ matrix.platform }}${{ matrix.configuration == 'Light' && '-Light' || '' }} >> $GITHUB_ENV
+      - name: Install CPDK
+        run: choco install windows-cryptographic-provider-development-kit -y > $null
       - name: Setup dev env
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: ${{ matrix.setenv }}
+      - name: Cache vcpkg
+        if: matrix.configuration == 'Release'
+        uses: actions/cache@v4
+        with:
+          path: ${{ github.workspace }}/vcpkg_cache
+          key: vcpkg-${{ matrix.configuration }}-${{ matrix.platform }}-${{ hashFiles('.github/workflows/windows.yml', '.github/vcpkg.json') }}
       - name: Prepare vcpkg
         if: matrix.configuration == 'Release'
         uses: lukka/run-vcpkg@v11
         with:
-          vcpkgGitCommitId: 0d5cae153065957df7f382de7c1549ccc88027e5
           vcpkgJsonGlob: .github/vcpkg.json
           runVcpkgInstall: true
         env:
+          VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
           VCPKG_DEFAULT_TRIPLET: ${{ matrix.platform }}-windows-static
           VCPKG_INSTALLED_DIR: ${{ env.VCPKG_INSTALLED }}
       - name: Install WIX
@@ -131,7 +128,7 @@ jobs:
       - name: Archive debug artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.ARTIFACT }}-Debug
+          name: OpenSC-${{ env.ARTIFACT }}-Debug
           path: |
             ./src/**/*.pdb
             ./win32/*.pdb
diff --git a/.gitignore b/.gitignore
@@ -97,8 +97,6 @@ src/tools/org.opensc-project.mac.opensc-notify.plist
 src/tools/org.opensc-project.mac.pkcs11-register.plist
 
 win32/OpenSC.iss
-win32/OpenSC.wxs
-win32/winconfig.h
 win32/OpenSC.msi
 win32/OpenSC.wixobj
 win32/OpenSC.wixpdb
diff --git a/Makefile.am b/Makefile.am
@@ -11,7 +11,7 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/m4/ltversion.m4 $(srcdir)/m4/lt~obsolete.m4 \
 	$(srcdir)/m4/ltoptions.m4 \
 	$(srcdir)/packaged
-EXTRA_DIST = Makefile.mak
+EXTRA_DIST = Makefile.mak VERSION.mk
 
 DISTCHECK_CONFIGURE_FLAGS = --with-completiondir=/tmp
 
diff --git a/VERSION.mk b/VERSION.mk
@@ -0,0 +1,17 @@
+PRODUCT_NAME=OpenSC
+PRODUCT_TARNAME=opensc
+PRODUCT_BUGREPORT=https://github.com/OpenSC/OpenSC/issues
+PRODUCT_URL=https://github.com/OpenSC/OpenSC
+PACKAGE_VERSION_MAJOR=0
+PACKAGE_VERSION_MINOR=26
+PACKAGE_VERSION_FIX=1
+PACKAGE_VERSION_REVISION=0
+PACKAGE_SUFFIX=
+PACKAGE_SCM_REVISION=No Git revision info available
+
+VS_FF_LEGAL_COPYRIGHT=OpenSC Project
+VS_FF_LEGAL_COMPANY_NAME=OpenSC Project
+VS_FF_LEGAL_COMPANY_URL=https://github.com/OpenSC
+VS_FF_COMMENTS=Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+).
+VS_FF_PRODUCT_NAME=OpenSC smartcard framework
+VS_FF_PRODUCT_UPDATES=https://github.com/OpenSC/OpenSC/releases
diff --git a/configure.ac b/configure.ac
@@ -2,21 +2,16 @@ dnl -*- mode: m4; -*-
 
 AC_PREREQ(2.68)
 
-define([PRODUCT_NAME], [OpenSC])
-define([PRODUCT_TARNAME], [opensc])
-define([PRODUCT_BUGREPORT], [https://github.com/OpenSC/OpenSC/issues])
-define([PRODUCT_URL], [https://github.com/OpenSC/OpenSC])
-define([PACKAGE_VERSION_MAJOR], [0])
-define([PACKAGE_VERSION_MINOR], [26])
-define([PACKAGE_VERSION_FIX], [1])
-define([PACKAGE_SUFFIX], [])
-
-define([VS_FF_LEGAL_COPYRIGHT], [OpenSC Project])
-define([VS_FF_LEGAL_COMPANY_NAME], [OpenSC Project])
-define([VS_FF_LEGAL_COMPANY_URL], [https://github.com/OpenSC])
-define([VS_FF_COMMENTS], [Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+).])
-define([VS_FF_PRODUCT_NAME], [OpenSC smartcard framework])
-define([VS_FF_PRODUCT_UPDATES], [https://github.com/OpenSC/OpenSC/releases])
+m4_esyscmd([awk -F= '
+  /^[[:space:]]*#/      { next }
+  /^[[:space:]]*$/      { next }
+  {
+    key = $1; val = $2;
+    gsub(/^[[:space:]]+|[[:space:]]+$/, "", key);
+    gsub(/^[[:space:]]+|[[:space:]]+$/, "", val);
+    printf("m4_define([%s],[%s])\n", key, val);
+  }
+' "VERSION.mk"])
 
 m4_sinclude(m4/version.m4.ci)
 
@@ -418,8 +413,8 @@ if test "${GIT_CHECKOUT}" = "yes"; then
 	OPENSC_SCM_REVISION="OpenSC-${REVISION_DESCRIPTION}, ${HASH_COMMIT_DATE}"
 	OPENSC_VERSION_REVISION="$(${GIT} rev-list ${GIT_TAG_COMMIT}..HEAD --count || echo 0)"
 else
-	OPENSC_SCM_REVISION="No Git revision info available"
-	OPENSC_VERSION_REVISION="0"
+	OPENSC_SCM_REVISION="PACKAGE_SCM_REVISION"
+	OPENSC_VERSION_REVISION="PACKAGE_VERSION_REVISION"
 fi
 
 dnl C Compiler features
@@ -1206,9 +1201,7 @@ AC_CONFIG_FILES([
 	src/minidriver/Makefile
 	src/minidriver/opensc-minidriver.inf
 	win32/Makefile
-	win32/winconfig.h
 	win32/OpenSC.iss
-	win32/OpenSC.wxs
 	MacOSX/Makefile
 	MacOSX/build-package
 	MacOSX/Distribution.xml
diff --git a/src/tools/Makefile.mak b/src/tools/Makefile.mak
@@ -61,7 +61,6 @@ sc-hsm-tool.exe: sc-hsm-tool.obj fread_to_eof.obj $(OBJECTS) $(LIBS)
 pkcs11-tool.exe: pkcs11-tool.obj pkcs11_uri.obj $(OBJECTS) $(LIBS)
 	cl $(COPTS) /c $*.c
 	link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj pkcs11-tool.obj pkcs11_uri.obj $(OBJECTS) $(LIBS) $(OPENSSL_LIB) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
-	mt -manifest exe.manifest -outputresource:$@;1
 
 .c.exe:
 	cl $(COPTS) /c $<
diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
@@ -1,13 +1,26 @@
-OPENSC_FEATURES = pcsc
+!INCLUDE $(TOPDIR)\VERSION.mk
+
+!IF "$(BUILD_NUMBER)" != ""
+PACKAGE_VERSION_REVISION = $(BUILD_NUMBER)
+!ENDIF
 
+OPENSC_FEATURES = pcsc
+PRODUCT_VERSION = $(PACKAGE_VERSION_MAJOR).$(PACKAGE_VERSION_MINOR).$(PACKAGE_VERSION_FIX).$(PACKAGE_VERSION_REVISION)
+WIXFLAGS = \
+	-d PRODUCT_NAME="$(VS_FF_PRODUCT_NAME)" \
+	-d PRODUCT_BUGREPORT="$(PRODUCT_BUGREPORT)" \
+	-d PRODUCT_URL="$(PRODUCT_URL)" \
+	-d VS_FF_LEGAL_COMPANY_NAME="$(VS_FF_LEGAL_COMPANY_NAME)" \
+	-d VS_FF_PRODUCT_UPDATES="$(VS_FF_PRODUCT_UPDATES)" \
+	-d VS_FF_LEGAL_COMPANY_URL="$(VS_FF_LEGAL_COMPANY_URL)"
 #Include support for minidriver
 MINIDRIVER_DEF = /DENABLE_MINIDRIVER
-WIXFLAGS = -d ENABLE_MINIDRIVER
+WIXFLAGS = -d ENABLE_MINIDRIVER $(WIXFLAGS)
 
 #Build MSI with the Windows Installer XML (WIX) toolkit
 !IF "$(WIX_PACKAGES)" == ""
 WIX_PACKAGES = $(TOPDIR)\win32\packages
-WIX_VERSION = 6.0.0
+WIX_VERSION = 6.0.2
 !ENDIF
 WIX_INCL_DIR = "/I$(WIX_PACKAGES)/wixtoolset.dutil/$(WIX_VERSION)/build/native/include" \
 	"/I$(WIX_PACKAGES)/wixtoolset.wcautil/$(WIX_VERSION)/build/native/include"
@@ -117,7 +130,13 @@ WIXFLAGS = -d OpenPACE="$(OPENPACE_DIR)" $(WIXFLAGS)
 # Used for MiniDriver
 CPDK_INCL_DIR = "/IC:\Program Files (x86)\Windows Kits\10\Cryptographic Provider Development Kit\Include"
 
-DEFS = /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DWIN32_LEAN_AND_MEAN /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\""
+DEFS = /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DWIN32_LEAN_AND_MEAN /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" \
+	/DPACKAGE_NAME="\"$(PRODUCT_NAME)\"" /DPACKAGE_VERSION="\"$(PRODUCT_VERSION)\"" \
+	/DOPENSC_VERSION_MAJOR=$(PACKAGE_VERSION_MAJOR) /DOPENSC_VERSION_MINOR=$(PACKAGE_VERSION_MINOR) \
+	/DOPENSC_VERSION_FIX=$(PACKAGE_VERSION_FIX) /DOPENSC_VERSION_REVISION=$(PACKAGE_VERSION_REVISION) \
+	/DOPENSC_SCM_REVISION="\"$(PACKAGE_SCM_REVISION)\"" \
+	/DOPENSC_VS_FF_COMPANY_NAME="\"$(VS_FF_LEGAL_COMPANY_NAME)\"" /DOPENSC_VS_FF_PRODUCT_NAME="\"$(VS_FF_PRODUCT_NAME)\"" \
+	/DOPENSC_VS_FF_LEGAL_COPYRIGHT="\"$(VS_FF_LEGAL_COPYRIGHT)\"" /DOPENSC_VS_FF_COMMENTS="\"$(VS_FF_COMMENTS)\""
 COPTS = /nologo /Zi /GS /W3 /WX /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS /DHAVE_CONFIG_H \
 	$(DEFS) $(DEBUG_DEF) $(OPENPACE_DEF) $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) $(TESTS_DEF) $(OPENSSL_EXTRA_CFLAGS) \
 	/I$(TOPDIR)\win32 /I$(TOPDIR)\src $(OPENPACE_INCL_DIR) $(OPENSSL_INCL_DIR) $(ZLIB_INCL_DIR) $(CPDK_INCL_DIR)
diff --git a/win32/Makefile.am b/win32/Makefile.am
@@ -1,9 +1,8 @@
 include $(top_srcdir)/win32/ltrc.inc
 
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/winconfig.h \
-		$(srcdir)/OpenSC.iss $(srcdir)/OpenSC.wxs
-EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak versioninfo.rc winconfig.h.in \
-		OpenSC.iss.in OpenSC.wxs.in versioninfo-customactions.rc \
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/OpenSC.iss
+EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak versioninfo.rc winconfig.h \
+		OpenSC.iss.in OpenSC.wxs versioninfo-customactions.rc \
 		OpenSC.ico dlgbmp.bmp bannrbmp.bmp DDORes.dll_14_2302.ico
 dist_noinst_HEADERS = versioninfo.rc winconfig.h OpenSC.iss OpenSC.wxs
 
diff --git a/win32/OpenSC.wxs b/win32/OpenSC.wxs
@@ -25,24 +25,24 @@
      xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package Name="@OPENSC_VS_FF_PRODUCT_NAME@$(var.ProductFlavor)$(var.ProductArch)"
+  <Package Name="$(var.PRODUCT_NAME)$(var.ProductFlavor)$(var.ProductArch)"
            UpgradeCode="$(var.PlatformUpgradeCode)"
            Language="1033"
            Version="!(bind.FileVersion.opensc.dll)"
-           Manufacturer="@OPENSC_VS_FF_COMPANY_NAME@"
+           Manufacturer="$(var.VS_FF_LEGAL_COMPANY_NAME)"
            Compressed="yes">
-    <SummaryInformation Description="@OPENSC_VS_FF_PRODUCT_NAME@ Installer"
+    <SummaryInformation Description="$(var.PRODUCT_NAME) Installer"
                         Keywords="SmartCard, eID" />
     <MajorUpgrade AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" DowngradeErrorMessage=
         "A newer version of [ProductName] is already installed. If you are trying to downgrade, please uninstall the newer version first." />
     <!-- Setup background images -->
     <WixVariable Id="WixUIBannerBmp" Value="bannrbmp.bmp" />
     <WixVariable Id="WixUIDialogBmp" Value="dlgbmp.bmp" />
     <!-- Links in info -->
-    <Property Id="ARPHELPLINK" Value="@PACKAGE_BUGREPORT@" />
-    <Property Id="ARPURLINFOABOUT" Value="@PACKAGE_URL@" />
-    <Property Id="ARPURLUPDATEINFO" Value="@OPENSC_VS_FF_PRODUCT_UPDATES@" />
-    <Property Id="ARPCONTACT" Value="@OPENSC_VS_FF_COMPANY_URL@" />
+    <Property Id="ARPHELPLINK" Value="$(var.PRODUCT_BUGREPORT)" />
+    <Property Id="ARPURLINFOABOUT" Value="$(var.PRODUCT_URL)" />
+    <Property Id="ARPURLUPDATEINFO" Value="$(var.VS_FF_PRODUCT_UPDATES)" />
+    <Property Id="ARPCONTACT" Value="$(var.VS_FF_LEGAL_COMPANY_URL)" />
 
     <Icon Id="OpenSC.ico" SourceFile="OpenSC.ico" />
     <Property Id="ARPPRODUCTICON" Value="OpenSC.ico" />
diff --git a/win32/winconfig.h b/win32/winconfig.h

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`param(`
`2`		`- [string]$version = '6.0.0'`
	`2`	`+ [string]$version = '6.0.2'`
`3`	`3`	`)`
`4`	`4`	`& dotnet tool install -g --version $version wix`
`5`	`5`	`& wix extension add -g WixToolset.UI.wixext/$version`