aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-29 17:17:45 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-29 17:17:45 -0800
commit74f69ade187dbe091cb00ace4d40ef9d20a3e416 (patch)
tree3ed1cea0cbedc516f7f8f523bb49473ceeb15698
parentaf120041b68f2b9221bdd3cf0047f7e20705aa5a (diff)
downloadvcpkg-74f69ade187dbe091cb00ace4d40ef9d20a3e416.tar.gz
vcpkg-74f69ade187dbe091cb00ace4d40ef9d20a3e416.zip
Introduce PostBuildLint namespace
-rw-r--r--toolsrc/include/BuildInfo.h4
-rw-r--r--toolsrc/include/post_build_lint.h4
-rw-r--r--toolsrc/src/BuildInfo.cpp4
-rw-r--r--toolsrc/src/commands_installation.cpp4
-rw-r--r--toolsrc/src/post_build_lint.cpp8
5 files changed, 12 insertions, 12 deletions
diff --git a/toolsrc/include/BuildInfo.h b/toolsrc/include/BuildInfo.h
index ccf40abbf..7c654d9c7 100644
--- a/toolsrc/include/BuildInfo.h
+++ b/toolsrc/include/BuildInfo.h
@@ -6,7 +6,7 @@
namespace fs = std::tr2::sys;
-namespace vcpkg
+namespace vcpkg { namespace PostBuildLint
{
enum class LinkageType
{
@@ -128,4 +128,4 @@ namespace vcpkg
};
BuildInfo read_build_info(const fs::path& filepath);
-}
+}}
diff --git a/toolsrc/include/post_build_lint.h b/toolsrc/include/post_build_lint.h
index bc916a7af..a5fb9149f 100644
--- a/toolsrc/include/post_build_lint.h
+++ b/toolsrc/include/post_build_lint.h
@@ -2,7 +2,7 @@
#include "package_spec.h"
#include "vcpkg_paths.h"
-namespace vcpkg
+namespace vcpkg {namespace PostBuildLint
{
void perform_all_checks(const package_spec& spec, const vcpkg_paths& paths);
-}
+}}
diff --git a/toolsrc/src/BuildInfo.cpp b/toolsrc/src/BuildInfo.cpp
index 44c7fdcf0..d96df8e8c 100644
--- a/toolsrc/src/BuildInfo.cpp
+++ b/toolsrc/src/BuildInfo.cpp
@@ -2,7 +2,7 @@
#include "vcpkg_Checks.h"
#include "vcpkglib_helpers.h"
-namespace vcpkg
+namespace vcpkg { namespace PostBuildLint
{
const ConfigurationType& BuildType::config() const
{
@@ -161,4 +161,4 @@ namespace vcpkg
{
return this->m_dll_name;
}
-}
+}}
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp
index f7af2ef7c..93335220d 100644
--- a/toolsrc/src/commands_installation.cpp
+++ b/toolsrc/src/commands_installation.cpp
@@ -59,7 +59,7 @@ namespace vcpkg
exit(EXIT_FAILURE);
}
- perform_all_checks(spec, paths);
+ PostBuildLint::perform_all_checks(spec, paths);
create_binary_control_file(paths, source_paragraph, target_triplet);
@@ -140,7 +140,7 @@ namespace vcpkg
const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_CHECKS_ONLY});
if (options.find(OPTION_CHECKS_ONLY) != options.end())
{
- perform_all_checks(spec, paths);
+ PostBuildLint::perform_all_checks(spec, paths);
exit(EXIT_SUCCESS);
}
diff --git a/toolsrc/src/post_build_lint.cpp b/toolsrc/src/post_build_lint.cpp
index b93844f03..3ef906353 100644
--- a/toolsrc/src/post_build_lint.cpp
+++ b/toolsrc/src/post_build_lint.cpp
@@ -10,7 +10,7 @@
namespace fs = std::tr2::sys;
-namespace vcpkg
+namespace vcpkg { namespace PostBuildLint
{
enum class lint_status
{
@@ -668,8 +668,8 @@ namespace vcpkg
Checks::unreachable();
}
#if 0
- error_count += check_no_subdirectories(package_dir / "lib");
- error_count += check_no_subdirectories(package_dir / "debug" / "lib");
+ error_count += check_no_subdirectories(package_dir / "lib");
+ error_count += check_no_subdirectories(package_dir / "debug" / "lib");
#endif
error_count += check_no_empty_folders(package_dir);
@@ -684,4 +684,4 @@ namespace vcpkg
System::println("-- Performing post-build validation done");
}
-}
+}}