X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.sh;h=b6bf8ff4c51ec7de954a5da7c2e172c99e947593;hp=3dbd60fc6c7c7586d3facae4cbf61262043e053a;hb=61066b8d7475929f9f453e1ebea4f72d0c020096;hpb=bf0c93fdc5ae67949715bd535c0cb57a99723c2d

diff --git a/edksetup.sh b/edksetup.sh
index 3dbd60fc6c..b6bf8ff4c5 100644
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2007, 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
@@ -9,38 +9,34 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 # Setup the environment for unix-like systems running a bash-like shell.
-# This file must be "sourced" not executed. For example: ". edksetup.sh"
+# This file must be "sourced" not merely executed. For example: ". edksetup.sh"
 
-if [ "$WORKSPACE" == "" ]
-then
-  echo "Please set WORKSPACE before sourcing this script."
-else
-if [ "$JAVA_HOME" == "" ]
+# CYGWIN users: Your path and filename related environment variables should be
+# set up in the unix style.  This script will make the necessary conversions to
+# windows style.
+
+if [ \
+     "$1" = "-?" -o \
+     "$1" = "-h" -o \
+     "$1" = "--help" \
+   ]
 then
-  echo "Please set JAVA_HOME before sourcing this script."
-else
-if [ "$ANT_HOME" == "" ]
+  echo BaseTools Usage: \'. edksetup.sh NewBuild\'
+  echo Ant Tools Usage: \'. edksetup.sh [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 ]
 then
-  echo "Please set ANT_HOME before sourcing this script."
+  echo To utilize the new build system, run
+  echo "  . BaseTools/BuildEnv [options]"
+  echo Try \'. BaseTools/BuildEnv --help\' for more information.
+  return
 else
+  . $WORKSPACE/Tools/OldBuildEnv $*
+fi
 
-# These should be ok as they are.
-export CLASSPATH=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/GenBuild.jar:$XMLBEANS_HOME/lib/resolver.jar:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/xmlpublic.jar:$XMLBEANS_HOME/lib/jsr173_1.0_api.jar:$XMLBEANS_HOME/lib/saxon8.jar:$XMLBEANS_HOME/lib/xbean_xpath.jar
-export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/Common.jar
-export FRAMEWORK_TOOLS_PATH=$WORKSPACE/Tools/bin
-export PATH=$FRAMEWORK_TOOLS_PATH:$ANT_HOME/bin:$JAVA_HOME/bin:$PATH
-
-# Handle any particulars down here.
-case "`uname`" in
-  CYGWIN*) 
-    # Convert paths to windows format.
-    export WORKSPACE=`cygpath -w $WORKSPACE`
-    export CLASSPATH=`cygpath -w -p $CLASSPATH`
-    ;;
-esac
 
-# Now we need to build the tools.
-(cd Tools; ant -noclasspath)
-fi
-fi
-fi