nrubsig.kpaste.net RSS
Difference between
modified post 0d9006 by Anonymous on Mon 2nd Dec 2024 10:14
original post 32f44e4dd by Anonymous on Sun 1st Dec 2024 23:28
Download diff
Show
old version |
new version |
both versions
| 1 | 1 | diff --git a/build.vc19/nfs_mount/nfs_mount.vcxproj b/build.vc19/nfs_mount/nfs_mount.vcxproj | |
| 2 | - | index b94bfb2..eb6998d 100644 | |
| 2 | + | index b94bfb2..01427f5 100644 | |
| 3 | 3 | --- a/build.vc19/nfs_mount/nfs_mount.vcxproj | |
| 4 | 4 | +++ b/build.vc19/nfs_mount/nfs_mount.vcxproj | |
| 5 | - | @@ -27,11 +27,27 @@ | |
| 5 | + | @@ -1,5 +1,21 @@ | |
| 6 | - | </ProjectConfiguration> | |
| 6 | + | <?xml version="1.0" encoding="utf-8"?> | |
| 7 | - | </ItemGroup> | |
| 7 | + | <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |
| 8 | - | <PropertyGroup Label="Globals"> | |
| 8 | + | + <Target Name="generate_git_version_header" BeforeTargets="ClCompile"> | |
| 17 | 9 | + <Exec | |
| 18 | 10 | + Command="git describe --long --always --dirty --exclude=* --abbrev=8" | |
| 19 | 11 | + ConsoleToMSBuild="True" | |
| 20 | - | + IgnoreExitCode="False" | |
| 12 | + | + IgnoreExitCode="False"> | |
| 21 | - | + > | |
| 13 | + | + <Output TaskParameter="ConsoleOutput" PropertyName="git_version_string" /> | |
| 23 | 14 | + </Exec> | |
| 24 | 15 | + | |
| 25 | - | + <WriteLinesToFile File="$(IntermediateOutputPath)/git_version.h" Lines=" | |
| 16 | + | + <WriteLinesToFile | |
| 26 | - | +#define GIT_COMMIT_ID "$(SourceRevisionId)" | |
| 17 | + | + File="$(IntermediateOutputPath)/git_version.h" | |
| 18 | + | + Overwrite="True" | |
| 27 | 22 | +" /> | |
| 28 | 23 | + </Target> | |
| 29 | - | + | |
| 24 | + | <ItemGroup Label="ProjectConfigurations"> | |
| 30 | - | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |
| 25 | + | <ProjectConfiguration Include="Debug|Win32"> | |
| 31 | - | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
| 26 | + | <Configuration>Debug</Configuration> | |
| 33 | 27 | @@ -121,7 +137,7 @@ | |
| 34 | 28 | <WarningLevel>Level4</WarningLevel> | |
| 35 | 29 | <Optimization>Disabled</Optimization> | |
| 36 | 30 | <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 37 | 31 | - <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 38 | 32 | + <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 39 | 33 | <LanguageStandard_C>stdc17</LanguageStandard_C> | |
| 40 | 34 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
| 41 | 35 | <SupportJustMyCode>false</SupportJustMyCode> | |
| 42 | 36 | @@ -139,7 +155,7 @@ | |
| 43 | 37 | <WarningLevel>Level4</WarningLevel> | |
| 44 | 38 | <Optimization>Disabled</Optimization> | |
| 45 | 39 | <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 46 | 40 | - <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 47 | 41 | + <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 48 | 42 | <LanguageStandard_C>stdc17</LanguageStandard_C> | |
| 49 | 43 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
| 50 | 44 | <SupportJustMyCode>false</SupportJustMyCode> | |
| 51 | 45 | @@ -157,7 +173,7 @@ | |
| 52 | 46 | <WarningLevel>Level4</WarningLevel> | |
| 53 | 47 | <Optimization>Disabled</Optimization> | |
| 54 | 48 | <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 55 | 49 | - <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 56 | 50 | + <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 57 | 51 | <LanguageStandard_C>stdc17</LanguageStandard_C> | |
| 58 | 52 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
| 59 | 53 | <SupportJustMyCode>false</SupportJustMyCode> | |
| 60 | 54 | @@ -177,7 +193,7 @@ | |
| 61 | 55 | <FunctionLevelLinking>true</FunctionLevelLinking> | |
| 62 | 56 | <IntrinsicFunctions>true</IntrinsicFunctions> | |
| 63 | 57 | <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 64 | 58 | - <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 65 | 59 | + <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 66 | 60 | <LanguageStandard_C>stdc17</LanguageStandard_C> | |
| 67 | 61 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| 68 | 62 | </ClCompile> | |
| 69 | 63 | @@ -198,7 +214,7 @@ | |
| 70 | 64 | <FunctionLevelLinking>true</FunctionLevelLinking> | |
| 71 | 65 | <IntrinsicFunctions>true</IntrinsicFunctions> | |
| 72 | 66 | <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 73 | 67 | - <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 74 | 68 | + <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 75 | 69 | <LanguageStandard_C>stdc17</LanguageStandard_C> | |
| 76 | 70 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| 77 | 71 | </ClCompile> | |
| 78 | 72 | @@ -219,7 +235,7 @@ | |
| 79 | 73 | <FunctionLevelLinking>true</FunctionLevelLinking> | |
| 80 | 74 | <IntrinsicFunctions>true</IntrinsicFunctions> | |
| 81 | 75 | <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| 82 | 76 | - <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 83 | 77 | + <AdditionalIncludeDirectories>..\..\sys;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 84 | 78 | <LanguageStandard_C>stdc17</LanguageStandard_C> | |
| 85 | 79 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| 86 | 80 | </ClCompile> | |
| 87 | 81 | diff --git a/mount/mount.c b/mount/mount.c | |
| 88 | 82 | index 388bfa9..2aac7bf 100644 | |
| 89 | 83 | --- a/mount/mount.c | |
| 90 | 84 | +++ b/mount/mount.c | |
| 91 | 85 | @@ -39,6 +39,7 @@ | |
| 92 | 86 | #include "nfs41_driver.h" /* |NFS41_PROVIDER_NAME_U| */ | |
| 93 | 87 | #include "options.h" | |
| 94 | 88 | #include "urlparser1.h" | |
| 95 | 89 | +#include "git_version.h" | |
| 96 | 90 | ||
| 97 | 91 | ||
| 98 | 92 | /* | |
| 99 | 93 |
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.