Added target Wizard which just relies on the SurfaceArea. Also fixed the echo messages.

[mirror_edk2.git] / edksetup.sh

diff --git a/edksetup.sh b/edksetup.sh
index e5a7552a553a5704db82755b2886479c629f57a6..08e62bc87757e5e77c3d8fc1642f1312fee0d655 100644 (file)
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -30,7 +30,7 @@ then
 else
 
 # These should be ok as they are.
 else
 
 # 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=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/PcdTools.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 CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Bin/FrameworkWizard.jar
 export FRAMEWORK_TOOLS_PATH=$WORKSPACE/Tools/bin
 export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/Common.jar
 export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Bin/FrameworkWizard.jar
 export FRAMEWORK_TOOLS_PATH=$WORKSPACE/Tools/bin


@@ -46,6 +46,7 @@ case "`uname`" in
     # Convert paths to windows format.
     export WORKSPACE=`cygpath -w $WORKSPACE`
     export CLASSPATH=`cygpath -w -p $CLASSPATH`
     # Convert paths to windows format.
     export WORKSPACE=`cygpath -w $WORKSPACE`
     export CLASSPATH=`cygpath -w -p $CLASSPATH`

+    export FRAMEWORK_TOOLS_PATH=`cygpath -w -p $FRAMEWORK_TOOLS_PATH`

     ;;
 esac
 
     ;;
 esac
 


@@ -53,6 +54,7 @@ if [ \
   "$1" = Rebuild -o \
   "$1" = ForceRebuild -o \
   ! -e "$WORKSPACE/Tools/Jars/Common.jar" -o \
   "$1" = Rebuild -o \
   "$1" = ForceRebuild -o \
   ! -e "$WORKSPACE/Tools/Jars/Common.jar" -o \

+  ! -e "$WORKSPACE/Tools/Jars/PcdTools.jar" -o \

   ! -e "$WORKSPACE/Tools/Jars/GenBuild.jar" -o \
   ! -e "$WORKSPACE/Tools/Jars/SurfaceArea.jar" -o \
   ! -e "$WORKSPACE/Tools/Jars/cpptasks.jar" -o \
   ! -e "$WORKSPACE/Tools/Jars/GenBuild.jar" -o \
   ! -e "$WORKSPACE/Tools/Jars/SurfaceArea.jar" -o \
   ! -e "$WORKSPACE/Tools/Jars/cpptasks.jar" -o \