ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Fixed Linux build

Browse Source
This commit is contained in:
Eberhard Graether
2018-10-16 14:16:21 +02:00
parent db586939e9
commit 31d2fb67e2
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/utility/utilityMaven.cpp
+8 -3
View File
@@ -14,7 +14,10 @@
namespace
{
void fetchDirectories(std::vector<FilePath>& pathList, std::shared_ptr<TextAccess> xmlAccess, const std::vector<std::string>& tags, const FilePath& toAppend = FilePath())
void fetchDirectories(
std::vector<FilePath>& pathList, std::shared_ptr<TextAccess> xmlAccess,
const std::vector<std::string>& 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<FilePath> mavenGetAllDirectoriesFromEffectivePom(const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories)
std::vector<FilePath> mavenGetAllDirectoriesFromEffectivePom(
const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories)
{
setJavaHomeVariableIfNotExists();
src/lib_java/utility/utilityMaven.h
+5 -2
View File
@@ -1,6 +1,7 @@
#ifndef UTILITY_MAVEN_H
#define UTILITY_MAVEN_H
#include <string>
#include <vector>
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<FilePath> mavenGetAllDirectoriesFromEffectivePom(const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories);
bool mavenCopyDependencies(
const FilePath& mavenPath, const FilePath& projectDirectoryPath, const FilePath& outputDirectoryPath);
std::vector<FilePath> mavenGetAllDirectoriesFromEffectivePom(
const FilePath& mavenPath, const FilePath& projectDirectoryPath, bool addTestDirectories);
}
#endif // UTILITY_MAVEN_H