aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-03-03 19:09:24 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-03-03 19:09:24 -0800
commitb03b578ffc27a9f0d4d9c7a8edc8edeea487dce3 (patch)
tree66cc3c484da4d6af5672b1913dfe341774f4e0b0
parentd7fb7b7736cd7cd67cedab31772c60430fecb927 (diff)
downloadvcpkg-b03b578ffc27a9f0d4d9c7a8edc8edeea487dce3.tar.gz
vcpkg-b03b578ffc27a9f0d4d9c7a8edc8edeea487dce3.zip
Rename policy to OnlyReleaseCRT
-rw-r--r--ports/msmpi/CONTROL2
-rw-r--r--ports/msmpi/portfile.cmake2
-rw-r--r--scripts/ports.cmake4
-rw-r--r--toolsrc/include/PostBuildLint_BuildPolicies.h6
-rw-r--r--toolsrc/src/PostBuildLint.cpp2
-rw-r--r--toolsrc/src/PostBuildLint_BuildPolicies.cpp16
6 files changed, 16 insertions, 16 deletions
diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL
index 44752712a..e17fd1c00 100644
--- a/ports/msmpi/CONTROL
+++ b/ports/msmpi/CONTROL
@@ -1,3 +1,3 @@
Source: msmpi
-Version: 8.0
+Version: 8.0-1
Description: Microsoft MPI
diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake
index 7d79068d7..38c90778e 100644
--- a/ports/msmpi/portfile.cmake
+++ b/ports/msmpi/portfile.cmake
@@ -96,7 +96,7 @@ endif()
# Install debug libraries
# NOTE: since the binary distribution does not include any debug libraries we simply install the release libraries
-SET(VCPKG_POLICY_NO_DEBUG_BINARIES enabled)
+SET(VCPKG_POLICY_ONLY_RELEASE_CRT enabled)
file(INSTALL
"${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib"
"${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib"
diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index dbc547676..e83b83d88 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -82,8 +82,8 @@ if(CMD MATCHES "^BUILD$")
if (DEFINED VCPKG_POLICY_EMPTY_PACKAGE)
file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyEmptyPackage: ${VCPKG_POLICY_EMPTY_PACKAGE}\n")
endif()
- if (DEFINED VCPKG_POLICY_NO_DEBUG_BINARIES)
- file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyNoDebugBinaries: ${VCPKG_POLICY_NO_DEBUG_BINARIES}\n")
+ if (DEFINED VCPKG_POLICY_ONLY_RELEASE_CRT)
+ file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyOnlyReleaseCRT: ${VCPKG_POLICY_ONLY_RELEASE_CRT}\n")
endif()
elseif(CMD MATCHES "^CREATE$")
file(TO_NATIVE_PATH ${VCPKG_ROOT_DIR} NATIVE_VCPKG_ROOT_DIR)
diff --git a/toolsrc/include/PostBuildLint_BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h
index 42bd3d718..d815c6d27 100644
--- a/toolsrc/include/PostBuildLint_BuildPolicies.h
+++ b/toolsrc/include/PostBuildLint_BuildPolicies.h
@@ -9,7 +9,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies
NULLVALUE = 0,
EMPTY_PACKAGE,
DLLS_WITHOUT_LIBS,
- NO_DEBUG_BINARIES
+ ONLY_RELEASE_CRT
};
struct type
@@ -30,9 +30,9 @@ namespace vcpkg::PostBuildLint::BuildPolicies
static constexpr type NULLVALUE(backing_enum_t::NULLVALUE);
static constexpr type EMPTY_PACKAGE(backing_enum_t::EMPTY_PACKAGE);
static constexpr type DLLS_WITHOUT_LIBS(backing_enum_t::DLLS_WITHOUT_LIBS);
- static constexpr type NO_DEBUG_BINARIES(backing_enum_t::NO_DEBUG_BINARIES);
+ static constexpr type ONLY_RELEASE_CRT(backing_enum_t::ONLY_RELEASE_CRT);
- static constexpr std::array<type, 3> values = { EMPTY_PACKAGE, DLLS_WITHOUT_LIBS, NO_DEBUG_BINARIES };
+ static constexpr std::array<type, 3> values = { EMPTY_PACKAGE, DLLS_WITHOUT_LIBS, ONLY_RELEASE_CRT };
type parse(const std::string& s);
}
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index b0edaf805..8abf71bb3 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -684,7 +684,7 @@ namespace vcpkg::PostBuildLint
error_count += check_bin_folders_are_not_present_in_static_build(package_dir);
- if (!contains_and_enabled(build_info.policies, BuildPolicies::NO_DEBUG_BINARIES))
+ if (!contains_and_enabled(build_info.policies, BuildPolicies::ONLY_RELEASE_CRT))
{
error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::DEBUG, build_info.crt_linkage), debug_libs, dumpbin_exe);
}
diff --git a/toolsrc/src/PostBuildLint_BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
index 2e0a1713b..f070a2a42 100644
--- a/toolsrc/src/PostBuildLint_BuildPolicies.cpp
+++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
@@ -8,7 +8,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies
static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage";
static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs";
- static const std::string NAME_NO_DEBUG_BINARIES = "PolicyNoDebugBinaries";
+ static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT";
const std::string& type::toString() const
{
@@ -18,8 +18,8 @@ namespace vcpkg::PostBuildLint::BuildPolicies
return NAME_EMPTY_PACKAGE;
case DLLS_WITHOUT_LIBS:
return NAME_DLLS_WITHOUT_LIBS;
- case NO_DEBUG_BINARIES:
- return NAME_NO_DEBUG_BINARIES;
+ case ONLY_RELEASE_CRT:
+ return NAME_ONLY_RELEASE_CRT;
case NULLVALUE:
return NULLVALUE_STRING;
default:
@@ -31,7 +31,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies
{
static const std::string CMAKE_VARIABLE_EMPTY_PACKAGE = "VCPKG_POLICY_EMPTY_PACKAGE";
static const std::string CMAKE_VARIABLE_DLLS_WITHOUT_LIBS = "VCPKG_POLICY_DLLS_WITHOUT_LIBS";
- static const std::string CMAKE_VARIABLE_NO_DEBUG_BINARIES = "VCPKG_POLICY_NO_DEBUG_BINARIES";
+ static const std::string CMAKE_VARIABLE_ONLY_RELEASE_CRT = "VCPKG_POLICY_ONLY_RELEASE_CRT";
switch (this->backing_enum)
{
@@ -39,8 +39,8 @@ namespace vcpkg::PostBuildLint::BuildPolicies
return CMAKE_VARIABLE_EMPTY_PACKAGE;
case DLLS_WITHOUT_LIBS:
return CMAKE_VARIABLE_DLLS_WITHOUT_LIBS;
- case NO_DEBUG_BINARIES:
- return CMAKE_VARIABLE_NO_DEBUG_BINARIES;
+ case ONLY_RELEASE_CRT:
+ return CMAKE_VARIABLE_ONLY_RELEASE_CRT;
case NULLVALUE:
Enums::nullvalue_used(ENUM_NAME);
default:
@@ -60,9 +60,9 @@ namespace vcpkg::PostBuildLint::BuildPolicies
return BuildPolicies::DLLS_WITHOUT_LIBS;
}
- if (s == NAME_NO_DEBUG_BINARIES)
+ if (s == NAME_ONLY_RELEASE_CRT)
{
- return BuildPolicies::NO_DEBUG_BINARIES;
+ return BuildPolicies::ONLY_RELEASE_CRT;
}
return BuildPolicies::NULLVALUE;