Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix generation of targetsTreeBazelPath #50

Merged
merged 1 commit into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions deps/src/Vars.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ case class Vars(
projectRoot: File = new File("."),
scalaVersion: String = "",
dependencies: String = "",
destination: String = "3rdparty",
destination: String = "/3rdparty",
bazelExtName: String = "workspace.bzl",
targetsDirName: String = "jvm",
targetsFileName: String = "BUILD"
Expand All @@ -16,7 +16,9 @@ case class Vars(
def bazelExtFile: File = new File(depsFile, bazelExtName)
def depsBuildFile: File = new File(depsFile, targetsFileName)
def targetsTreeFile: File = new File(depsFile, targetsDirName)
def targetsTreeBazelPath: String = s"//$destination/$targetsDirName"
def targetsTreeBazelPath: String = destination match
case d if d.startsWith("/") => s"/$d/$targetsDirName"
case d => s"//$d/$targetsDirName"

object Vars:
private val builder = OParser.builder[Vars]
Expand Down
1 change: 0 additions & 1 deletion scala/3rdparty/workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ def jar_artifact_callback(hash):
)
native.bind(name = hash["bind"], actual = hash["actual"])


def list_dependencies():
return [
{"artifact":"com.eed3si9n:shaded-jawn-parser_3:1.3.2","url":"https://repo1.maven.org/maven2/com/eed3si9n/shaded-jawn-parser_3/1.3.2/shaded-jawn-parser_3-1.3.2.jar","name":"com_eed3si9n_shaded_jawn_parser_3","actual":"@com_eed3si9n_shaded_jawn_parser_3//jar","bind": "jar/com/eed3si9n/shaded_jawn_parser_3"},
Expand Down
Loading