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

src: specify if file or directory path is returned by helpers (#1146)

Browse Source
This commit is contained in:
Malte Langkabel
2021-02-22 21:55:30 +01:00
committed by GitHub
parent 6ab808852c
commit 4b922ed103
69 changed files with 259 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/utility/utilityGradle.cpp
+2 -2
View File
@@ -17,7 +17,7 @@ namespace utility
bool gradleCopyDependencies(
const FilePath& projectDirectoryPath, const FilePath& outputDirectoryPath, bool addTestDependencies)
{
const FilePath gradleInitScriptPath = ResourcePaths::getJavaPath().concatenate(
const FilePath gradleInitScriptPath = ResourcePaths::getJavaDirectoryPath().concatenate(
L"gradle/init.gradle");
utility::setJavaHomeVariableIfNotExists();
@@ -48,7 +48,7 @@ bool gradleCopyDependencies(
std::vector<FilePath> gradleGetAllSourceDirectories(
const FilePath& projectDirectoryPath, bool addTestDirectories)
{
const FilePath gradleInitScriptPath = ResourcePaths::getJavaPath().concatenate(
const FilePath gradleInitScriptPath = ResourcePaths::getJavaDirectoryPath().concatenate(
L"gradle/init.gradle");
utility::setJavaHomeVariableIfNotExists();
src/lib_java/utility/utilityJava.cpp
+2 -1
View File
@@ -59,7 +59,8 @@ std::string prepareJavaEnvironment()
{
classPath += separator;
}
classPath += ResourcePaths::getJavaPath().concatenate(L"lib/" + jarNames[i]).str();
classPath +=
ResourcePaths::getJavaDirectoryPath().concatenate(L"lib/" + jarNames[i]).str();
}
}