StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update paths to orchestrator scripts

Browse Source 
Now that orchestrator code has moved into its own project, update the
paths in multitree envesetup

Test: multitree_lunch locally
Change-Id: Ic718b9fa169c68ac161ac3448b6e46635ec2ae10
This commit is contained in:
Spandan Das
2022-09-21 00:08:34 +00:00
parent 994c4a2583
commit ca76205afd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
envsetup.sh
View File

@@ -463,7 +463,7 @@ function multitree_lunch()
# message, instead of FileNotFound. # message, instead of FileNotFound.
local T=$(multitree_gettop) local T=$(multitree_gettop)
if [ -n "$T" ]; then if [ -n "$T" ]; then
"$T/build/build/make/orchestrator/core/orchestrator.py" "$@" "$T/orchestrator/build/orchestrator/core/orchestrator.py" "$@"
else else
_multitree_lunch_error _multitree_lunch_error
return 1 return 1
@@ -471,7 +471,7 @@ function multitree_lunch()
if $(echo "$1" | grep -q '^-') ; then if $(echo "$1" | grep -q '^-') ; then
# Calls starting with a -- argument are passed directly and the function # Calls starting with a -- argument are passed directly and the function
# returns with the lunch.py exit code. # returns with the lunch.py exit code.
"${T}/build/build/make/orchestrator/core/lunch.py" "$@" "${T}/orchestrator/build/orchestrator/core/lunch.py" "$@"
code=$? code=$?
if [[ $code -eq 2 ]] ; then if [[ $code -eq 2 ]] ; then
echo 1>&2 echo 1>&2
@@ -482,7 +482,7 @@ function multitree_lunch()
fi fi
else else
# All other calls go through the --lunch variant of lunch.py # All other calls go through the --lunch variant of lunch.py
results=($(${T}/build/build/make/orchestrator/core/lunch.py --lunch "$@")) results=($(${T}/orchestrator/build/orchestrator/core/lunch.py --lunch "$@"))
code=$? code=$?
if [[ $code -eq 2 ]] ; then if [[ $code -eq 2 ]] ; then
echo 1>&2 echo 1>&2
@@ -978,7 +978,7 @@ function gettop
# TODO: Merge into gettop as part of launching multitree # TODO: Merge into gettop as part of launching multitree
function multitree_gettop function multitree_gettop
{ {
local TOPFILE=build/build/make/core/envsetup.mk local TOPFILE=orchestrator/build/make/core/envsetup.mk
if [ -n "$TOP" -a -f "$TOP/$TOPFILE" ] ; then if [ -n "$TOP" -a -f "$TOP/$TOPFILE" ] ; then
# The following circumlocution ensures we remove symlinks from TOP. # The following circumlocution ensures we remove symlinks from TOP.
(cd "$TOP"; PWD= /bin/pwd) (cd "$TOP"; PWD= /bin/pwd)
@@ -1933,7 +1933,7 @@ function multitree_build()
{ {
local T=$(multitree_gettop) local T=$(multitree_gettop)
if [ -n "$T" ]; then if [ -n "$T" ]; then
"$T/build/build/make/orchestrator/core/orchestrator.py" "$@" "$T/orchestrator/build/orchestrator/core/orchestrator.py" "$@"
else else
_multitree_lunch_error _multitree_lunch_error
return 1 return 1