From 31d2fb67e2b7d10d386adc0709eb9a73d858556a Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 16 Oct 2018 14:16:21 +0200 Subject: [PATCH] build: Fixed Linux build --- src/lib_java/utility/utilityMaven.cpp | 11 ++++++++--- src/lib_java/utility/utilityMaven.h | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/lib_java/utility/utilityMaven.cpp b/src/lib_java/utility/utilityMaven.cpp index 76868f8b..c26bedc7 100644 --- a/src/lib_java/utility/utilityMaven.cpp +++ b/src/lib_java/utility/utilityMaven.cpp @@ -14,7 +14,10 @@ namespace { - void fetchDirectories(std::vector& pathList, std::shared_ptr xmlAccess, const std::vector& tags, const FilePath& toAppend = FilePath()) + void fetchDirectories( + std::vector& pathList, std::shared_ptr xmlAccess, + const std::vector& tags, + const FilePath& toAppend = FilePath()) { { std::string tagString = ""; @@ -103,7 +106,8 @@ namespace utility if (outputAccess->isEmpty()) { - return L"Sourcetrail was unable to locate Maven on this machine.\nPlease make sure to provide the correct Maven Path in the preferences."; + return L"Sourcetrail was unable to locate Maven on this machine.\n" + "Please make sure to provide the correct Maven Path in the preferences."; } return getErrorMessageFromMavenOutput(outputAccess); @@ -130,7 +134,8 @@ namespace utility return !outputAccess->isEmpty(); } - std::vector mavenGetAllDirectoriesFromEffectivePom(const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories) + std::vector mavenGetAllDirectoriesFromEffectivePom( + const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories) { setJavaHomeVariableIfNotExists(); diff --git a/src/lib_java/utility/utilityMaven.h b/src/lib_java/utility/utilityMaven.h index 9965b0fb..1c7bf499 100644 --- a/src/lib_java/utility/utilityMaven.h +++ b/src/lib_java/utility/utilityMaven.h @@ -1,6 +1,7 @@ #ifndef UTILITY_MAVEN_H #define UTILITY_MAVEN_H +#include #include class FilePath; @@ -8,8 +9,10 @@ class FilePath; namespace utility { std::wstring mavenGenerateSources(const FilePath& mavenPath, const FilePath& projectDirectoryPath); - bool mavenCopyDependencies(const FilePath& mavenPath, const FilePath& projectDirectoryPath, const FilePath& outputDirectoryPath); - std::vector mavenGetAllDirectoriesFromEffectivePom(const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories); + bool mavenCopyDependencies( + const FilePath& mavenPath, const FilePath& projectDirectoryPath, const FilePath& outputDirectoryPath); + std::vector mavenGetAllDirectoriesFromEffectivePom( + const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories); } #endif // UTILITY_MAVEN_H