InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

provide a way to override cipd root for *nix systems.

Browse Source 
So that it allows depot tools has the ability to write the cipd pkgs
outside of the repo.

windows support will be added in a follow-up change.

Bug: 355430412
Change-Id: I7fabed7ecac8216ba3f3f639217d9e36746241f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5742434
Reviewed-by: Gregory Guterman <guterman@google.com>
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
This commit is contained in:
Yiwei Zhang
2024-07-30 15:06:06 +00:00
committed by LUCI CQ
parent 68c038603f
commit 1790a4b687
12 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bb
View File

@@ -9,6 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/bb" "$@" exec "$CIPD_ROOT/bb" "$@"

8
cipd_bin_setup.sh
View File

@@ -15,10 +15,18 @@ function cipd_bin_setup {
;; ;;
esac esac
# value in .cipd_client_root file overrides the default root.
CIPD_ROOT_OVERRIDE_FILE="${MYPATH}/.cipd_client_root"
if [ -f "${CIPD_ROOT_OVERRIDE_FILE}" ]; then
ROOT=$(<"${CIPD_ROOT_OVERRIDE_FILE}")
fi
( (
source "$MYPATH/cipd" ensure \ source "$MYPATH/cipd" ensure \
-log-level warning \ -log-level warning \
-ensure-file "$ENSURE" \ -ensure-file "$ENSURE" \
-root "$ROOT" -root "$ROOT"
) )
echo $ROOT
} }

4
dirmd
View File

@@ -9,6 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/dirmd" "$@" exec "$CIPD_ROOT/dirmd" "$@"

4
git-credential-luci
View File

@@ -9,6 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/git-credential-luci" "$@" exec "$CIPD_ROOT/git-credential-luci" "$@"

4
led
View File

@@ -9,6 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/led" "$@" exec "$CIPD_ROOT/led" "$@"

5
luci-auth
View File

@@ -9,7 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/luci-auth" "$@"
exec "$CIPD_ROOT/luci-auth" "$@"

4
lucicfg
View File

@@ -9,6 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/lucicfg" "$@" exec "$CIPD_ROOT/lucicfg" "$@"

4
mac_toolchain
View File

@@ -7,6 +7,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/mac_toolchain" "$@" exec "$CIPD_ROOT/mac_toolchain" "$@"

4
pinpoint
View File

@@ -9,6 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/pinpoint" "$@" exec "$CIPD_ROOT/pinpoint" "$@"

5
prpc
View File

@@ -9,7 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/prpc" "$@"
exec "$CIPD_ROOT/prpc" "$@"

4
rdb
View File

@@ -9,6 +9,6 @@
MYPATH=$(dirname "${BASH_SOURCE[0]}") MYPATH=$(dirname "${BASH_SOURCE[0]}")
source "$MYPATH/cipd_bin_setup.sh" source "$MYPATH/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
exec "$MYPATH/.cipd_bin/rdb" "$@" exec "$CIPD_ROOT/rdb" "$@"

4
vpython3
View File

@@ -38,7 +38,7 @@ export DEPOT_TOOLS_DIR="${DEPOT_TOOLS_DIR:-$(dirname "$0")}"
export DEPOT_TOOLS_UNAME_S="${DEPOT_TOOLS_UNAME_S:-$(uname -s | tr '[:upper:]' '[:lower:]')}" export DEPOT_TOOLS_UNAME_S="${DEPOT_TOOLS_UNAME_S:-$(uname -s | tr '[:upper:]' '[:lower:]')}"
source "${DEPOT_TOOLS_DIR}/cipd_bin_setup.sh" source "${DEPOT_TOOLS_DIR}/cipd_bin_setup.sh"
cipd_bin_setup &> /dev/null CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
# Don't pass this to the Python script as it might turn around and run commands # Don't pass this to the Python script as it might turn around and run commands
# in other depot_tools dirs. # in other depot_tools dirs.
@@ -49,6 +49,6 @@ mingw*|cygwin*)
cmd.exe //c $0.bat "$@" cmd.exe //c $0.bat "$@"
;; ;;
*) *)
exec "${base_dir}/.cipd_bin/vpython3" "$@" exec "$CIPD_ROOT/vpython3" "$@"
;; ;;
esac esac