Merge tl.davehart.net:C:/ntp/stable/tracking

into  tl.davehart.net:C:/ntp/stable/vc2015-cleanup

bk: 644edf98Wn2lTu2lPvvsTMgNH39jxg

diff --cc ports/winnt/vs2015/ntpd/ntpd.vcxproj
index 847ac4a189563b111a5ae3d4d3041878d1eea1a0,6f1102a17b07b6eb943881083796c26b58a6daad..a177aa66152b49b643d2e870338e0ce33a579121
--- 1/ports/winnt/vs2015/ntpd/ntpd.vcxproj
--- 2/ports/winnt/vs2015/ntpd/ntpd.vcxproj
+++ b/ports/winnt/vs2015/ntpd/ntpd.vcxproj
@@@ -464,47 -294,14 +295,15 @@@
      <ResourceCompile Include="..\..\libntp\messages.rc" />
    </ItemGroup>
    <ItemGroup>
-     <CustomBuild Include="..\..\..\..\packageinfo.sh">
-       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Using NT Shell Script to generate version.c</Message>
-       <Message Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">Using NT Shell Script to generate version.c</Message>
-       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName)
- </Command>
-       <Command Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName)
- </Command>
-       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs)</AdditionalInputs>
-       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
-       </AdditionalInputs>
-       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\version.c;%(Outputs)</Outputs>
-       <Outputs Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">.\version.c;%(Outputs)</Outputs>
-       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Using NT Shell Script to generate version.c</Message>
-       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName)
- </Command>
-       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-       </AdditionalInputs>
-       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\version.c;%(Outputs)</Outputs>
-       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Using NT Shell Script to generate version.c</Message>
-       <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">Using NT Shell Script to generate version.c</Message>
-       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName)
- </Command>
-       <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">call ..\..\scripts\mkver.bat -P $(ProjectName)
- </Command>
-       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-       </AdditionalInputs>
-       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
-       </AdditionalInputs>
-       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\version.c;%(Outputs)</Outputs>
-       <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">.\version.c;%(Outputs)</Outputs>
-       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Using NT Shell Script to generate version.c</Message>
-       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call ..\..\scripts\mkver.bat -P $(ProjectName)
- </Command>
-       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-       </AdditionalInputs>
-       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\version.c;%(Outputs)</Outputs>
+     <CustomBuild Include="..\..\..\..\ntpd\ntp_parser.h">
+       <AdditionalInputs>..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs)</AdditionalInputs>
+       <Message>invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h</Message>
+       <Command>call .\gen-ntp_keyword $(TmpBaseDir)</Command>
+       <Outputs>..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs)</Outputs>
      </CustomBuild>
-     <None Include="..\..\libntp\MSG00001.bin" />
-     <None Include="..\libntp\messages.mc" />
 +    <None Include="..\..\..\..\ChangeLog" />
    </ItemGroup>
+   <Import Project="..\mkver.props" />
    <ItemGroup>
      <ProjectReference Include="..\libntp\libntp.vcxproj">
        <Project>{400fbfcb-462e-40d0-b06b-3b74e3fffd00}</Project>

diff --cc ports/winnt/vs2015/ntpd/ntpd.vcxproj.filters
Simple merge