From 73df4fa920bfdef11cd8ecb094092f103bfa4850 Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Mon, 6 May 2024 14:55:35 +0200 Subject: [PATCH] Go: fix Windows installation --- .bazelrc | 3 ++- go/create_extractor_pack.py | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.bazelrc b/.bazelrc index 36111310779..c2b4d3b7f03 100644 --- a/.bazelrc +++ b/.bazelrc @@ -15,7 +15,8 @@ build:macos --cxxopt=-std=c++20 --cpu=darwin_x86_64 build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor # this requires developer mode, but is required to have pack installer functioning -common:windows --windows_enable_symlinks --enable_runfiles +startup --windows_enable_symlinks +common --enable_runfiles common --registry=file:///%workspace%/misc/bazel/registry common --registry=https://bcr.bazel.build diff --git a/go/create_extractor_pack.py b/go/create_extractor_pack.py index 4d194ab93e4..427f0c37c36 100755 --- a/go/create_extractor_pack.py +++ b/go/create_extractor_pack.py @@ -13,10 +13,14 @@ except KeyError: from go._extractor_pack_install_script import main -if os.environ['REPO_NAME'] == 'codeql~': - workspace_dir /= 'ql' +build_dir = workspace_dir / 'go' / 'build' -dest_dir = workspace_dir / 'go' / 'build' / 'codeql-extractor-pack' +if not build_dir.exists(): + # we probably are in the internal repo + workspace_dir /= 'ql' + build_dir = workspace_dir / 'go' / 'build' + +dest_dir = build_dir / 'codeql-extractor-pack' shutil.rmtree(dest_dir, ignore_errors=True) os.environ['DESTDIR'] = str(dest_dir) main(sys.argv)