Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca76205a authored by Spandan Das's avatar Spandan Das
Browse files

Update paths to orchestrator scripts 

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

Test: multitree_lunch locally
Change-Id: Ic718b9fa169c68ac161ac3448b6e46635ec2ae10
parent 994c4a25

envsetup.sh

+5 −5
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ function multitree_lunch() 
    # message, instead of FileNotFound.

    local T=$(multitree_gettop)

    if [ -n "$T" ]; then

      "$T/build/build/make/orchestrator/core/orchestrator.py" "$@"

      "$T/orchestrator/build/orchestrator/core/orchestrator.py" "$@"

    else

      _multitree_lunch_error

      return 1
@@ -471,7 +471,7 @@ function multitree_lunch() 
    if $(echo "$1" | grep -q '^-') ; then

        # Calls starting with a -- argument are passed directly and the function

        # returns with the lunch.py exit code.

        "${T}/build/build/make/orchestrator/core/lunch.py" "$@"

        "${T}/orchestrator/build/orchestrator/core/lunch.py" "$@"

        code=$?

        if [[ $code -eq 2 ]] ; then

          echo 1>&2
@@ -482,7 +482,7 @@ function multitree_lunch() 
        fi

    else

        # 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=$?

        if [[ $code -eq 2 ]] ; then

          echo 1>&2
@@ -978,7 +978,7 @@ function gettop 
# TODO: Merge into gettop as part of launching multitree

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

        # The following circumlocution ensures we remove symlinks from TOP.

        (cd "$TOP"; PWD= /bin/pwd)
@@ -1933,7 +1933,7 @@ function multitree_build() 
{

    local T=$(multitree_gettop)

    if [ -n "$T" ]; then

      "$T/build/build/make/orchestrator/core/orchestrator.py" "$@"

      "$T/orchestrator/build/orchestrator/core/orchestrator.py" "$@"

    else

      _multitree_lunch_error

      return 1