X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.sh;h=08e62bc87757e5e77c3d8fc1642f1312fee0d655;hp=8f7ce1bc559f48fb61751719a043f896c6a09703;hb=c80da0c44248639cc87bd10c8d0dc355f4cd3a9c;hpb=da1508dd532e99dcf1818655bf37ec0bfa1e5ca6

diff --git a/edksetup.sh b/edksetup.sh
index 8f7ce1bc55..08e62bc877 100644
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -9,7 +9,7 @@
 # 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" notcuted. For example: ". edksetup.sh"
 
 export WORKSPACE=$(pwd)
 
@@ -30,7 +30,7 @@ then
 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
@@ -46,11 +46,59 @@ case "`uname`" in
     # 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
 
-# Now we need to build the tools.
-(cd Tools; ant -noclasspath)
+if [ \
+  "$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/frameworktasks.jar" -o \
+  ! -e "$WORKSPACE/Tools/bin/FrameworkWizard.jar" -o \
+  ! -e "$WORKSPACE/Tools/bin/CompressDll.dll" -o \
+  ! -e "$WORKSPACE/Tools/bin/CreateMtFile" -o \
+  ! -e "$WORKSPACE/Tools/bin/EfiCompress" -o \
+  ! -e "$WORKSPACE/Tools/bin/EfiRom" -o \
+  ! -e "$WORKSPACE/Tools/bin/FlashMap" -o \
+  ! -e "$WORKSPACE/Tools/bin/FwImage" -o \
+  ! -e "$WORKSPACE/Tools/bin/GenAcpiTable" -o \
+  ! -e "$WORKSPACE/Tools/bin/GenCRC32Section" -o \
+  ! -e "$WORKSPACE/Tools/bin/GenCapsuleHdr" -o \
+  ! -e "$WORKSPACE/Tools/bin/GenDepex" -o \
+  ! -e "$WORKSPACE/Tools/bin/GenFfsFile" -o \
+  ! -e "$WORKSPACE/Tools/bin/GenFvImage" -o \
+  ! -e "$WORKSPACE/Tools/bin/GenSection" -o \
+  ! -e "$WORKSPACE/Tools/bin/GenTEImage" -o \
+  ! -e "$WORKSPACE/Tools/bin/MakeDeps" -o \
+  ! -e "$WORKSPACE/Tools/bin/ModifyInf" -o \
+  ! -e "$WORKSPACE/Tools/bin/PeiRebase_Ia32" -o \
+  ! -e "$WORKSPACE/Tools/bin/PeiRebase_Ipf" -o \
+  ! -e "$WORKSPACE/Tools/bin/PeiRebase_X64" -o \
+  ! -e "$WORKSPACE/Tools/bin/SecApResetVectorFixup" -o \
+  ! -e "$WORKSPACE/Tools/bin/SecFixup" -o \
+  ! -e "$WORKSPACE/Tools/bin/SetStamp" -o \
+  ! -e "$WORKSPACE/Tools/bin/SplitFile" -o \
+  ! -e "$WORKSPACE/Tools/bin/StrGather" -o \
+  ! -e "$WORKSPACE/Tools/bin/Strip" -o \
+  ! -e "$WORKSPACE/Tools/bin/VfrCompile" -o \
+  ! -e "$WORKSPACE/Tools/bin/ZeroDebugData" -o \
+  ! -e "$WORKSPACE/Tools/bin/antlr" -o \
+  ! -e "$WORKSPACE/Tools/bin/dlg" ]
+then
+  case "$1" in 
+    ForceRebuild)
+      ant -noclasspath -f $WORKSPACE/Tools/build.xml cleanall all
+      ;;
+    *)
+      ant -noclasspath -f $WORKSPACE/Tools/build.xml all
+      ;;
+  esac
+fi
 fi
 fi
 fi