hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-22 23:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

KE2: Modify bazel script to include all java files

Browse Source
This commit is contained in:
Tamas Vajk
2024-09-18 09:38:49 +02:00
committed by Ian Lynagh
parent 1dc8f2594d
commit 6e3e05dc67
2 changed files with 18 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
java/kotlin-extractor2/BUILD.bazel
View File

@@ -27,45 +27,7 @@ genrule(
kt_jvm_library(
name = "ke2-kt",
srcs = [
":generated-dbscheme",
"src/main/java/com/semmle/util/unicode/UTF8Util.java",
"src/main/java/com/semmle/extractor/java/PopulateFile.java",
"src/main/java/com/semmle/util/array/ArrayUtil.java",
"src/main/java/com/semmle/util/basic/ObjectUtil.java",
"src/main/java/com/semmle/util/data/IntRef.java",
"src/main/java/com/semmle/util/data/Pair.java",
"src/main/java/com/semmle/util/data/StringUtil.java",
"src/main/java/com/semmle/util/data/Tuple1.java",
"src/main/java/com/semmle/util/data/Tuple2.java",
"src/main/java/com/semmle/util/data/TupleN.java",
"src/main/java/com/semmle/util/exception/CatastrophicError.java",
"src/main/java/com/semmle/util/exception/Exceptions.java",
"src/main/java/com/semmle/util/exception/InterruptedError.java",
"src/main/java/com/semmle/util/exception/NestedError.java",
"src/main/java/com/semmle/util/exception/ResourceError.java",
"src/main/java/com/semmle/util/exception/UserError.java",
"src/main/java/com/semmle/util/expansion/ExpansionEnvironment.java",
"src/main/java/com/semmle/util/files/FileUtil.java",
"src/main/java/com/semmle/util/files/PathMatcher.java",
"src/main/java/com/semmle/util/io/BufferedLineReader.java",
"src/main/java/com/semmle/util/io/csv/CSVParser.java",
"src/main/java/com/semmle/util/io/csv/CSVReader.java",
"src/main/java/com/semmle/util/io/csv/CSVWriter.java",
"src/main/java/com/semmle/util/io/RawStreamMuncher.java",
"src/main/java/com/semmle/util/io/StreamMuncher.java",
"src/main/java/com/semmle/util/io/StreamUtil.java",
"src/main/java/com/semmle/util/io/WholeIO.java",
"src/main/java/com/semmle/util/logging/Streams.java",
"src/main/java/com/semmle/util/process/AbstractProcessBuilder.java",
"src/main/java/com/semmle/util/process/Builder.java",
"src/main/java/com/semmle/util/process/Env.java",
"src/main/java/com/semmle/util/process/LeakPrevention.java",
"src/main/java/com/semmle/util/projectstructure/ProjectLayout.java",
"src/main/java/com/semmle/util/trap/pathtransformers/NoopTransformer.java",
"src/main/java/com/semmle/util/trap/pathtransformers/PathTransformer.java",
"src/main/java/com/semmle/util/trap/pathtransformers/ProjectLayoutTransformer.java",
] + glob(["src/main/kotlin/**/*.kt"]),
srcs = [":generated-dbscheme"] + glob(["src/main/java/**/*.java"]) + glob(["src/main/kotlin/**/*.kt"]),
javac_opts = ":javac-options",
kotlinc_opts = ":kotlinc-options",
module_name = "codeql-kotlin-extractor2",

30
java/kotlin-extractor2/src/main/java/com/semmle/extractor/java/OdasaOutput.java
View File

@@ -19,8 +19,9 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import com.github.codeql.Logger;
import static com.github.codeql.ClassNamesKt.getIrElementBinaryName;
import static com.github.codeql.ClassNamesKt.getIrClassVirtualFile;
// TODO
//import static com.github.codeql.ClassNamesKt.getIrElementBinaryName;
//import static com.github.codeql.ClassNamesKt.getIrClassVirtualFile;
import org.jetbrains.kotlin.ir.IrElement;
import org.jetbrains.kotlin.ir.declarations.IrClass;
@@ -214,16 +215,17 @@ public class OdasaOutput {
}
private String trapFilePathForDecl(IrElement sym, String signature) {
String binaryName = getIrElementBinaryName(sym);
// String binaryName = getIrElementBinaryName(sym);
// TODO: Reinstate this?
// if (getTrackClassOrigins())
// classId += "-" + StringDigestor.digest(sym.getSourceFileId());
String result = CLASSES_DIR + "/" +
binaryName.replace('.', '/') +
signature +
".members" +
".trap" + compression.getExtension();
return result;
// String result = CLASSES_DIR + "/" +
// binaryName.replace('.', '/') +
// signature +
// ".members" +
// ".trap" + compression.getExtension();
// return result;
return null;
}
/*
@@ -674,10 +676,12 @@ public class OdasaOutput {
}
private static VirtualFile getVirtualFileIfClass(IrElement e) {
if (e instanceof IrClass)
return getIrClassVirtualFile((IrClass) e);
else
return null;
// TODO:
return null;
// if (e instanceof IrClass)
// return getIrClassVirtualFile((IrClass) e);
// else
// return null;
}
private static TrapClassVersion fromSymbol(IrElement sym, Logger log) {