diff --git a/html/hints/winnt.html b/html/hints/winnt.html
index 7c41b861ba..75af630246 100644
--- a/html/hints/winnt.html
+++ b/html/hints/winnt.html
@@ -44,22 +44,26 @@ Compiling Requirements
- Windows 7 or Windows.NET Server 2003, or later.
- Windows NT 4.0 Windows 2000, Windows XP or Windows Vista may still work.
-
- Microsoft Visual C++ 2008, 2010, or 2013 EE
+
- Microsoft Visual C++ 2022
+
- Microsoft Visual C++ 2008, 2010, 2013 are out of support and should not be used anymore.
- Some way of uncompressing and untarring the gzipped tar file.
-
- OpenSSL must be built on the box before building NTP. Additional steps would
- be required to not use OpenSSL.
-
- Microsoft Visual C++ redistributables
+ OpenSSL must be built on the box before building NTP. Additional steps would be required to not use OpenSSL.
+ Microsoft Visual C++ redistributables
Compiling Instructions
- - Install Micosoft Visual C++ redistributables
-
- Install OpenSSL full installer for Windows. Add the following to your system environment variables in the control panel (adjusting paths as appropriate to point to the directory containing only an openssl subdirectory, for OPENSSL_INC, and to the directory containing openssl .lib files for OPENSSL_LIB:
-
- OPENSSL_INC=C:\OpenSSL\include
-
- OPENSSL_LIB=C:\OpenSSL\lib
+ - Install Micosoft Visual C++ redistributables.
+ The 32-bit version is still available but should not be used anymore.
+
- Install OpenSSL full installer for Windows.
+ Add the following to your system environment variables in the control panel (adjusting paths as appropriate to point to the directory containing only an openssl subdirectory, for OPENSSL_INC, and to the directory containing openssl .lib files for OPENSSL_LIB:
+
+ - OPENSSL_INC=C:\OpenSSL\include
+
- OPENSSL_LIB=C:\OpenSSL\lib
+
- Unpack the NTP-4.x.tar.gz using utilities such as WinZip or WinRar.
-
- Run Microsoft Visual C++ 2008 EE.
-
- Open the ports\winnt\vs2008\ntp.sln solution file
+
- Run Microsoft Visual C++ 2022.
+
- Open the ports\winnt\vs2022\ntp.sln solution file
- Batch build all projects (Build menu, Batch Build..., select all, build).
-
- The built binaries can be found in the ports\winnt\v2008\Win32-bin\Release directory.
+
- The built binaries can be found in the ports\winnt\vs2022\x64-out\Release directory.
- If you are shipping binaries in a kit it is strongly recommended that you ship this file (winnt.html) along with the binaries.
Configuration File
@@ -83,7 +87,7 @@ Command Line Parameters and Registry Entries
Bug Reports
Please follow the NTP Bug Reporting Procedures to report bugs or request enhancements.
Last update:
- 6-Apr-2014 23:27
+ 10-June-2025
diff --git a/ports/winnt/.gitignore b/ports/winnt/.gitignore
new file mode 100644
index 0000000000..f0adfebe22
--- /dev/null
+++ b/ports/winnt/.gitignore
@@ -0,0 +1,404 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+*.sln.iml
+
+# ntp specific
+*/*/.version
+*/*/scm-rev
diff --git a/ports/winnt/scripts/mkver.bat b/ports/winnt/scripts/mkver.bat
index c0c7b526b3..6e6b6d4428 100755
--- a/ports/winnt/scripts/mkver.bat
+++ b/ports/winnt/scripts/mkver.bat
@@ -21,6 +21,8 @@ see notes/remarks directly below this header:
#
# Changes:
#
+# 06/10/2025 Lukas Grützmacher
+# - Add support for build from git repository
# 04/01/2023 Dave Hart
# - Use fast 'bk root' to check for BitKeeper
# instead of invocation that gets ChangeSet.
@@ -138,7 +140,7 @@ IF {%1} == {-G} (
SET GENERATESCMREV=%2
SET OUTPUTSCMREV=%2
IF NOT {%3} == {} GOTO USAGE
- GOTO GENERATE_SCM_REV
+ GOTO GENERATE_SCM_BK_REV
)
IF {%1} == {-S} (
IF {%2} == {} GOTO USAGE
@@ -304,19 +306,27 @@ REM ****************************************************************************
REM Now we have the version info, try to add a BK ChangeSet revision
- IF "%SCMREV%" == "" GOTO GENERATE_SCM_REV
+ IF "%SCMREV%" == "" GOTO GENERATE_SCM_BK_REV
REM ** Called as -S to use generated scm-rev file.
FOR /F "TOKENS=1" %%a IN ('type %SCMREV%') DO @SET CSET=%%a
GOTO HAVECHANGESETREVISION
-:GENERATE_SCM_REV
+:GENERATE_SCM_BK_REV
REM ** Check if BK is installed ...
bk root ../../../.. 2> NUL > NUL
- IF ERRORLEVEL 1 GOTO NOBK
+ IF ERRORLEVEL 1 GOTO GENERATE_SCM_GIT_REV
REM ** Try to get the CSet rev directly from BK
FOR /F "TOKENS=1 DELIMS==" %%a IN ('bk.exe -R prs -hr+ -nd:I: ChangeSet') DO @SET CSET=%%a
+ GOTO WRITE_SCM_REV
+
+:GENERATE_SCM_GIT_REV
+ git rev-parse --short HEAD 2> NUL > NUL
+ IF ERRORLEVEL 1 GOTO NOBK
+
+ FOR /F "TOKENS=1" %%a IN ('git rev-parse --short HEAD') DO @SET CSET=%%a
+ GOTO WRITE_SCM_REV
:NOBK
IF NOT "%GENERATESCMREV%" == "" GOTO WRITE_SCM_REV
diff --git a/ports/winnt/vs2022/common.props b/ports/winnt/vs2022/common.props
new file mode 100644
index 0000000000..caa57c838f
--- /dev/null
+++ b/ports/winnt/vs2022/common.props
@@ -0,0 +1,59 @@
+
+