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

build: java indexing fixes for linux

Browse Source
This commit is contained in:
malte_langkabel
2016-08-16 10:10:18 +02:00
parent ae5a6a5d46
commit 77848a3d67
9 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/JavaProject.cpp
+18 -13
View File
@@ -21,22 +21,27 @@ JavaProject::JavaProject(std::shared_ptr<JavaProjectSettings> projectSettings, S
: Project(storageAccessProxy)
, m_projectSettings(projectSettings)
{
#ifdef _WIN32
const std::string separator = ";";
#else
const std::string separator = ":";
#endif
if (!JavaEnvironmentFactory::getInstance())
{
JavaEnvironmentFactory::createInstance(
"data/java/asm-5.0.3.jar;"
"data/java/cglib-3.1.jar;"
"data/java/easymock-3.3.1.jar;"
"data/java/guava-18.0.jar;"
"data/java/hamcrest-core-1.3.jar;"
"data/java/java-indexer.jar;"
"data/java/javaparser-core-2.4.1-SNAPSHOT.jar;"
"data/java/javaslang-2.0.0-beta.jar;"
"data/java/javassist-3.19.0-GA.jar;"
"data/java/java-symbol-solver-core-0.2.0-SNAPSHOT.jar;"
"data/java/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar;"
"data/java/java-symbol-solver-model-0.2.0-SNAPSHOT.jar;"
"data/java/objenesis-2.1.jar;"
"data/java/asm-5.0.3.jar" + separator +
"data/java/cglib-3.1.jar" + separator +
"data/java/easymock-3.3.1.jar" + separator +
"data/java/guava-18.0.jar" + separator +
"data/java/hamcrest-core-1.3.jar" + separator +
"data/java/java-indexer.jar" + separator +
"data/java/javaparser-core.jar" + separator +
"data/java/javaslang-2.0.0-beta.jar" + separator +
"data/java/javassist-3.19.0-GA.jar" + separator +
"data/java/java-symbol-solver-core.jar" + separator +
"data/java/java-symbol-solver-logic.jar" + separator +
"data/java/java-symbol-solver-model.jar" + separator +
"data/java/objenesis-2.1.jar" + separator
);
}
}
src/test/JavaParserTestSuite.h
+4 -4
View File
@@ -1043,12 +1043,12 @@ private:
"../app/data/java/guava-18.0.jar;"
"../app/data/java/hamcrest-core-1.3.jar;"
"../app/data/java/java-indexer.jar;"
"../app/data/java/javaparser-core-2.4.1-SNAPSHOT.jar;"
"../app/data/java/javaparser-core.jar;"
"../app/data/java/javaslang-2.0.0-beta.jar;"
"../app/data/java/javassist-3.19.0-GA.jar;"
"../app/data/java/java-symbol-solver-core-0.2.0-SNAPSHOT.jar;"
"../app/data/java/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar;"
"../app/data/java/java-symbol-solver-model-0.2.0-SNAPSHOT.jar;"
"../app/data/java/java-symbol-solver-core.jar;"
"../app/data/java/java-symbol-solver-logic.jar;"
"../app/data/java/java-symbol-solver-model.jar;"
"../app/data/java/objenesis-2.1.jar;");
}