From 2b5143eb9804555f0e01e9087f20fc3094d68615 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Sat, 25 Jul 2020 16:19:39 +0200 Subject: [PATCH] Add new MSBuild project "version" Generates windows/include/version.h and windows/include/builddate.h. Also ensure that the version project is built first by adding a dependency from the pathplan project which was the first project to be built before this change. Includes auto-updated VisualStudioVersion variable in solution file. --- graphviz.sln | 20 ++++- lib/version/version.vcxproj | 166 ++++++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 lib/version/version.vcxproj diff --git a/graphviz.sln b/graphviz.sln index 09c67c87b..32d198f5e 100644 --- a/graphviz.sln +++ b/graphviz.sln @@ -1,8 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30320.27 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pathplan", "lib\pathplan\Pathplan.vcxproj", "{BD347753-A09D-48B4-8752-F1D8D9CF235D}" + ProjectSection(ProjectDependencies) = postProject + {320318AF-81FB-446A-9DB4-7D561F712761} = {320318AF-81FB-446A-9DB4-7D561F712761} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdt", "lib\cdt\cdt.vcxproj", "{83CF0498-7884-49D3-8B3C-263C5AF5FE1B}" EndProject @@ -262,6 +265,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spine", "lib\spine\spine.vc {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "lib\version\version.vcxproj", "{320318AF-81FB-446A-9DB4-7D561F712761}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -652,8 +657,19 @@ Global {4DBC1707-9797-4BAD-8989-08AF459F8840}.Release|Win32.Build.0 = Release|Win32 {4DBC1707-9797-4BAD-8989-08AF459F8840}.Release|x64.ActiveCfg = Release|x64 {4DBC1707-9797-4BAD-8989-08AF459F8840}.Release|x64.Build.0 = Release|x64 + {320318AF-81FB-446A-9DB4-7D561F712761}.Debug|Win32.ActiveCfg = Debug|Win32 + {320318AF-81FB-446A-9DB4-7D561F712761}.Debug|Win32.Build.0 = Debug|Win32 + {320318AF-81FB-446A-9DB4-7D561F712761}.Debug|x64.ActiveCfg = Debug|x64 + {320318AF-81FB-446A-9DB4-7D561F712761}.Debug|x64.Build.0 = Debug|x64 + {320318AF-81FB-446A-9DB4-7D561F712761}.Release|Win32.ActiveCfg = Release|Win32 + {320318AF-81FB-446A-9DB4-7D561F712761}.Release|Win32.Build.0 = Release|Win32 + {320318AF-81FB-446A-9DB4-7D561F712761}.Release|x64.ActiveCfg = Release|x64 + {320318AF-81FB-446A-9DB4-7D561F712761}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {88FA039A-2352-45BE-B483-6D514B30D68B} + EndGlobalSection EndGlobal diff --git a/lib/version/version.vcxproj b/lib/version/version.vcxproj new file mode 100644 index 000000000..478a3d199 --- /dev/null +++ b/lib/version/version.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {320318af-81fb-446a-9db4-7d561f712761} + version + 10.0 + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + python3 $(SolutionDir)gen_version.py --committer-date-graphviz | sed "s/\(.*\)/#define BUILDDATE \"\1\"/" > $(SolutionDir)windows\include\builddate.h +python3 $(SolutionDir)gen_version.py | sed "s/\(.*\)/#define VERSION \"\1\"/" > $(SolutionDir)windows\include\version.h + + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + python3 $(SolutionDir)gen_version.py --committer-date-graphviz | sed "s/\(.*\)/#define BUILDDATE \"\1\"/" > $(SolutionDir)windows\include\builddate.h +python3 $(SolutionDir)gen_version.py | sed "s/\(.*\)/#define VERSION \"\1\"/" > $(SolutionDir)windows\include\version.h + + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + python3 $(SolutionDir)gen_version.py --committer-date-graphviz | sed "s/\(.*\)/#define BUILDDATE \"\1\"/" > $(SolutionDir)windows\include\builddate.h +python3 $(SolutionDir)gen_version.py | sed "s/\(.*\)/#define VERSION \"\1\"/" > $(SolutionDir)windows\include\version.h + + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + python3 $(SolutionDir)gen_version.py --committer-date-graphviz | sed "s/\(.*\)/#define BUILDDATE \"\1\"/" > $(SolutionDir)windows\include\builddate.h +python3 $(SolutionDir)gen_version.py | sed "s/\(.*\)/#define VERSION \"\1\"/" > $(SolutionDir)windows\include\version.h + + + + + + + + + \ No newline at end of file -- 2.40.0