Split OutdatedDynamicCrt into separate h/cpp

This commit is contained in:
Alexander Karatarakis 2017-02-01 13:54:08 -08:00
parent 0a0a17b7f9
commit 1d34facb84
7 changed files with 104 additions and 85 deletions

View File

@ -2,67 +2,11 @@
#include <unordered_map>
#include "Paragraphs.h"
#include <regex>
#include "PostBuildLint_BuildPolicies.h"
#include "opt_bool.h"
namespace vcpkg::PostBuildLint
{
struct OutdatedDynamicCrt
{
// Old CPP
static const OutdatedDynamicCrt MSVCP100_DLL;
static const OutdatedDynamicCrt MSVCP100D_DLL;
static const OutdatedDynamicCrt MSVCP110_DLL;
static const OutdatedDynamicCrt MSVCP110_WIN_DLL;
static const OutdatedDynamicCrt MSVCP120_DLL;
static const OutdatedDynamicCrt MSVCP120_CLR0400_DLL;
static const OutdatedDynamicCrt MSVCP60_DLL;
static const OutdatedDynamicCrt MSVCP_WIN_DLL;
// Old C
static const OutdatedDynamicCrt MSVCR100_DLL;
static const OutdatedDynamicCrt MSVCR100D_DLL;
static const OutdatedDynamicCrt MSVCR100_CLR0400_DLL;
static const OutdatedDynamicCrt MSVCR110_DLL;
static const OutdatedDynamicCrt MSVCR120_DLL;
static const OutdatedDynamicCrt MSVCR120_CLR0400_DLL;
static const OutdatedDynamicCrt MSVCRT_DLL;
static const OutdatedDynamicCrt MSVCRT20_DLL;
static const OutdatedDynamicCrt MSVCRT40_DLL;
static const std::vector<OutdatedDynamicCrt>& values()
{
static const std::vector<OutdatedDynamicCrt> v = {
MSVCP100_DLL, MSVCP100D_DLL,
MSVCP110_DLL,MSVCP110_WIN_DLL,
MSVCP120_DLL, MSVCP120_CLR0400_DLL,
MSVCP60_DLL,
MSVCP_WIN_DLL,
MSVCR100_DLL, MSVCR100D_DLL, MSVCR100_CLR0400_DLL,
MSVCR110_DLL,
MSVCR120_DLL, MSVCR120_CLR0400_DLL,
MSVCRT_DLL, MSVCRT20_DLL,MSVCRT40_DLL
};
return v;
}
OutdatedDynamicCrt() = delete;
std::regex crt_regex() const;
const std::string& toString() const;
private:
explicit OutdatedDynamicCrt(const std::string& dll_name, const std::string& crt_regex_as_string)
: m_dll_name(dll_name), m_crt_regex_as_string(crt_regex_as_string)
{
}
std::string m_dll_name;
std::string m_crt_regex_as_string;
};
struct BuildInfo
{
static BuildInfo create(std::unordered_map<std::string, std::string> pgh);

View File

@ -0,0 +1,59 @@
#pragma once
#include <vector>
#include <regex>
namespace vcpkg::PostBuildLint
{
struct OutdatedDynamicCrt
{
// Old CPP
static const OutdatedDynamicCrt MSVCP100_DLL;
static const OutdatedDynamicCrt MSVCP100D_DLL;
static const OutdatedDynamicCrt MSVCP110_DLL;
static const OutdatedDynamicCrt MSVCP110_WIN_DLL;
static const OutdatedDynamicCrt MSVCP120_DLL;
static const OutdatedDynamicCrt MSVCP120_CLR0400_DLL;
static const OutdatedDynamicCrt MSVCP60_DLL;
static const OutdatedDynamicCrt MSVCP_WIN_DLL;
// Old C
static const OutdatedDynamicCrt MSVCR100_DLL;
static const OutdatedDynamicCrt MSVCR100D_DLL;
static const OutdatedDynamicCrt MSVCR100_CLR0400_DLL;
static const OutdatedDynamicCrt MSVCR110_DLL;
static const OutdatedDynamicCrt MSVCR120_DLL;
static const OutdatedDynamicCrt MSVCR120_CLR0400_DLL;
static const OutdatedDynamicCrt MSVCRT_DLL;
static const OutdatedDynamicCrt MSVCRT20_DLL;
static const OutdatedDynamicCrt MSVCRT40_DLL;
static const std::vector<OutdatedDynamicCrt>& values()
{
static const std::vector<OutdatedDynamicCrt> v = {
MSVCP100_DLL, MSVCP100D_DLL,
MSVCP110_DLL,MSVCP110_WIN_DLL,
MSVCP120_DLL, MSVCP120_CLR0400_DLL,
MSVCP60_DLL,
MSVCP_WIN_DLL,
MSVCR100_DLL, MSVCR100D_DLL, MSVCR100_CLR0400_DLL,
MSVCR110_DLL,
MSVCR120_DLL, MSVCR120_CLR0400_DLL,
MSVCRT_DLL, MSVCRT20_DLL,MSVCRT40_DLL
};
return v;
}
OutdatedDynamicCrt() = delete;
std::regex crt_regex() const;
const std::string& toString() const;
private:
explicit OutdatedDynamicCrt(const std::string& dll_name, const std::string& crt_regex_as_string)
: m_dll_name(dll_name), m_crt_regex_as_string(crt_regex_as_string) { }
std::string m_dll_name;
std::string m_crt_regex_as_string;
};
}

View File

@ -6,6 +6,8 @@
#include "vcpkg_Environment.h"
#include "coff_file_reader.h"
#include "PostBuildLint_BuildInfo.h"
#include "PostBuildLint_BuildType.h"
#include "PostBuildLint_OutdatedDynamicCrt.h"
namespace vcpkg::PostBuildLint
{

View File

@ -39,33 +39,4 @@ namespace vcpkg::PostBuildLint
return BuildInfo::create(pghs[0]);
}
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP100_DLL = OutdatedDynamicCrt("msvcp100.dll", R"(msvcp100\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP100D_DLL = OutdatedDynamicCrt("msvcp100d.dll", R"(msvcp100d\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP110_DLL = OutdatedDynamicCrt("msvcp110.dll", R"(msvcp110\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP110_WIN_DLL = OutdatedDynamicCrt("msvcp110_win.dll", R"(msvcp110_win\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP120_DLL = OutdatedDynamicCrt("msvcp120.dll", R"(msvcp120\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP120_CLR0400_DLL = OutdatedDynamicCrt("msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP60_DLL = OutdatedDynamicCrt("msvcp60.dll", R"(msvcp60\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP_WIN_DLL = OutdatedDynamicCrt("msvcp60.dll", R"(msvcp60\.dll)");;
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100_DLL = OutdatedDynamicCrt("msvcr100.dll", R"(msvcr100\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100D_DLL = OutdatedDynamicCrt("msvcr100d.dll", R"(msvcr100d\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100_CLR0400_DLL = OutdatedDynamicCrt("msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR110_DLL = OutdatedDynamicCrt("msvcr110.dll", R"(msvcr110\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR120_DLL = OutdatedDynamicCrt("msvcr120.dll", R"(msvcr120\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR120_CLR0400_DLL = OutdatedDynamicCrt("msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT_DLL = OutdatedDynamicCrt("msvcrt.dll", R"(msvcrt\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT20_DLL = OutdatedDynamicCrt("msvcrt20.dll", R"(msvcrt20\.dll)");;
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT40_DLL = OutdatedDynamicCrt("msvcrt40.dll", R"(msvcrt40\.dll)");;
std::regex OutdatedDynamicCrt::crt_regex() const
{
const std::regex r(this->m_crt_regex_as_string, std::regex_constants::icase);
return r;
}
const std::string& OutdatedDynamicCrt::toString() const
{
return this->m_dll_name;
}
}

View File

@ -0,0 +1,35 @@
#include "pch.h"
#include "PostBuildLint_OutdatedDynamicCrt.h"
namespace vcpkg::PostBuildLint
{
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP100_DLL = OutdatedDynamicCrt("msvcp100.dll", R"(msvcp100\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP100D_DLL = OutdatedDynamicCrt("msvcp100d.dll", R"(msvcp100d\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP110_DLL = OutdatedDynamicCrt("msvcp110.dll", R"(msvcp110\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP110_WIN_DLL = OutdatedDynamicCrt("msvcp110_win.dll", R"(msvcp110_win\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP120_DLL = OutdatedDynamicCrt("msvcp120.dll", R"(msvcp120\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP120_CLR0400_DLL = OutdatedDynamicCrt("msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP60_DLL = OutdatedDynamicCrt("msvcp60.dll", R"(msvcp60\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP_WIN_DLL = OutdatedDynamicCrt("msvcp60.dll", R"(msvcp60\.dll)");;
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100_DLL = OutdatedDynamicCrt("msvcr100.dll", R"(msvcr100\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100D_DLL = OutdatedDynamicCrt("msvcr100d.dll", R"(msvcr100d\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100_CLR0400_DLL = OutdatedDynamicCrt("msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR110_DLL = OutdatedDynamicCrt("msvcr110.dll", R"(msvcr110\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR120_DLL = OutdatedDynamicCrt("msvcr120.dll", R"(msvcr120\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR120_CLR0400_DLL = OutdatedDynamicCrt("msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT_DLL = OutdatedDynamicCrt("msvcrt.dll", R"(msvcrt\.dll)");
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT20_DLL = OutdatedDynamicCrt("msvcrt20.dll", R"(msvcrt20\.dll)");;
const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT40_DLL = OutdatedDynamicCrt("msvcrt40.dll", R"(msvcrt40\.dll)");;
std::regex OutdatedDynamicCrt::crt_regex() const
{
const std::regex r(this->m_crt_regex_as_string, std::regex_constants::icase);
return r;
}
const std::string& OutdatedDynamicCrt::toString() const
{
return this->m_dll_name;
}
}

View File

@ -154,6 +154,7 @@
<ClInclude Include="..\include\PostBuildLint_BuildType.h" />
<ClInclude Include="..\include\PostBuildLint_ConfigurationType.h" />
<ClInclude Include="..\include\PostBuildLint_LinkageType.h" />
<ClInclude Include="..\include\PostBuildLint_OutdatedDynamicCrt.h" />
<ClInclude Include="..\include\SourceParagraph.h" />
<ClInclude Include="..\include\StatusParagraph.h" />
<ClInclude Include="..\include\StatusParagraphs.h" />
@ -213,6 +214,7 @@
<ClCompile Include="..\src\PostBuildLint.cpp" />
<ClCompile Include="..\src\PostBuildLint_ConfigurationType.cpp" />
<ClCompile Include="..\src\PostBuildLint_LinkageType.cpp" />
<ClCompile Include="..\src\PostBuildLint_OutdatedDynamicCrt.cpp" />
<ClCompile Include="..\src\PostBuiltLint_BuildType.cpp" />
<ClCompile Include="..\src\Stopwatch.cpp" />
<ClCompile Include="..\src\vcpkglib.cpp" />

View File

@ -168,6 +168,9 @@
<ClCompile Include="..\src\PostBuiltLint_BuildType.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\PostBuildLint_OutdatedDynamicCrt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\package_spec.h">
@ -290,5 +293,8 @@
<ClInclude Include="..\include\PostBuildLint_BuildType.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\PostBuildLint_OutdatedDynamicCrt.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>