From 719c314f7894c1f08f0f4baa45a31d664c977df3 Mon Sep 17 00:00:00 2001
From: Leonid Shalupov <leonid.shalupov@jetbrains.com>
Date: Thu, 24 Jul 2025 23:42:08 +0200
Subject: [PATCH] bazel: fix running jpsToBazel from the community repository
 only

GitOrigin-RevId: f1077ab09a4481a49d1d9901b150d3d22d32acb1
---
 build/jpsModelToBazelCommunityOnly.cmd                 | 10 +++++++---
 platform/build-scripts/bazel/build/bazel-wrapper/bazel |  6 +++++-
 .../build-scripts/bazel/build/bazel-wrapper/bazel.bat  |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/build/jpsModelToBazelCommunityOnly.cmd b/build/jpsModelToBazelCommunityOnly.cmd
index 9001929c5c86..80dbbb6122d2 100755
--- a/build/jpsModelToBazelCommunityOnly.cmd
+++ b/build/jpsModelToBazelCommunityOnly.cmd
@@ -8,11 +8,15 @@ set -eu
 export RUN_WITHOUT_ULTIMATE_ROOT=true
 
 script_dir="$(cd "$(dirname "$0")"; pwd)"
-exec /bin/bash "$script_dir/../platform/build-scripts/bazel/jps-to-bazel.cmd" "$@"
+cd "$script_dir/../platform/build-scripts/bazel"
+exec /bin/bash "../../../bazel.cmd" run "$@" //:jps-to-bazel
 
 :CMDSCRIPT
 
 set RUN_WITHOUT_ULTIMATE_ROOT=true
 
-call "%~dp0..\platform\build-scripts\bazel\jps-to-bazel.cmd" %*
-EXIT /B %ERRORLEVEL%
+pushd "%~dp0..\platform\build-scripts\bazel"
+call "..\..\..\bazel.cmd" run //:jps-to-bazel <nul
+set _exit_code=%ERRORLEVEL%
+popd
+EXIT /B %_exit_code%
diff --git a/platform/build-scripts/bazel/build/bazel-wrapper/bazel b/platform/build-scripts/bazel/build/bazel-wrapper/bazel
index 6d5d3d1c0ac3..b8fc6b376781 100755
--- a/platform/build-scripts/bazel/build/bazel-wrapper/bazel
+++ b/platform/build-scripts/bazel/build/bazel-wrapper/bazel
@@ -5,6 +5,10 @@ set -e -u -o pipefail
 root="$(cd "$(dirname "$0")/../../../../../.."; pwd)"
 
 # Provide packages.jetbrains.team credentials for Bazel in .netrc
-"$root/build/private-packages-auth/authorizer.sh"
+# The script will be missing if run from community repository
+authorizer="$root/build/private-packages-auth/authorizer.sh"
+if [ -f "$authorizer" ]; then
+  "$authorizer"
+fi
 
 exec "$BAZEL_REAL" "$@"
diff --git a/platform/build-scripts/bazel/build/bazel-wrapper/bazel.bat b/platform/build-scripts/bazel/build/bazel-wrapper/bazel.bat
index 853c16a4c830..7c41efd4fd98 100644
--- a/platform/build-scripts/bazel/build/bazel-wrapper/bazel.bat
+++ b/platform/build-scripts/bazel/build/bazel-wrapper/bazel.bat
@@ -4,7 +4,9 @@ setlocal
 
 REM Provide packages.jetbrains.team credentials for Bazel in .netrc
 set ULTIMATE_ROOT=%~dp0%..\..\..\..\..\..
-call "%ULTIMATE_ROOT%\build\private-packages-auth\authorizer.cmd"
+set AUTHORIZER=%ULTIMATE_ROOT%\build\private-packages-auth\authorizer.cmd
+REM The script will be missing if run from community repository
+if exist "%AUTHORIZER%" call "%AUTHORIZER%"
 if errorlevel 1 exit /b %ERRORLEVEL%
 
 "%BAZEL_REAL%" %*