From 77848a3d67ca8ebb5be256fced5c1e4c65517a6c Mon Sep 17 00:00:00 2001 From: malte_langkabel Date: Tue, 16 Aug 2016 10:10:18 +0200 Subject: [PATCH] build: java indexing fixes for linux --- java_indexer/build/build.sh | 21 ++++++++---- java_indexer/src/io/coati/JavaIndexer.java | 2 +- script/update_java_indexer.sh | 0 ...APSHOT.jar => java-symbol-solver-core.jar} | Bin 164819 -> 164817 bytes ...PSHOT.jar => java-symbol-solver-logic.jar} | Bin 7028 -> 7028 bytes ...PSHOT.jar => java-symbol-solver-model.jar} | Bin 33782 -> 33782 bytes ...2.4.1-SNAPSHOT.jar => javaparser-core.jar} | Bin src/lib/JavaProject.cpp | 31 ++++++++++-------- src/test/JavaParserTestSuite.h | 8 ++--- 9 files changed, 38 insertions(+), 24 deletions(-) mode change 100644 => 100755 java_indexer/build/build.sh mode change 100644 => 100755 script/update_java_indexer.sh rename setup/jars/windows/{java-symbol-solver-core-0.2.0-SNAPSHOT.jar => java-symbol-solver-core.jar} (87%) rename setup/jars/windows/{java-symbol-solver-logic-0.2.0-SNAPSHOT.jar => java-symbol-solver-logic.jar} (83%) rename setup/jars/windows/{java-symbol-solver-model-0.2.0-SNAPSHOT.jar => java-symbol-solver-model.jar} (85%) rename setup/jars/windows/{javaparser-core-2.4.1-SNAPSHOT.jar => javaparser-core.jar} (100%) diff --git a/java_indexer/build/build.sh b/java_indexer/build/build.sh old mode 100644 new mode 100755 index 24ef7fb9..4a76f73a --- a/java_indexer/build/build.sh +++ b/java_indexer/build/build.sh @@ -30,14 +30,23 @@ cd $ROOT_DIR mkdir -p classes -LIB_DIR="./lib/" CLASSPATH="" -CLASSPATH+=$LIB_DIR"java-symbol-solver-core-0.2.0-SNAPSHOT.jar;" -CLASSPATH+=$LIB_DIR"java-symbol-solver-logic-0.2.0-SNAPSHOT.jar;" -CLASSPATH+=$LIB_DIR"java-symbol-solver-model-0.2.0-SNAPSHOT.jar;" -CLASSPATH+=$LIB_DIR"javaparser-core-2.4.1-SNAPSHOT.jar;" +if [ $PLATFORM == "Windows" ]; then + LIB_DIR="./lib/" + CLASSPATH+=$LIB_DIR"java-symbol-solver-core.jar;" + CLASSPATH+=$LIB_DIR"java-symbol-solver-logic.jar;" + CLASSPATH+=$LIB_DIR"java-symbol-solver-model.jar;" + CLASSPATH+=$LIB_DIR"javaparser-core.jar" +else + CLASSPATH+=$ROOT_DIR"/lib/java-symbol-solver-core.jar:" + CLASSPATH+=$ROOT_DIR"/lib/java-symbol-solver-logic.jar:" + CLASSPATH+=$ROOT_DIR"/lib/java-symbol-solver-model.jar:" + CLASSPATH+=$ROOT_DIR"/lib/javaparser-core.jar" +fi -javac.exe -d ./classes -classpath $CLASSPATH src/io/coati/*.java +javac -d ./classes -classpath $CLASSPATH src/io/coati/*.java + +echo $CLASSPATH mkdir -p bin diff --git a/java_indexer/src/io/coati/JavaIndexer.java b/java_indexer/src/io/coati/JavaIndexer.java index b3d5bbc2..426d3273 100644 --- a/java_indexer/src/io/coati/JavaIndexer.java +++ b/java_indexer/src/io/coati/JavaIndexer.java @@ -73,7 +73,7 @@ public class JavaIndexer } } - JavaParserFacade.clearCaches(); + JavaParserFacade.clearInstances(); // String fileName = filePath.substring(filePath.lastIndexOf("/"), filePath.lastIndexOf(".java")); diff --git a/script/update_java_indexer.sh b/script/update_java_indexer.sh old mode 100644 new mode 100755 diff --git a/setup/jars/windows/java-symbol-solver-core-0.2.0-SNAPSHOT.jar b/setup/jars/windows/java-symbol-solver-core.jar similarity index 87% rename from setup/jars/windows/java-symbol-solver-core-0.2.0-SNAPSHOT.jar rename to setup/jars/windows/java-symbol-solver-core.jar index 74462d9f6446835e623b906d3f84641a93e56451..2214b856e2725899a24e1d21913328e556793b35 100644 GIT binary patch delta 13323 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 delta 13483 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 F{{YjO+JOK7 diff --git a/setup/jars/windows/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar b/setup/jars/windows/java-symbol-solver-logic.jar similarity index 83% rename from setup/jars/windows/java-symbol-solver-logic-0.2.0-SNAPSHOT.jar rename to setup/jars/windows/java-symbol-solver-logic.jar index d00bb421abb870dc310107112bcfd432f223df1d..2a56ec5abed78e8a7a20e7e89d21d54cfaaf1668 100644 GIT binary patch delta 219 zcmexj_Qi}Zz?+$ci-CcIgJD)8kLN@_RTeO9?x_x<8GwKZL;wLZ5a*`qGc%xRS*``q za@8D6PZnUb1v54WGHzmnu-G}4GDBD!xPP!fSZf4&*ukvHHWJ1VMzMq)gt1jZ7s7ZZ iVF6(%NxDK9*^=H6#xBWB2t!>e1Hzar1reDfT>=2#Z944$ delta 219 zcmexj_Qi}Zz?+$ci-CcIgW-4B6OV~}sw`mI+*2JyGXMb-hyVg+AkIzIXJ$atvRn(I z<*GTDo-Dv<3ubH%WZc9CVX<>8WrnaeaQ|R|u+|9lu!C8XZ6u5#jA98p2xF^+E`;$+ i!UDojl5~YIvL(GCj9rqM5Qe%`281zL3L-K|xU5>jyh diff --git a/setup/jars/windows/java-symbol-solver-model-0.2.0-SNAPSHOT.jar b/setup/jars/windows/java-symbol-solver-model.jar similarity index 85% rename from setup/jars/windows/java-symbol-solver-model-0.2.0-SNAPSHOT.jar rename to setup/jars/windows/java-symbol-solver-model.jar index 72130d67ce3cd5bdb56593312458c87326cf94f0..f3fa5bbc6568b5229d66c8827d9a59e1e3b4d989 100644 GIT binary patch delta 919 zcmey?&h)LFi7&vLnT3mifrEo#W+IR0L_Sp(Fm3Ls4x$-=fC)qZ0W%Qirs^{@plMmI z1<`WV986CZV6=rW0vWx)jLq{I?=nJI4a^!$5Y`%2H%2~?6`D${37;4l7z$Y?Z0ihKwoq!KE1suHTpx(cdmEsP;w9S%`k zRh+K-02Z z3!>$!IhdX-z-S9$1TuPo8Jp)b-erWa8kjYhAgnd4Zj5{&D>Ri@6FxCAFch*(-Y8)* z`E$&do7x(viVlNYL~Ojf8Ap1iX{V)Hy66^KEnUn@`D z1$69lw#klq>Ogsw&C+~FAliBFN6GvGy8jGNy9ZeN1xDV<3o4~HTMM!t~75NZGNF`M2R3%iGbrn?CS{OsVIvk?7 zsyYM0SY0nQsm2DvcBn~)FqYS3Ll|PUP)2Jl)RrH$P`9Plr9sr3uPcTy-0Bk{jMepF q5C&^Q7KBmU0M+%N0qUfnMkwP5jA7Q43Q;`2396W<8ESHKb1?wNs)3UL diff --git a/setup/jars/windows/javaparser-core-2.4.1-SNAPSHOT.jar b/setup/jars/windows/javaparser-core.jar similarity index 100% rename from setup/jars/windows/javaparser-core-2.4.1-SNAPSHOT.jar rename to setup/jars/windows/javaparser-core.jar diff --git a/src/lib/JavaProject.cpp b/src/lib/JavaProject.cpp index f89d54b6..023ae52d 100644 --- a/src/lib/JavaProject.cpp +++ b/src/lib/JavaProject.cpp @@ -21,22 +21,27 @@ JavaProject::JavaProject(std::shared_ptr 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 ); } } diff --git a/src/test/JavaParserTestSuite.h b/src/test/JavaParserTestSuite.h index 03432750..5e6529a8 100644 --- a/src/test/JavaParserTestSuite.h +++ b/src/test/JavaParserTestSuite.h @@ -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;"); }