X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UnixPkg%2Fbuild.sh;h=2498914e1c8b9d3af9e5ba3d0e0c20896d637524;hb=f114914b39c03f6af3173ba3aae09395ed65faaa;hp=2770019a1f7b7dd9d1b2e39c153c94b5a80de0f8;hpb=7ee3b61338de1fa592227c719eca20f7813ea606;p=mirror_edk2.git

diff --git a/UnixPkg/build.sh b/UnixPkg/build.sh
index 2770019a1f..2498914e1c 100755
--- a/UnixPkg/build.sh
+++ b/UnixPkg/build.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 #
-# Copyright (c) 2008 - 2009, Apple, Inc.  All rights reserved.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
+# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#
+# 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
 # http://opensource.org/licenses/bsd-license.php
@@ -14,14 +16,20 @@ set -e
 shopt -s nocasematch
 
 
-
 #
 # Setup workspace if it is not set
 #
 if [ -z "$WORKSPACE" ]
 then
   echo Initializing workspace
-  cd ..
+  if [ ! -e `pwd`/edksetup.sh ]
+  then
+    cd ..
+  fi
+# This version is for the tools in the BaseTools project.
+# this assumes svn pulls have the same root dir
+#  export EDK_TOOLS_PATH=`pwd`/../BaseTools
+# This version is for the tools source in edk2
   export EDK_TOOLS_PATH=`pwd`/BaseTools
   echo $EDK_TOOLS_PATH
   source edksetup.sh BaseTools
@@ -33,28 +41,35 @@ fi
 # Pick a default tool type for a given OS
 #
 TARGET_TOOLS=MYTOOLS
+NETWORK_SUPPORT=
 case `uname` in
   CYGWIN*) echo Cygwin not fully supported yet. ;;
-  Darwin*) 
+  Darwin*)
       Major=$(uname -r | cut -f 1 -d '.')
       if [[ $Major == 9 ]]
       then
         echo UnixPkg requires Snow Leopard or later OS
         exit 1
-      else 
+      else
         TARGET_TOOLS=XCODE32
-      fi  
+      fi
+      NETWORK_SUPPORT="-D NETWORK_SUPPORT"
       ;;
   Linux*) TARGET_TOOLS=ELFGCC ;;
-    
+
 esac
 
 BUILD_ROOT_ARCH=$WORKSPACE/Build/Unix/DEBUG_"$TARGET_TOOLS"/IA32
 
 if  [[ ! -f `which build` || ! -f `which GenFv` ]];
 then
-  # build the tools if they don't yet exist
-  echo Building tools
+  # build the tools if they don't yet exist. Bin scheme
+  echo Building tools as they are not in the path
+  make -C $WORKSPACE/BaseTools
+elif [[ ( -f `which build` ||  -f `which GenFv` )  && ! -d  $EDK_TOOLS_PATH/Source/C/bin ]];
+then
+  # build the tools if they don't yet exist. BinWrapper scheme
+  echo Building tools no $EDK_TOOLS_PATH/Source/C/bin directory
   make -C $WORKSPACE/BaseTools
 else
   echo using prebuilt tools
@@ -65,7 +80,7 @@ for arg in "$@"
 do
   if [[ $arg == run ]]; then
     case `uname` in
-      Darwin*) 
+      Darwin*)
         #
         # On Darwin we can't use dlopen, so we have to load the real PE/COFF images.
         # This .gdbinit script sets a breakpoint that loads symbols for the PE/COFFEE
@@ -73,14 +88,26 @@ do
         #
         cp $WORKSPACE/UnixPkg/.gdbinit $WORKSPACE/Build/Unix/DEBUG_"$TARGET_TOOLS"/IA32
         ;;
-    esac 
+    esac
 
     /usr/bin/gdb $BUILD_ROOT_ARCH/SecMain -q -cd=$BUILD_ROOT_ARCH
     exit
   fi
 
   if [[ $arg == cleanall ]]; then
-    make -C $WORKSPACE/BaseTools clean  
+    make -C $WORKSPACE/BaseTools clean
+    build -p $WORKSPACE/GccShellPkg/GccShellPkg.dsc -a IA32 -t $TARGET_TOOLS -n 3 clean
+    exit $?
+  fi
+
+  if [[ $arg == clean ]]; then
+    build -p $WORKSPACE/GccShellPkg/GccShellPkg.dsc -a IA32 -t $TARGET_TOOLS -n 3 clean
+    exit $?
+  fi
+
+  if [[ $arg == shell ]]; then
+    build -p $WORKSPACE/GccShellPkg/GccShellPkg.dsc -a IA32 -t $TARGET_TOOLS -n 3 $2 $3 $4 $5 $6 $7 $8
+    exit $?
   fi
 done
 
@@ -90,7 +117,6 @@ done
 #
 echo $PATH
 echo `which build`
-build -p $WORKSPACE/EdkShellPkg/EdkShellPkg.dsc -a IA32 -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
-build -p $WORKSPACE/UnixPkg/UnixPkg.dsc         -a IA32 -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
+build -p $WORKSPACE/UnixPkg/UnixPkg.dsc         -a IA32 -t $TARGET_TOOLS $NETWORK_SUPPORT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
 exit $?