Skip to content

Commit

Permalink
Kotlin: address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
redsun82 committed Jun 4, 2024
1 parent d1a2c0f commit 99f70a6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions java/kotlin-extractor/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
# Usage overview
Building the extractor can be done via
```
bazel build //java/kotlin-extractor:codeql-extractor-kotlin-<variant>-<version>
bazel build @codeql//java/kotlin-extractor:codeql-extractor-kotlin-<variant>-<version>
```
where `<variant>` is either `standalone` or `embeddable`, and `<version>` is one of the supported versions.
```
bazel build //java/kotlin-extractor
bazel build @codeql//java/kotlin-extractor
```
will build a default variant:
* standalone, unless `CODEQL_KOTLIN_SINGLE_VERSION_EMBEDDABLE` is set to true, in which case it will go for embeddable
Expand All @@ -19,6 +18,8 @@ If `kotlinc` is updated, bazel won't be aware of it and will therefore keep the
* `bazel clean`
* `bazel fetch --force @codeql_kotlin_defaults\\:all`
* `CODEQL_KOTLIN_SINGLE_VERSION= bazel build //java/kotlin-extractor`
If building from the `codeql` repository, `@codeql` can be skipped.
"""

# This file is used in the `@codeql_kotlin_embeddable` external repo, which means we need to
Expand Down
4 changes: 2 additions & 2 deletions java/kotlin-extractor/deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ def _walk(dir):
next_dirs.extend([c for c in children if c.is_dir])
res.extend([c for c in children if not c.is_dir])
if not next_dirs:
break
return res
return res
fail("%s directory too deep" % dir)

def _embeddable_source_impl(repository_ctx):
src_dir = repository_ctx.path(Label("//java/kotlin-extractor:src"))
Expand Down

0 comments on commit 99f70a6

Please sign in to comment.