From 9c4354314ec6965c7cc7c9823860d81dfc9f2a87 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 5 Jul 2020 16:52:40 +0200 Subject: [PATCH 1/4] Remove outdated MSVC solutions --- build/vc100/.gitignore | 7 - build/vc100/turtle.sln | 35 ---- build/vc100/turtle.vcxproj | 196 ------------------ build/vc100/turtle.vcxproj.filters | 131 ------------ build/vc100/turtle.vcxproj.user | 3 - build/vc100/turtle_bench.vcxproj | 192 ------------------ build/vc100/turtle_bench.vcxproj.filters | 38 ---- build/vc100/turtle_bench.vcxproj.user | 3 - build/vc100/turtle_test.vcxproj | 238 ---------------------- build/vc100/turtle_test.vcxproj.filters | 79 -------- build/vc100/turtle_test.vcxproj.user | 3 - build/vc140/.gitignore | 7 - build/vc140/turtle.sln | 35 ---- build/vc140/turtle.vcxproj | 196 ------------------ build/vc140/turtle.vcxproj.filters | 131 ------------ build/vc140/turtle.vcxproj.user | 3 - build/vc140/turtle_bench.vcxproj | 192 ------------------ build/vc140/turtle_bench.vcxproj.filters | 38 ---- build/vc140/turtle_bench.vcxproj.user | 3 - build/vc140/turtle_test.vcxproj | 241 ----------------------- build/vc140/turtle_test.vcxproj.filters | 79 -------- build/vc140/turtle_test.vcxproj.user | 3 - 22 files changed, 1853 deletions(-) delete mode 100644 build/vc100/.gitignore delete mode 100644 build/vc100/turtle.sln delete mode 100644 build/vc100/turtle.vcxproj delete mode 100644 build/vc100/turtle.vcxproj.filters delete mode 100644 build/vc100/turtle.vcxproj.user delete mode 100644 build/vc100/turtle_bench.vcxproj delete mode 100644 build/vc100/turtle_bench.vcxproj.filters delete mode 100644 build/vc100/turtle_bench.vcxproj.user delete mode 100644 build/vc100/turtle_test.vcxproj delete mode 100644 build/vc100/turtle_test.vcxproj.filters delete mode 100644 build/vc100/turtle_test.vcxproj.user delete mode 100644 build/vc140/.gitignore delete mode 100644 build/vc140/turtle.sln delete mode 100644 build/vc140/turtle.vcxproj delete mode 100644 build/vc140/turtle.vcxproj.filters delete mode 100644 build/vc140/turtle.vcxproj.user delete mode 100644 build/vc140/turtle_bench.vcxproj delete mode 100644 build/vc140/turtle_bench.vcxproj.filters delete mode 100644 build/vc140/turtle_bench.vcxproj.user delete mode 100644 build/vc140/turtle_test.vcxproj delete mode 100644 build/vc140/turtle_test.vcxproj.filters delete mode 100644 build/vc140/turtle_test.vcxproj.user diff --git a/build/vc100/.gitignore b/build/vc100/.gitignore deleted file mode 100644 index dd990f3..0000000 --- a/build/vc100/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.vs -*.db -*.ipch -*.opendb -*.opensdf -*.sdf -*.suo diff --git a/build/vc100/turtle.sln b/build/vc100/turtle.sln deleted file mode 100644 index 5e18ba2..0000000 --- a/build/vc100/turtle.sln +++ /dev/null @@ -1,35 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "turtle", "turtle.vcxproj", "{831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "turtle_test", "turtle_test.vcxproj", "{74810A2A-33D8-47D6-9A50-71261F1683F5}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug|Win32 = debug|Win32 - debug|x64 = debug|x64 - release|Win32 = release|Win32 - release|x64 = release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.debug|Win32.ActiveCfg = debug|Win32 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.debug|Win32.Build.0 = debug|Win32 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.debug|x64.ActiveCfg = debug|x64 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.debug|x64.Build.0 = debug|x64 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.release|Win32.ActiveCfg = release|Win32 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.release|Win32.Build.0 = release|Win32 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.release|x64.ActiveCfg = release|x64 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.release|x64.Build.0 = release|x64 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|Win32.ActiveCfg = debug|Win32 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|Win32.Build.0 = debug|Win32 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|x64.ActiveCfg = debug|x64 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|x64.Build.0 = debug|x64 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.release|Win32.ActiveCfg = release|Win32 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.release|Win32.Build.0 = release|Win32 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.release|x64.ActiveCfg = release|x64 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.release|x64.Build.0 = release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/vc100/turtle.vcxproj b/build/vc100/turtle.vcxproj deleted file mode 100644 index cf3d8da..0000000 --- a/build/vc100/turtle.vcxproj +++ /dev/null @@ -1,196 +0,0 @@ - - - - - debug - Win32 - - - debug - x64 - - - release - Win32 - - - release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D} - - - - StaticLibrary - - - StaticLibrary - - - StaticLibrary - - - StaticLibrary - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ../../out/vc100/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc100_x64/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc100/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc100_x64/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc100/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc100_x64/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc100/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc100_x64/$(Configuration)/libraries/$(ProjectName)\ - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - - - - /Zm179 %(AdditionalOptions) - Disabled - $(IntDir); ../../include; ../../src/libraries; ../../src/libraries/$(ProjectName);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir)$(ProjectName).pdb - Level4 - ProgramDatabase - - - $(OutDir)$(ProjectName)d.lib - $(OutDir) ; ../../lib/vc100;%(AdditionalLibraryDirectories) - - - - - /Zm179 %(AdditionalOptions) - Disabled - $(IntDir); ../../include; ../../src/libraries; ../../src/libraries/$(ProjectName);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir)$(ProjectName).pdb - Level4 - ProgramDatabase - - - $(OutDir)$(ProjectName)d.lib - $(OutDir) ; ../../lib/vc100_x64;%(AdditionalLibraryDirectories) - - - - - /Zm176 %(AdditionalOptions) - $(IntDir); ../../include; ../../src/libraries; ../../src/libraries/$(ProjectName);%(AdditionalIncludeDirectories) - WIN32; NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir)$(ProjectName).pdb - Level4 - ProgramDatabase - - - $(OutDir)$(ProjectName).lib - $(OutDir) ; ../../lib/vc100;%(AdditionalLibraryDirectories) - - - - - /Zm176 %(AdditionalOptions) - $(IntDir); ../../include; ../../src/libraries; ../../src/libraries/$(ProjectName);%(AdditionalIncludeDirectories) - WIN32; NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir)$(ProjectName).pdb - Level4 - ProgramDatabase - - - $(OutDir)$(ProjectName).lib - $(OutDir) ; ../../lib/vc100_x64;%(AdditionalLibraryDirectories) - - - - - - \ No newline at end of file diff --git a/build/vc100/turtle.vcxproj.filters b/build/vc100/turtle.vcxproj.filters deleted file mode 100644 index f3f1f04..0000000 --- a/build/vc100/turtle.vcxproj.filters +++ /dev/null @@ -1,131 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {b9cb2ff2-1351-456d-985e-cb0dd3f4e12d} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files - - - \ No newline at end of file diff --git a/build/vc100/turtle.vcxproj.user b/build/vc100/turtle.vcxproj.user deleted file mode 100644 index 695b5c7..0000000 --- a/build/vc100/turtle.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/build/vc100/turtle_bench.vcxproj b/build/vc100/turtle_bench.vcxproj deleted file mode 100644 index c6f73fd..0000000 --- a/build/vc100/turtle_bench.vcxproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - debug - Win32 - - - debug - x64 - - - release - Win32 - - - release - x64 - - - - - - - - - - - - - - - {2D607783-30B9-46DE-81E2-28513B31D5D2} - - - - Application - - - Application - - - Application - - - Application - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ../../out/applications/$(ProjectName)/vc100/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc100_x64/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc100/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc100_x64/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc100/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc100_x64/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc100/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc100_x64/$(Configuration)\ - $(ProjectName) - $(ProjectName) - $(ProjectName) - $(ProjectName) - - - - Disabled - ../..; ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Console - - - - - Disabled - ../..; ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Console - - - - - MaxSpeed - ../..; ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default - MultiThreadedDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Console - false - - - - - MaxSpeed - ../..; ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default - MultiThreadedDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Console - false - - - - - - \ No newline at end of file diff --git a/build/vc100/turtle_bench.vcxproj.filters b/build/vc100/turtle_bench.vcxproj.filters deleted file mode 100644 index 8fc23e0..0000000 --- a/build/vc100/turtle_bench.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {0ddf67a0-6350-4b1a-ad9f-0648d3985709} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/vc100/turtle_bench.vcxproj.user b/build/vc100/turtle_bench.vcxproj.user deleted file mode 100644 index 695b5c7..0000000 --- a/build/vc100/turtle_bench.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/build/vc100/turtle_test.vcxproj b/build/vc100/turtle_test.vcxproj deleted file mode 100644 index 9f1272f..0000000 --- a/build/vc100/turtle_test.vcxproj +++ /dev/null @@ -1,238 +0,0 @@ - - - - - debug - Win32 - - - debug - x64 - - - release - Win32 - - - release - x64 - - - - - - - - - - - - - - - - - - - - BOOST_AUTO_TEST_MAIN;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - BOOST_AUTO_TEST_MAIN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - - - - - - - - - {74810A2A-33D8-47D6-9A50-71261F1683F5} - turtle_test - - - - Application - - - Application - - - Application - - - Application - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ../../out/vc100/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc100_x64/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc100/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc100_x64/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc100/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc100_x64/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc100/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc100_x64/$(Configuration)/tests/$(ProjectName)\ - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - C:\dev\home\boost\stage\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - C:\dev\home\boost\stage\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - C:\dev\home\boost\stage\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64; - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - C:\dev\home\boost\stage\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64; - - - - /Zm172 %(AdditionalOptions) - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ../../lib/vc100;%(AdditionalLibraryDirectories) - true - Console - - - "$(TargetDir)$(TargetName).exe" --result_code=no --report_level=no --log_level=warning - - - - - - /Zm172 %(AdditionalOptions) - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ../../lib/vc100;%(AdditionalLibraryDirectories) - true - Console - - - "$(TargetDir)$(TargetName).exe" --result_code=no --report_level=no --log_level=warning - - - - - /Zm162 %(AdditionalOptions) - MaxSpeed - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default - MultiThreadedDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ../../lib/vc100;%(AdditionalLibraryDirectories) - true - Console - - - "$(TargetDir)$(TargetName).exe" --result_code=no --report_level=no --log_level=warning - - - - - - /Zm162 %(AdditionalOptions) - MaxSpeed - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default - MultiThreadedDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ../../lib/vc100;%(AdditionalLibraryDirectories) - true - Console - - - "$(TargetDir)$(TargetName).exe" --result_code=no --report_level=no --log_level=warning - - - - - - \ No newline at end of file diff --git a/build/vc100/turtle_test.vcxproj.filters b/build/vc100/turtle_test.vcxproj.filters deleted file mode 100644 index de84e75..0000000 --- a/build/vc100/turtle_test.vcxproj.filters +++ /dev/null @@ -1,79 +0,0 @@ - - - - - {7b7d91a4-7b1e-441a-ac3f-2f93e73ae2ac} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd - - - {214599f8-6837-4d60-96ae-b913798819ae} - - - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/vc100/turtle_test.vcxproj.user b/build/vc100/turtle_test.vcxproj.user deleted file mode 100644 index 695b5c7..0000000 --- a/build/vc100/turtle_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/build/vc140/.gitignore b/build/vc140/.gitignore deleted file mode 100644 index dd990f3..0000000 --- a/build/vc140/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.vs -*.db -*.ipch -*.opendb -*.opensdf -*.sdf -*.suo diff --git a/build/vc140/turtle.sln b/build/vc140/turtle.sln deleted file mode 100644 index 873405c..0000000 --- a/build/vc140/turtle.sln +++ /dev/null @@ -1,35 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "turtle", "turtle.vcxproj", "{831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "turtle_test", "turtle_test.vcxproj", "{74810A2A-33D8-47D6-9A50-71261F1683F5}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug|Win32 = debug|Win32 - debug|x64 = debug|x64 - release|Win32 = release|Win32 - release|x64 = release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.debug|Win32.ActiveCfg = debug|Win32 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.debug|Win32.Build.0 = debug|Win32 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.debug|x64.ActiveCfg = debug|x64 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.debug|x64.Build.0 = debug|x64 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.release|Win32.ActiveCfg = release|Win32 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.release|Win32.Build.0 = release|Win32 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.release|x64.ActiveCfg = release|x64 - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}.release|x64.Build.0 = release|x64 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|Win32.ActiveCfg = debug|Win32 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|Win32.Build.0 = debug|Win32 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|x64.ActiveCfg = debug|x64 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|x64.Build.0 = debug|x64 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.release|Win32.ActiveCfg = release|Win32 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.release|Win32.Build.0 = release|Win32 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.release|x64.ActiveCfg = release|x64 - {74810A2A-33D8-47D6-9A50-71261F1683F5}.release|x64.Build.0 = release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/vc140/turtle.vcxproj b/build/vc140/turtle.vcxproj deleted file mode 100644 index fc32e63..0000000 --- a/build/vc140/turtle.vcxproj +++ /dev/null @@ -1,196 +0,0 @@ - - - - - debug - Win32 - - - debug - x64 - - - release - Win32 - - - release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D} - - - - StaticLibrary - - - StaticLibrary - - - StaticLibrary - - - StaticLibrary - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ../../out/vc140/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc140_x64/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc140/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc140_x64/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc140/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc140_x64/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc140/$(Configuration)/libraries/$(ProjectName)\ - ../../out/vc140_x64/$(Configuration)/libraries/$(ProjectName)\ - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - - - C:\dev\home\boost;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - - - - /Zm179 %(AdditionalOptions) - Disabled - $(IntDir); ../../include; ../../src/libraries; ../../src/libraries/$(ProjectName);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir)$(ProjectName).pdb - Level4 - ProgramDatabase - - - $(OutDir)$(ProjectName)d.lib - $(OutDir) ; ../../lib/vc140;%(AdditionalLibraryDirectories) - - - - - /Zm179 %(AdditionalOptions) - Disabled - $(IntDir); ../../include; ../../src/libraries; ../../src/libraries/$(ProjectName);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir)$(ProjectName).pdb - Level4 - ProgramDatabase - - - $(OutDir)$(ProjectName)d.lib - $(OutDir) ; ../../lib/vc140_x64;%(AdditionalLibraryDirectories) - - - - - /Zm176 %(AdditionalOptions) - $(IntDir); ../../include; ../../src/libraries; ../../src/libraries/$(ProjectName);%(AdditionalIncludeDirectories) - WIN32; NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir)$(ProjectName).pdb - Level4 - ProgramDatabase - - - $(OutDir)$(ProjectName).lib - $(OutDir) ; ../../lib/vc140;%(AdditionalLibraryDirectories) - - - - - /Zm176 %(AdditionalOptions) - $(IntDir); ../../include; ../../src/libraries; ../../src/libraries/$(ProjectName);%(AdditionalIncludeDirectories) - WIN32; NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir)$(ProjectName).pdb - Level4 - ProgramDatabase - - - $(OutDir)$(ProjectName).lib - $(OutDir) ; ../../lib/vc140_x64;%(AdditionalLibraryDirectories) - - - - - - \ No newline at end of file diff --git a/build/vc140/turtle.vcxproj.filters b/build/vc140/turtle.vcxproj.filters deleted file mode 100644 index ff0b69a..0000000 --- a/build/vc140/turtle.vcxproj.filters +++ /dev/null @@ -1,131 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {b9cb2ff2-1351-456d-985e-cb0dd3f4e12d} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files - - - \ No newline at end of file diff --git a/build/vc140/turtle.vcxproj.user b/build/vc140/turtle.vcxproj.user deleted file mode 100644 index ace9a86..0000000 --- a/build/vc140/turtle.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/build/vc140/turtle_bench.vcxproj b/build/vc140/turtle_bench.vcxproj deleted file mode 100644 index af19166..0000000 --- a/build/vc140/turtle_bench.vcxproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - debug - Win32 - - - debug - x64 - - - release - Win32 - - - release - x64 - - - - - - - - - - - - - - - {2D607783-30B9-46DE-81E2-28513B31D5D2} - - - - Application - - - Application - - - Application - - - Application - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ../../out/applications/$(ProjectName)/vc140/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc140_x64/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc140/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc140_x64/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc140/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc140_x64/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc140/$(Configuration)\ - ../../out/applications/$(ProjectName)/vc140_x64/$(Configuration)\ - $(ProjectName) - $(ProjectName) - $(ProjectName) - $(ProjectName) - - - - Disabled - ../..; ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Console - - - - - Disabled - ../..; ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Console - - - - - MaxSpeed - ../..; ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default - MultiThreadedDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Console - false - - - - - MaxSpeed - ../..; ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default - MultiThreadedDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - $(OutDir);%(AdditionalLibraryDirectories) - true - Console - false - - - - - - \ No newline at end of file diff --git a/build/vc140/turtle_bench.vcxproj.filters b/build/vc140/turtle_bench.vcxproj.filters deleted file mode 100644 index 0d3e15d..0000000 --- a/build/vc140/turtle_bench.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {0ddf67a0-6350-4b1a-ad9f-0648d3985709} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/vc140/turtle_bench.vcxproj.user b/build/vc140/turtle_bench.vcxproj.user deleted file mode 100644 index ace9a86..0000000 --- a/build/vc140/turtle_bench.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/build/vc140/turtle_test.vcxproj b/build/vc140/turtle_test.vcxproj deleted file mode 100644 index 6a07ae1..0000000 --- a/build/vc140/turtle_test.vcxproj +++ /dev/null @@ -1,241 +0,0 @@ - - - - - debug - Win32 - - - debug - x64 - - - release - Win32 - - - release - x64 - - - - - - - - - - - - - - - - - - - - BOOST_AUTO_TEST_MAIN;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - BOOST_AUTO_TEST_MAIN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - - - - - - - - - {74810A2A-33D8-47D6-9A50-71261F1683F5} - turtle_test - 8.1 - - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ../../out/vc140/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc140_x64/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc140/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc140_x64/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc140/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc140_x64/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc140/$(Configuration)/tests/$(ProjectName)\ - ../../out/vc140_x64/$(Configuration)/tests/$(ProjectName)\ - - - C:\dev\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(UniversalCRT_IncludePath); - C:\dev\lib\vc140;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib - - - C:\dev\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(UniversalCRT_IncludePath); - C:\dev\lib\vc140;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib - - - C:\dev\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath); - C:\dev\lib\vc140_x64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(LibraryPath); - - - C:\dev\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath); - C:\dev\lib\vc140_x64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(LibraryPath); - - - - /Zm172 %(AdditionalOptions) - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ../../lib/vc140;%(AdditionalLibraryDirectories) - true - Console - - - "$(TargetDir)$(TargetName).exe" --result_code=no --report_level=no --log_level=warning - - - - - /Zm172 %(AdditionalOptions) - Disabled - ../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ../../lib/vc140;%(AdditionalLibraryDirectories) - true - Console - - - "$(TargetDir)$(TargetName).exe" --result_code=no --report_level=no --log_level=warning - - - - - /Zm162 %(AdditionalOptions) - MaxSpeed - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default - MultiThreadedDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ../../lib/vc140;%(AdditionalLibraryDirectories) - true - Console - - - "$(TargetDir)$(TargetName).exe" --result_code=no --report_level=no --log_level=warning - - - - - /Zm162 %(AdditionalOptions) - MaxSpeed - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Default - MultiThreadedDLL - true - - - $(ProjectName)_pch.h - $(IntDir)$(ProjectName).pch - $(IntDir) - $(IntDir) - $(IntDir)$(ProjectName).pdb - Level4 - true - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ../../lib/vc140;%(AdditionalLibraryDirectories) - true - Console - - - "$(TargetDir)$(TargetName).exe" --result_code=no --report_level=no --log_level=warning - - - - - - \ No newline at end of file diff --git a/build/vc140/turtle_test.vcxproj.filters b/build/vc140/turtle_test.vcxproj.filters deleted file mode 100644 index a37b36a..0000000 --- a/build/vc140/turtle_test.vcxproj.filters +++ /dev/null @@ -1,79 +0,0 @@ - - - - - {7b7d91a4-7b1e-441a-ac3f-2f93e73ae2ac} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd - - - {214599f8-6837-4d60-96ae-b913798819ae} - - - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files\detail - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/vc140/turtle_test.vcxproj.user b/build/vc140/turtle_test.vcxproj.user deleted file mode 100644 index ace9a86..0000000 --- a/build/vc140/turtle_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file From 074c82315c134b47c8b2425ef3caff95028e1335 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 12 Jul 2020 14:52:28 +0200 Subject: [PATCH 2/4] [CI] Require C++14 on travis --- .travis.yml | 7 +++---- test/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b151bcb..be66700 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,9 @@ branches: env: - CXX_STANDARD=c++17 BRANCH_TO_TEST=master - CXX_STANDARD=c++14 BRANCH_TO_TEST=master - - CXX_STANDARD=c++11 BRANCH_TO_TEST=master - - CXX_STANDARD=c++11 BRANCH_TO_TEST=boost-1.58.0 - - CXX_STANDARD=c++11 BRANCH_TO_TEST=boost-1.59.0 - - CXX_STANDARD=c++11 BRANCH_TO_TEST=boost-1.67.0 + - CXX_STANDARD=c++14 BRANCH_TO_TEST=boost-1.58.0 + - CXX_STANDARD=c++14 BRANCH_TO_TEST=boost-1.59.0 + - CXX_STANDARD=c++14 BRANCH_TO_TEST=boost-1.67.0 compiler: - clang diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9c79747..f36751f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,7 +14,7 @@ endif() # Enable warnings option(TURTLE_WERROR "Treat warnings as errors" ON) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - target_compile_options(TurtleTestMain INTERFACE -Wall -Wextra -pedantic -Wno-long-long) + target_compile_options(TurtleTestMain INTERFACE -Wall -Wextra -pedantic) include(CheckCXXCompilerFlag) check_cxx_compiler_flag(-Wunused-function TURTLE_CXX_UNUSED_FUNCTION) if(TURTLE_CXX_UNUSED_FUNCTION) From 56f68565c812b6b28bbf2764abb9064abb7948ba Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 12 Jul 2020 22:46:09 +0200 Subject: [PATCH 3/4] [CI] Fix B2 build files --- .travis.yml | 22 +++++++++++----------- appveyor.yml | 10 ++++++---- build/build.bat | 23 ++++++++++++----------- build/build.sh | 35 ++++++++++++++++++----------------- 4 files changed, 47 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index be66700..a903e1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,11 @@ branches: - master env: - - CXX_STANDARD=c++17 BRANCH_TO_TEST=master - - CXX_STANDARD=c++14 BRANCH_TO_TEST=master - - CXX_STANDARD=c++14 BRANCH_TO_TEST=boost-1.58.0 - - CXX_STANDARD=c++14 BRANCH_TO_TEST=boost-1.59.0 - - CXX_STANDARD=c++14 BRANCH_TO_TEST=boost-1.67.0 + - CXX_STANDARD=17 BRANCH_TO_TEST=master + - CXX_STANDARD=14 BRANCH_TO_TEST=master + - CXX_STANDARD=14 BRANCH_TO_TEST=boost-1.58.0 + - CXX_STANDARD=14 BRANCH_TO_TEST=boost-1.59.0 + - CXX_STANDARD=14 BRANCH_TO_TEST=boost-1.67.0 compiler: - clang @@ -59,21 +59,21 @@ before_install: - PROJECT_DIR=`pwd` - git --version - BOOST=$HOME/boost-local - - git clone -b $BRANCH_TO_TEST https://github.com/boostorg/boost.git $BOOST + - git clone -b $BRANCH_TO_TEST --depth 1 https://github.com/boostorg/boost.git $BOOST - cd $BOOST - - git submodule update --init --merge + - git submodule update --init --depth 1 - ./bootstrap.sh - ./b2 headers script: - - cd $PROJECT_DIR/build + - cd $PROJECT_DIR - export BOOST_ROOT=$BOOST # `--coverage` flags required to generate coverage info for Coveralls - - ./build.sh --toolset=$CC "cxxflags=-std=$CXX_STANDARD -Wno-unused-local-typedefs -Wno-unused-function -Wno-deprecated-declarations --coverage" "linkflags=--coverage" -j3 + - build/build.sh --toolset=$CC "cxxflags=-std=c++$CXX_STANDARD -Wno-unused-local-typedefs -Wno-unused-function -Wno-deprecated-declarations --coverage" "linkflags=--coverage" -j3 + # CMake build - cd $BOOST && ./b2 --with-test --with-thread --with-chrono --with-system --with-atomic --with-date_time -a -j3 # Build required libs - mkdir $PROJECT_DIR/__build && cd $PROJECT_DIR/__build - - export CXXFLAGS="-std=$CXX_STANDARD" - - cmake .. -DCMAKE_BUILD_TYPE=Debug + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-std=c++$CXX_STANDARD" - cmake --build . --config Debug -- -j3 - ctest --output-on-failure --build-config Debug diff --git a/appveyor.yml b/appveyor.yml index 7e127c0..1ca3551 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,8 @@ environment: CMAKE: true install: - - cd %APPVEYOR_BUILD_FOLDER%\doc + - mkdir %APPVEYOR_BUILD_FOLDER%\bin + - cd %APPVEYOR_BUILD_FOLDER%\bin - appveyor-retry powershell Invoke-WebRequest ftp://ftp.zlatkovic.com/libxml/iconv-1.9.2.win32.zip -OutFile iconv.zip - 7z e iconv.zip iconv.dll -r - appveyor-retry powershell Invoke-WebRequest ftp://ftp.zlatkovic.com/libxml/libxml2-2.7.8.win32.zip -OutFile libxml2.zip @@ -45,13 +46,14 @@ install: - xsltproc -V build_script: + - set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\bin - set BOOST_ROOT=C:\Libraries\boost_%BOOST% - cd %BOOST_ROOT% - call bootstrap.bat - - cd %APPVEYOR_BUILD_FOLDER%\build + - cd %APPVEYOR_BUILD_FOLDER% - if NOT "%CXX_STANDARD%"=="" set CXX_FLAGS=cxxflags=/std:c++%CXX_STANDARD% - set BUILD_ARGS=address-model=32,64 variant=debug,release - - call build.bat --toolset=%TOOLSET% %CXX_FLAGS% -j3 + - call build\build.bat --toolset=%TOOLSET% %CXX_FLAGS% -j3 for: - matrix: @@ -64,4 +66,4 @@ for: - cd __build - cmake .. -DCMAKE_BUILD_TYPE=Debug - cmake --build . --config Debug - - ctest --output-on-failure --build-config Debug \ No newline at end of file + - ctest --output-on-failure --build-config Debug diff --git a/build/build.bat b/build/build.bat index a539b91..261831c 100644 --- a/build/build.bat +++ b/build/build.bat @@ -9,21 +9,22 @@ setlocal rem error if BOOST_ROOT not set set BOOST=%BOOST_ROOT% +set PROJECT_DIR=%cd% -pushd ..\test -%BOOST%\b2.exe -q %BUILD_ARGS% %* -popd +cd %BOOST% +b2.exe %PROJECT_DIR%\test -q %BUILD_ARGS% %* if errorlevel 1 exit /b %ERRORLEVEL% -set BOOSTBOOK_DIR=..\bin\turtle\boostbook +cd %PROJECT_DIR% +set BOOSTBOOK_DIR=%PROJECT_DIR%\bin\turtle\boostbook xcopy /Y /S /Q /I %BOOST%\tools\boostbook\xsl %BOOSTBOOK_DIR%\xsl xcopy /Y /S /Q /I %BOOST%\tools\boostbook\dtd %BOOSTBOOK_DIR%\dtd -xcopy /Y /S /Q /I boostbook %BOOSTBOOK_DIR% -xcopy /Y /S /Q /I %BOOST%\doc\src\boostbook.css ..\doc\html -xcopy /Y /S /Q /I %BOOST%\doc\src\images\*.png ..\doc\html\images -xcopy /Y /S /Q /I %BOOST%\doc\src\images\callouts\*.png ..\doc\html\images\callouts +xcopy /Y /S /Q /I build\boostbook %BOOSTBOOK_DIR% +xcopy /Y /S /Q /I %BOOST%\doc\src\boostbook.css doc\html +xcopy /Y /S /Q /I %BOOST%\doc\src\images\*.png doc\html\images +xcopy /Y /S /Q /I %BOOST%\doc\src\images\callouts\*.png doc\html\images\callouts if errorlevel 1 exit /b %ERRORLEVEL% -pushd ..\doc -%BOOST%\b2.exe -q %* -popd + +cd %BOOST% +b2.exe %PROJECT_DIR%\doc -q %* if errorlevel 1 exit /b %ERRORLEVEL% diff --git a/build/build.sh b/build/build.sh index a525c9e..33aa058 100755 --- a/build/build.sh +++ b/build/build.sh @@ -8,25 +8,26 @@ copy() { for dir; do true; done - mkdir -p $dir - cp $@ + mkdir -p "$dir" + cp "$@" } -set -ex +set -eux -export BOOST=$BOOST_ROOT +export BOOST="$BOOST_ROOT" +PROJECT_DIR="$(pwd)" -cd ../test -$BOOST/b2 -q "$@" -cd ../build +cd "$BOOST" +./b2 "$PROJECT_DIR/test" -q "$@" -export BOOSTBOOK_DIR=../bin/turtle/boostbook -copy -r "$BOOST"/tools/boostbook/xsl $BOOSTBOOK_DIR -copy -r "$BOOST"/tools/boostbook/dtd $BOOSTBOOK_DIR -copy -r boostbook/* $BOOSTBOOK_DIR -copy "$BOOST"/doc/src/boostbook.css ../doc/html -copy "$BOOST"/doc/src/images/*.png ../doc/html/images -copy "$BOOST"/doc/src/images/callouts/*.png ../doc/html/images/callouts -cd ../doc -$BOOST/b2 -q "$@" -cd ../build +cd "$PROJECT_DIR" +export BOOSTBOOK_DIR="$PROJECT_DIR/bin/turtle/boostbook" +copy -r "$BOOST"/tools/boostbook/xsl "$BOOSTBOOK_DIR" +copy -r "$BOOST"/tools/boostbook/dtd "$BOOSTBOOK_DIR" +copy -r build/boostbook/* "$BOOSTBOOK_DIR" +copy "$BOOST"/doc/src/boostbook.css doc/html +copy "$BOOST"/doc/src/images/*.png doc/html/images +copy "$BOOST"/doc/src/images/callouts/*.png doc/html/images/callouts + +cd "$BOOST" +./b2 "$PROJECT_DIR/doc" -q "$@" From 626c3b8cbbd00cbdf085d6dd23df18eedaf2a888 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 14 Jul 2020 17:39:21 +0200 Subject: [PATCH 4/4] [CI] Fix coverage collection Binaries are build multiple times with different configurations. Copying them into 1 folder will collapse that to one random configuration. Hence just use lcov to gather all data --- .travis.yml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index a903e1b..2ce871f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,8 @@ addons: - xsltproc - docbook-xsl - docbook-xml + - python-yaml + - lcov before_install: - DOCBOOK_XSL_DIR=/usr/share/xml/docbook/stylesheet/docbook-xsl @@ -78,25 +80,14 @@ script: - ctest --output-on-failure --build-config Debug after_success: - - COVERALS_DIR=$PROJECT_DIR/coverals - - # Copying Coveralls data to a separate folder - - mkdir -p $COVERALS_DIR - - find $PROJECT_DIR/test/bin/ -name "*.gcda" -exec cp "{}" $COVERALS_DIR/ \; - - find $PROJECT_DIR/test/bin/ -name "*.gcno" -exec cp "{}" $COVERALS_DIR/ \; - - # Preparing Coveralls data by - # ... installing the tools - - sudo apt-get install -qq python-yaml lcov - # ... changing data format to a readable one - - lcov --directory $COVERALS_DIR --base-directory $PROJECT_DIR/test --capture --output-file $COVERALS_DIR/coverage.info - - # ... erasing /test/ /example/ folder data - - lcov --remove $COVERALS_DIR/coverage.info "/usr*" "/test/*" $IGNORE_COVERAGE "tests/*" "*/doc/examples/*" -o $COVERALS_DIR/coverage.info - # Output what was collected - - lcov --list $COVERALS_DIR/coverage.info - - # Sending data to Coveralls - cd $PROJECT_DIR + # Preparing Coveralls data by + # ... changing data format to a readable one + - lcov --directory "$PROJECT_DIR/test" --capture --output-file coverage.info + # ... erasing /test/ /doc/example/ folder data + - lcov --remove coverage.info "/usr*" $IGNORE_COVERAGE "*/test/*" "*/doc/example/*" -o coverage.info + # Output what was collected + - lcov --list coverage.info + # Sending data to Coveralls - gem install coveralls-lcov - - coveralls-lcov $COVERALS_DIR/coverage.info + - coveralls-lcov coverage.info