From ace425da363ca731aa174bcf1975429f9e1531ab Mon Sep 17 00:00:00 2001 From: klu2 Date: Sun, 9 Jul 2006 17:33:16 +0000 Subject: [PATCH] Fix some bugs in edksetup.sh 1, WORKSPACE environment in unix-like system can be obtained automatically as edksetup.bat in window's environment. 2, XMLBEANS_HOME environment in unix-like system should be also check as edksetup.bat in windows's environment. 3, In some unix-like system like darwin's system, system environment should be export to user's environment explicitly, this behavior is different in microsoft windows's platform. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@849 6f19259b-4bc3-4df7-8a09-765794883524 --- edksetup.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/edksetup.sh b/edksetup.sh index 3dbd60fc6c..37d0b1c80f 100644 --- a/edksetup.sh +++ b/edksetup.sh @@ -11,10 +11,11 @@ # Setup the environment for unix-like systems running a bash-like shell. # This file must be "sourced" not executed. For example: ". edksetup.sh" -if [ "$WORKSPACE" == "" ] -then - echo "Please set WORKSPACE before sourcing this script." -else +export WORKSPACE=$(pwd) + +# In unix-like system, gcc is the compiler for building tools +export TOOL_CHAIN=gcc + if [ "$JAVA_HOME" == "" ] then echo "Please set JAVA_HOME before sourcing this script." @@ -22,6 +23,10 @@ else if [ "$ANT_HOME" == "" ] then echo "Please set ANT_HOME before sourcing this script." +else +if [ "$XMLBEANS_HOME" == "" ] +then + echo "Please set XMLBEANS_HOME before sourcing this script." else # These should be ok as they are. @@ -29,6 +34,10 @@ export CLASSPATH=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/fra 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 +# In some unix-like system, following export is to export system's environment to user's environment +export ANT_HOME=$ANT_HOME +export JAVA_HOME=$JAVA_HOME +export XMLBEANS_HOME=$XMLBEANS_HOME # Handle any particulars down here. case "`uname`" in -- 2.39.2