pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for VS2022 installer config+version info, 2024-12-16
Posted by Anonymous on Mon 16th Dec 2024 18:04
raw | new post

  1. From 2c53e3733321b3e570d0ff11f5a8e63f5c5129ac Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Mon, 16 Dec 2024 11:58:25 +0100
  4. Subject: [PATCH 1/2] build.vc19,cygwin: VS2022 should have it's own .vsconfig
  5. Visual Studio 2022 should have it's own .vsconfig to handle diverging
  6. package names.
  7. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  8. ---
  9.  ...config => ms-nfs41-client_vs2019.vsconfig} |  0
  10.  build.vc19/ms-nfs41-client_vs2022.vsconfig    | 63 +++++++++++++++++++
  11.  cygwin/README.txt                             | 10 +--
  12.  3 files changed, 69 insertions(+), 4 deletions(-)
  13.  rename build.vc19/{ms-nfs41-client.vsconfig => ms-nfs41-client_vs2019.vsconfig} (100%)
  14.  create mode 100755 build.vc19/ms-nfs41-client_vs2022.vsconfig
  15. diff --git a/build.vc19/ms-nfs41-client.vsconfig b/build.vc19/ms-nfs41-client_vs2019.vsconfig
  16. similarity index 100%
  17. rename from build.vc19/ms-nfs41-client.vsconfig
  18. rename to build.vc19/ms-nfs41-client_vs2019.vsconfig
  19. diff --git a/build.vc19/ms-nfs41-client_vs2022.vsconfig b/build.vc19/ms-nfs41-client_vs2022.vsconfig
  20. new file mode 100755
  21. index 0000000..5af6eb8
  22. --- /dev/null
  23. +++ b/build.vc19/ms-nfs41-client_vs2022.vsconfig
  24. @@ -0,0 +1,63 @@
  25. +{
  26. +  "version": "1.0",
  27. +  "components": [
  28. +    "Microsoft.VisualStudio.Component.CoreEditor",
  29. +    "Microsoft.VisualStudio.Workload.CoreEditor",
  30. +    "Microsoft.Net.Component.4.8.SDK",
  31. +    "Microsoft.Net.Component.4.7.2.TargetingPack",
  32. +    "Microsoft.VisualStudio.Component.TypeScript.TSServer",
  33. +    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
  34. +    "Microsoft.VisualStudio.Component.JavaScript.TypeScript",
  35. +    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
  36. +    "Microsoft.Component.MSBuild",
  37. +    "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
  38. +    "Microsoft.VisualStudio.Component.TextTemplating",
  39. +    "Microsoft.VisualStudio.Component.NuGet",
  40. +    "Microsoft.VisualStudio.Component.Debugger.JustInTime",
  41. +    "Microsoft.VisualStudio.Component.IntelliCode",
  42. +    "Microsoft.VisualStudio.Component.VC.CoreIde",
  43. +    "Microsoft.VisualStudio.Component.Windows10SDK",
  44. +    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
  45. +    "Microsoft.VisualStudio.Component.Graphics.Tools",
  46. +    "Microsoft.VisualStudio.Component.VC.DiagnosticTools",
  47. +    "Microsoft.VisualStudio.Component.Windows11SDK.22621",
  48. +    "Microsoft.VisualStudio.Component.VC.ATL",
  49. +    "Microsoft.VisualStudio.Component.VC.ATLMFC",
  50. +    "Microsoft.VisualStudio.Component.VC.Modules.x86.x64",
  51. +    "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
  52. +    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
  53. +    "Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit",
  54. +    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake",
  55. +    "Microsoft.VisualStudio.Component.VC.CMake.Project",
  56. +    "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest",
  57. +    "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest",
  58. +    "Microsoft.VisualStudio.Component.VC.ASAN",
  59. +    "Microsoft.VisualStudio.Component.VC.CLI.Support",
  60. +    "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset",
  61. +    "Microsoft.VisualStudio.Component.VC.Llvm.Clang",
  62. +    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang",
  63. +    "Microsoft.VisualStudio.Component.Windows11SDK.26100",
  64. +    "Microsoft.VisualStudio.Component.Windows11SDK.22000",
  65. +    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
  66. +    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
  67. +    "Microsoft.VisualStudio.Component.Windows10SDK.18362",
  68. +    "Microsoft.Component.VC.Runtime.UCRTSDK",
  69. +    "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC",
  70. +    "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
  71. +    "Microsoft.VisualStudio.Component.VC.Tools.ARM",
  72. +    "Microsoft.VisualStudio.Workload.NativeDesktop",
  73. +    "Microsoft.VisualStudio.Component.DebuggerCommandLineArguments",
  74. +    "Microsoft.VisualStudio.Component.Git",
  75. +    "Microsoft.VisualStudio.Component.VC.ATL.ARM",
  76. +    "Microsoft.VisualStudio.Component.VC.ATL.ARM64",
  77. +    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre",
  78. +    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre",
  79. +    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",
  80. +    "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre",
  81. +    "Microsoft.VisualStudio.Component.VC.MFC.ARM",
  82. +    "Microsoft.VisualStudio.Component.VC.MFC.ARM64",
  83. +    "Microsoft.Net.Component.4.6.1.TargetingPack",
  84. +    "Component.Microsoft.Windows.DriverKit"
  85. +  ],
  86. +  "extensions": []
  87. +}
  88. \ No newline at end of file
  89. diff --git a/cygwin/README.txt b/cygwin/README.txt
  90. index 531b97e..b3f9103 100644
  91. --- a/cygwin/README.txt
  92. +++ b/cygwin/README.txt
  93. @@ -6,9 +6,10 @@
  94.  
  95.  ######## Building ms-nfs41-client using Cygwin+Makefile:
  96.  ** Required software:
  97. -* Windows 10 with Visual Studio 2019
  98. +* Option 1:
  99. +  Windows 10 with Visual Studio 2019
  100.  - Start Visual Studio 19 installer and import the installer
  101. -  config file "ms-nfs41-client/build.vc19/ms-nfs41-client.vsconfig",
  102. +  config file "ms-nfs41-client/build.vc19/ms-nfs41-client_vs2019.vsconfig",
  103.    and then install Visual Studio.
  104.    (Note that due to a bug in the VS installer it is sometimes
  105.    required to manually add another (random) component to be installed,
  106. @@ -19,9 +20,10 @@
  107.    (see "ms-nfs41-clientcygwin/README.bintarball.txt" for Cygwin 32bit
  108.    and 64bit installation instructions)
  109.  
  110. -* Windows 10/11 with Visual Studio 2022
  111. +* Option 2:
  112. +  Windows 10/11 with Visual Studio 2022
  113.  - Start Visual Studio 2022 installer and import the installer
  114. -  config file "ms-nfs41-client/build.vc19/ms-nfs41-client.vsconfig",
  115. +  config file "ms-nfs41-client/build.vc19/ms-nfs41-client_vs2022.vsconfig",
  116.    and then install Visual Studio.
  117.    (Note that due to a bug in the VS installer it is sometimes
  118.    required to manually add another (random) component to be installed,
  119. --
  120. 2.45.1
  121. From c47d077cdb1b403be351bf6886926c5fd0f93fcb Mon Sep 17 00:00:00 2001
  122. From: Roland Mainz <roland.mainz@nrubsig.org>
  123. Date: Mon, 16 Dec 2024 13:08:03 +0100
  124. Subject: [PATCH 2/2] build.vc19,daemon,mount: Add -V/--version options to
  125.  nfs_mount+nfsd, including commit id
  126. Add -V/--version options to nfs_mount+nfsd, including git
  127. commit id
  128. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  129. ---
  130.  build.vc19/nfs_mount/nfs_mount.vcxproj | 28 +++++++++++++++++-----
  131.  build.vc19/nfsd/nfsd.vcxproj           | 28 +++++++++++++++++-----
  132.  daemon/nfs41_daemon.c                  | 32 ++++++++++++++++++++++---
  133.  mount/mount.c                          | 33 +++++++++++++++++++++++++-
  134.  4 files changed, 105 insertions(+), 16 deletions(-)
  135. diff --git a/build.vc19/nfs_mount/nfs_mount.vcxproj b/build.vc19/nfs_mount/nfs_mount.vcxproj
  136. index 6aaf266..48009f0 100644
  137. --- a/build.vc19/nfs_mount/nfs_mount.vcxproj
  138. +++ b/build.vc19/nfs_mount/nfs_mount.vcxproj
  139. @@ -1,5 +1,21 @@
  140.  
  141. <?xml version="1.0" encoding="utf-8"?>
  142.  <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  143. +  <Target Name="generate_git_version_header" BeforeTargets="ClCompile">
  144. +    <Exec
  145. +      Command="git describe --long --always --dirty --exclude=* --abbrev=8"
  146. +      ConsoleToMSBuild="True"
  147. +      IgnoreExitCode="False">
  148. +      <Output TaskParameter="ConsoleOutput" PropertyName="git_version_string" />
  149. +    </Exec>
  150. +
  151. +    <WriteLinesToFile
  152. +      File="$(IntermediateOutputPath)/git_version.h"
  153. +      Overwrite="True"
  154. +      Lines="
  155. +/* Generated file, do not edit */
  156. +#define GIT_COMMIT_ID &quot;$(git_version_string)&quot;
  157. +" />
  158. +  </Target>
  159.    <ItemGroup Label="ProjectConfigurations">
  160.      <ProjectConfiguration Include="Debug|Win32">
  161.        <Configuration>Debug</Configuration>
  162. @@ -121,7 +137,7 @@
  163.        <WarningLevel>Level4</WarningLevel>
  164.        <Optimization>Disabled</Optimization>
  165.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  166. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  167. +      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  168.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  169.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  170.        <SupportJustMyCode>false</SupportJustMyCode>
  171. @@ -139,7 +155,7 @@
  172.        <WarningLevel>Level4</WarningLevel>
  173.        <Optimization>Disabled</Optimization>
  174.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  175. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  176. +      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  177.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  178.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  179.        <SupportJustMyCode>false</SupportJustMyCode>
  180. @@ -157,7 +173,7 @@
  181.        <WarningLevel>Level4</WarningLevel>
  182.        <Optimization>Disabled</Optimization>
  183.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  184. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  185. +      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  186.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  187.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  188.        <SupportJustMyCode>false</SupportJustMyCode>
  189. @@ -177,7 +193,7 @@
  190.        <FunctionLevelLinking>true</FunctionLevelLinking>
  191.        <IntrinsicFunctions>true</IntrinsicFunctions>
  192.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  193. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  194. +      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  195.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  196.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  197.      </ClCompile>
  198. @@ -198,7 +214,7 @@
  199.        <FunctionLevelLinking>true</FunctionLevelLinking>
  200.        <IntrinsicFunctions>true</IntrinsicFunctions>
  201.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  202. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  203. +      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  204.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  205.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  206.      </ClCompile>
  207. @@ -219,7 +235,7 @@
  208.        <FunctionLevelLinking>true</FunctionLevelLinking>
  209.        <IntrinsicFunctions>true</IntrinsicFunctions>
  210.        <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  211. -      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  212. +      <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  213.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  214.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  215.      </ClCompile>
  216. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  217. index c824647..ca2eeee 100644
  218. --- a/build.vc19/nfsd/nfsd.vcxproj
  219. +++ b/build.vc19/nfsd/nfsd.vcxproj
  220. @@ -1,5 +1,21 @@
  221.  
  222. <?xml version="1.0" encoding="utf-8"?>
  223.  <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  224. +  <Target Name="generate_git_version_header" BeforeTargets="ClCompile">
  225. +    <Exec
  226. +      Command="git describe --long --always --dirty --exclude=* --abbrev=8"
  227. +      ConsoleToMSBuild="True"
  228. +      IgnoreExitCode="False">
  229. +      <Output TaskParameter="ConsoleOutput" PropertyName="git_version_string" />
  230. +    </Exec>
  231. +
  232. +    <WriteLinesToFile
  233. +      File="$(IntermediateOutputPath)/git_version.h"
  234. +      Overwrite="True"
  235. +      Lines="
  236. +/* Generated file, do not edit */
  237. +#define GIT_COMMIT_ID &quot;$(git_version_string)&quot;
  238. +" />
  239. +  </Target>
  240.    <ItemGroup Label="ProjectConfigurations">
  241.      <ProjectConfiguration Include="Debug|Win32">
  242.        <Configuration>Debug</Configuration>
  243. @@ -121,7 +137,7 @@
  244.        <WarningLevel>Level4</WarningLevel>
  245.        <Optimization>Disabled</Optimization>
  246.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  247. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  248. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  249.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  250.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  251.        <BufferSecurityCheck>false</BufferSecurityCheck>
  252. @@ -143,7 +159,7 @@
  253.        <WarningLevel>Level4</WarningLevel>
  254.        <Optimization>Disabled</Optimization>
  255.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  256. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  257. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  258.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  259.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  260.        <BufferSecurityCheck>false</BufferSecurityCheck>
  261. @@ -165,7 +181,7 @@
  262.        <WarningLevel>Level4</WarningLevel>
  263.        <Optimization>Disabled</Optimization>
  264.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  265. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  266. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  267.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  268.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  269.        <BufferSecurityCheck>false</BufferSecurityCheck>
  270. @@ -189,7 +205,7 @@
  271.        <FunctionLevelLinking>true</FunctionLevelLinking>
  272.        <IntrinsicFunctions>true</IntrinsicFunctions>
  273.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  274. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  275. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  276.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  277.        <BufferSecurityCheck>false</BufferSecurityCheck>
  278.        <StringPooling>true</StringPooling>
  279. @@ -213,7 +229,7 @@
  280.        <FunctionLevelLinking>true</FunctionLevelLinking>
  281.        <IntrinsicFunctions>true</IntrinsicFunctions>
  282.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  283. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  284. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  285.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  286.        <BufferSecurityCheck>false</BufferSecurityCheck>
  287.        <StringPooling>true</StringPooling>
  288. @@ -237,7 +253,7 @@
  289.        <FunctionLevelLinking>true</FunctionLevelLinking>
  290.        <IntrinsicFunctions>true</IntrinsicFunctions>
  291.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  292. -      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  293. +      <AdditionalIncludeDirectories>..\..\include;..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  294.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  295.        <BufferSecurityCheck>false</BufferSecurityCheck>
  296.        <StringPooling>true</StringPooling>
  297. diff --git a/daemon/nfs41_daemon.c b/daemon/nfs41_daemon.c
  298. index 6530144..93d66b2 100644
  299. --- a/daemon/nfs41_daemon.c
  300. +++ b/daemon/nfs41_daemon.c
  301. @@ -41,6 +41,11 @@
  302.  #include "sid.h"
  303.  #include "accesstoken.h"
  304.  #include "util.h"
  305. +/*
  306. + * "git_version.h" is generated by
  307. + * build.vc19/nfsd/nfsd.vcxproj
  308. + */
  309. +#include "git_version.h"
  310.  
  311.  /* nfs41_dg.num_worker_threads sets the actual number of worker threads */
  312.  #define MAX_NUM_THREADS 1024
  313. @@ -276,7 +281,8 @@ static bool_t check_for_files()
  314.  static void PrintUsage(const wchar_t *argv0)
  315.  {
  316.      (void)fprintf(stderr, "Usage: %S [options]\n"
  317. -        "\t-h, --help, /?  help\n"
  318. +        "\t-h, --help, /?\thelp\n"
  319. +        "\t-V, --version, /?\tversion\n"
  320.          "\t-d <debug_level>\n"
  321.          "\t--noldap\n"
  322.          "\t--uid <non-zero value>\n"
  323. @@ -289,6 +295,19 @@ static void PrintUsage(const wchar_t *argv0)
  324.          , argv0, MAX_NUM_THREADS);
  325.  }
  326.  
  327. +static
  328. +void PrintVersion(void)
  329. +{
  330. +    (void)fprintf(stderr,
  331. +        "nfsd.exe version 0.1 (%s) from ms-nfs41-client, commitid=%s\n",
  332. +#ifdef _DEBUG
  333. +        "DEBUG build",
  334. +#else
  335. +        "RELEASE",
  336. +#endif /* _DEBUG */
  337. +        GIT_COMMIT_ID);
  338. +}
  339. +
  340.  static
  341.  bool_t parse_cmdlineargs(int argc, wchar_t *argv[], nfsd_args *out)
  342.  {
  343. @@ -311,6 +330,11 @@ bool_t parse_cmdlineargs(int argc, wchar_t *argv[], nfsd_args *out)
  344.                  PrintUsage(argv[0]);
  345.                  return FALSE;
  346.              }
  347. +            else if ((!wcscmp(argv[i], L"-V")) ||
  348. +                (!wcscmp(argv[i], L"--version"))) { /* version */
  349. +                PrintVersion();
  350. +                return FALSE;
  351. +            }
  352.              else if (!wcscmp(argv[i], L"-d")) { /* debug level */
  353.                  ++i;
  354.                  if (i >= argc) {
  355. @@ -769,9 +793,11 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv)
  356.  #endif /* NFS41_DRIVER_SID_CACHE */
  357.  
  358.  #ifdef _DEBUG
  359. -    logprintf("NFS client daemon (DEBUG build) starting...\n");
  360. +    logprintf("NFS client daemon (DEBUG build) %s starting...\n",
  361. +        GIT_COMMIT_ID);
  362.  #else
  363. -    logprintf("NFS client daemon (Release build) starting...\n");
  364. +    logprintf("NFS client daemon (Release build) %s starting...\n",
  365. +        GIT_COMMIT_ID);
  366.  #endif
  367.  
  368.      /* Enable Win32 privileges */
  369. diff --git a/mount/mount.c b/mount/mount.c
  370. index b0a39bb..c9b5637 100644
  371. --- a/mount/mount.c
  372. +++ b/mount/mount.c
  373. @@ -43,7 +43,11 @@
  374.  #include "nfs41_driver.h" /* |NFS41_PROVIDER_NAME_U| */
  375.  #include "options.h"
  376.  #include "urlparser1.h"
  377. -
  378. +/*
  379. + * "git_version.h" is generated by
  380. + * build.vc19/nfs_mount/nfs_mount.vcxproj
  381. + */
  382. +#include "git_version.h"
  383.  
  384.  /*
  385.   * Disable "warning C4996: 'wcscpy': This function or variable may be
  386. @@ -81,6 +85,19 @@ static BOOL ParseDriveLetter(
  387.  void PrintErrorMessage(
  388.      IN DWORD dwError);
  389.  
  390. +static
  391. +void PrintVersion(void)
  392. +{
  393. +    (void)fwprintf(stderr,
  394. +        L"nfs_mount.exe version 0.1 (%s) from ms-nfs41-client, commitid=%s\n",
  395. +#ifdef _DEBUG
  396. +        "DEBUG build",
  397. +#else
  398. +        "RELEASE build",
  399. +#endif /* _DEBUG */
  400. +        GIT_COMMIT_ID);
  401. +}
  402. +
  403.  static
  404.  void PrintMountUsage(LPWSTR pProcess)
  405.  {
  406. @@ -92,6 +109,7 @@ void PrintMountUsage(LPWSTR pProcess)
  407.  
  408.          "* Options:\n"
  409.          "\t-h, --help, /?\thelp\n"
  410. +        "\t-V, --version, /?\tversion info\n"
  411.          "\t-d, --unmount\tunmount\n"
  412.          "\t-f, --force\tforce unmount if the drive is in use\n"
  413.              "\t-F <type>\tFilesystem type to use (only 'nfs' supported)"
  414. @@ -185,6 +203,7 @@ void PrintUmountUsage(LPWSTR pProcess)
  415.  
  416.          "* Options:\n"
  417.          "\t-h, --help, /?\thelp\n"
  418. +        "\t-V, --version\tversion number\n"
  419.          "\t-f, --force\tforce unmount if the drive is in use\n",
  420.          pProcess);
  421.  }
  422. @@ -227,6 +246,12 @@ int mount_main(int argc, wchar_t *argv[])
  423.                  result = 1;
  424.                  goto out;
  425.              }
  426. +            /* print version info */
  427. +            else if ((!wcscmp(argv[i], L"-V")) ||
  428. +                    (!wcscmp(argv[i], L"--version"))) {
  429. +                PrintVersion();
  430. +                goto out_free;
  431. +            }
  432.              /* unmount */
  433.              else if ((!wcscmp(argv[i], L"-d")) ||
  434.                      (!wcscmp(argv[i], L"--unmount"))) {
  435. @@ -504,6 +529,12 @@ int umount_main(int argc, wchar_t *argv[])
  436.                  result = 1;
  437.                  goto out;
  438.              }
  439. +            /* print version info */
  440. +            else if ((!wcscmp(argv[i], L"-V")) ||
  441. +                    (!wcscmp(argv[i], L"--version"))) {
  442. +                PrintVersion();
  443. +                goto out;
  444. +            }
  445.              /* force unmount */
  446.              else if ((!wcscmp(argv[i], L"-f")) ||
  447.                  (!wcscmp(argv[i], L"--force"))) {
  448. --
  449. 2.45.1

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at