[edk2-devel] [PATCH] EmulatorPkg/build.sh: Fix missing usage of -b BUILDTARGET parameter

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni at intel.com>

> -----Original Message-----
> From: Justen, Jordan L
> Sent: Saturday, July 13, 2019 3:42 PM
> To: devel at edk2.groups.io; Andrew Fish <afish at apple.com>; Ni, Ray <ray.ni at intel.com>
> Subject: Re: [PATCH] EmulatorPkg/build.sh: Fix missing usage of -b BUILDTARGET parameter
> 
> On 2019-04-10 02:07:34, Jordan Justen wrote:
> > Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
> > Cc: Andrew Fish <afish at apple.com>
> > Cc: Ray Ni <ray.ni at intel.com>
> 
> ping
> 
> > ---
> >  EmulatorPkg/build.sh | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh
> > index 89fd26baca..75561c116a 100755
> > --- a/EmulatorPkg/build.sh
> > +++ b/EmulatorPkg/build.sh
> > @@ -1,7 +1,7 @@
> >  #!/bin/bash
> >  #
> >  # Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
> > -# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
> > +# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> >  #
> >  # SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -188,7 +188,7 @@ do
> >  done
> >
> >  PLATFORMFILE=$WORKSPACE/EmulatorPkg/EmulatorPkg.dsc
> > -BUILD_DIR=$BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"
> > +BUILD_DIR="$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS"
> >  BUILD_ROOT_ARCH=$BUILD_DIR/$PROCESSOR
> >
> >  if  [[ ! -f `which build` || ! -f `which GenFv` ]];
> > @@ -218,11 +218,11 @@ if [[ "$RUN_EMULATOR" == "yes" ]]; then
> >        then
> >        # only older versions of Xcode support -ccc-host-tripe, for newer versions
> >        # it is -target
> > -        cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
> > +        cp $WORKSPACE/EmulatorPkg/Unix/lldbefi.py
> "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS/$PROCESSOR"
> >          cd $BUILD_ROOT_ARCH; /usr/bin/lldb --source $WORKSPACE/EmulatorPkg/Unix/lldbinit Host
> >          exit $?
> >        else
> > -        cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit $BUILD_OUTPUT_DIR/DEBUG_"$TARGET_TOOLS"/$PROCESSOR
> > +        cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$TARGET_TOOLS/$PROCESSOR"
> >        fi
> >        ;;
> >    esac
> > @@ -255,7 +255,7 @@ if [[ $HOST_TOOLS == $TARGET_TOOLS ]]; then
> >  else
> >    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a $PROCESSOR -b $BUILDTARGET -t $HOST_TOOLS
> -D BUILD_$ARCH_SIZE -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 modules
> >    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a $PROCESSOR -b $BUILDTARGET -t
> $TARGET_TOOLS -D BUILD_$ARCH_SIZE $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3
> > -  cp $BUILD_OUTPUT_DIR/DEBUG_"$HOST_TOOLS"/$PROCESSOR/Host $BUILD_ROOT_ARCH
> > +  cp "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$HOST_TOOLS/$PROCESSOR/Host" $BUILD_ROOT_ARCH
> >  fi
> >  exit $?
> >
> > --
> > 2.20.1
> >

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43698): https://edk2.groups.io/g/devel/message/43698
Mute This Topic: https://groups.io/mt/31017060/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-