From 79f2b46f721b69bc182f35324f8fc195a5cf3f54 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 12月 2019 11:35:52 +0800
Subject: [PATCH] fix windows compilation, better cmake output
---
src/library/locate/EnvironmentVarLocation.cpp | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/library/locate/EnvironmentVarLocation.cpp b/src/library/locate/EnvironmentVarLocation.cpp
index c8b23dc..5615482 100644
--- a/src/library/locate/EnvironmentVarLocation.cpp
+++ b/src/library/locate/EnvironmentVarLocation.cpp
@@ -5,7 +5,7 @@
* Author: Gabriele Contini
*/
-#include <build_properties.h>
+#include <licensecc_properties.h>
#include "../base/FileUtils.hpp"
#include "../base/StringUtils.h"
@@ -15,42 +15,27 @@
namespace locate {
using namespace std;
-EnvironmentVarLocation::EnvironmentVarLocation() :
- LocatorStrategy("EnvironmentVarLocation") {
-}
+EnvironmentVarLocation::EnvironmentVarLocation() : LocatorStrategy("EnvironmentVarLocation") {}
-EnvironmentVarLocation::~EnvironmentVarLocation() {
-}
+EnvironmentVarLocation::~EnvironmentVarLocation() {}
-const vector<string> EnvironmentVarLocation::licenseLocations(
- EventRegistry &eventRegistry) const {
+const vector<string> EnvironmentVarLocation::license_locations(EventRegistry &eventRegistry) {
vector<string> licenseFileFoundWithEnvVariable;
const string varName(LICENSE_LOCATION_ENV_VAR);
if (varName.length() > 0) {
- //var name is defined in header files.
+ // var name is defined in header files.
char *env_var_value = getenv(LICENSE_LOCATION_ENV_VAR);
if (env_var_value != nullptr && env_var_value[0] != '\0') {
- const vector<string> declared_positions = license::split_string(
- string(env_var_value), ';');
- vector<string> existing_pos = license::filter_existing_files(
- declared_positions);
- if (existing_pos.size() > 0) {
- for (auto it = existing_pos.begin(); it != existing_pos.end();
- ++it) {
- licenseFileFoundWithEnvVariable.push_back(*it);
- eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO, *it);
- }
- } else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
- env_var_value);
- }
+ const vector<string> declared_positions = license::split_string(string(env_var_value), ';');
+ licenseFileFoundWithEnvVariable =
+ license::filter_existing_files(declared_positions, eventRegistry, LICENSE_LOCATION_ENV_VAR);
} else {
- eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, SVRT_WARN);
+ eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED);
}
}
return licenseFileFoundWithEnvVariable;
}
-}
-}
+} // namespace locate
+} // namespace license
--
Gitblit v1.9.1