git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #111975 from teto/bazel-execlog

bazel: add execlog parser

commit810d22fb35287e14125470e3b917b90488ae5ed5 authorMatthieu Coudron <teto@users.noreply.github.com> dateMon 22 Mar 2021, 10:43 (6 years ago) parent3a25004ef1045c
2 files changed+31
pkgs/development/tools/build-managers/bazel/bazel_3/default.nix+16 pkgs/development/tools/build-managers/bazel/bazel_4/default.nix+15
pkgs/development/tools/build-managers/bazel/bazel_3/default.nix+16
@@ -62,6 +62,7 @@ let
6262 srcs.rules_cc
6363 srcs.rules_java
6464 srcs.rules_proto
65+ srcs.com_google_protobuf
6566 ]);
6667
6768 distDir = runCommand "bazel-deps" {} ''
@@ -527,6 +528,13 @@ stdenv.mkDerivation rec {
527528 --output=./bazel_src/output/bazel-complete.bash \
528529 --prepend=./bazel_src/scripts/bazel-complete-header.bash \
529530 --prepend=./bazel_src/scripts/bazel-complete-template.bash
531+
532+ # need to change directory for bazel to find the workspace
533+ cd ./bazel_src
534+ # build execlog tooling
535+ export HOME=$(mktemp -d)
536+ ./output/bazel build src/tools/execlog:parser_deploy.jar
537+ cd -
530538 '';
531539
532540 installPhase = ''
@@ -537,7 +545,15 @@ stdenv.mkDerivation rec {
537545 # The binary _must_ exist with this naming if your project contains a .bazelversion
538546 # file.
539547 cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
548+
549+ mkdir $out/share
550+ cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
540551 mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
552+ cat <<EOF > $out/bin/bazel-execlog
553+ #!${runtimeShell} -e
554+ ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
555+ EOF
556+ chmod +x $out/bin/bazel-execlog
541557
542558 # shell completion files
543559 installShellCompletion --bash \
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix+15
@@ -560,6 +560,13 @@ stdenv.mkDerivation rec {
560560 ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
561561 --bazel=./bazel_src/output/bazel \
562562 --output=./bazel_src/output/bazel-complete.fish
563+
564+ # need to change directory for bazel to find the workspace
565+ cd ./bazel_src
566+ # build execlog tooling
567+ export HOME=$(mktemp -d)
568+ ./output/bazel build src/tools/execlog:parser_deploy.jar
569+ cd -
563570 '';
564571
565572 installPhase = ''
@@ -572,6 +579,14 @@ stdenv.mkDerivation rec {
572579 cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
573580 mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
574581
582+ mkdir $out/share
583+ cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
584+ cat <<EOF > $out/bin/bazel-execlog
585+ #!${runtimeShell} -e
586+ ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
587+ EOF
588+ chmod +x $out/bin/bazel-execlog
589+
575590 # shell completion files
576591 installShellCompletion --bash \
577592 --name bazel.bash \