diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-02-12 22:27:42 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-02-12 22:27:42 +0000 |
| commit | 000c06d2361f435354de6d9d3496fabc6cfe5b67 (patch) | |
| tree | 6ea50a582b413ce27af0f471f34c01e5be0fb002 | |
| parent | d9fa86f90afbe64a385b2e3a8fd450b3be3163ba (diff) | |
| download | edk2-platforms-000c06d2361f435354de6d9d3496fabc6cfe5b67.tar.xz | |
edksetup.sh:
Support both BaseTools and AntTools. Do not require the user
to use BaseTools/BuildEnv for the BaseTools support.
Use this command to for help: . edksetup.sh --help
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4687 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | edksetup.sh | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/edksetup.sh b/edksetup.sh index b6bf8ff4c5..323b0f3d87 100644 --- a/edksetup.sh +++ b/edksetup.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2006 - 2007, Intel Corporation +# Copyright (c) 2006 - 2008, Intel Corporation # All rights reserved. This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -16,27 +16,44 @@ # windows style. if [ \ + -z "$1" -o \ "$1" = "-?" -o \ "$1" = "-h" -o \ "$1" = "--help" \ ] then - echo BaseTools Usage: \'. edksetup.sh NewBuild\' - echo Ant Tools Usage: \'. edksetup.sh [ForceRebuild]\' + echo BaseTools Usage: \'. edksetup.sh BaseTools\' + echo Ant Tools Usage: \'. edksetup.sh [AntBuild \| ForceRebuild]\' echo echo Please note: This script must be \'sourced\' so the environment can be changed. echo \(Either \'. edksetup.sh\' or \'source edksetup.sh\'\) return fi -if [ "$1" = NewBuild ] +if [ "$1" = BaseTools ] then - echo To utilize the new build system, run - echo " . BaseTools/BuildEnv [options]" - echo Try \'. BaseTools/BuildEnv --help\' for more information. - return + if [ -z "$WORKSPACE" ] + then + . BaseTools/BuildEnv $* + else + . $WORKSPACE/BaseTools/BuildEnv $* + fi else - . $WORKSPACE/Tools/OldBuildEnv $* + if [ "$1" = AntBuild -o "$1" = ForceRebuild ] + then + if [ -z "$WORKSPACE" ] + then + if [ "$1" = AntBuild ] + then + shift + fi + . Tools/OldBuildEnv $* + else + . $WORKSPACE/Tools/OldBuildEnv $* + fi + else + echo Please run \'. edksetup.sh --help\' for help. + fi fi |