Removed newbuild option from edksetup.bat command-line, this is now the default.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4747 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 525 insertions, 236 deletions

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index f2a3558301..2f657ba967 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -1,132 +1,361 @@
+@REM @file

+@REM   This stand-alone program is typically called by the edksetup.bat file, 

+@REM   however it may be executed directly from the BaseTools project folder

+@REM   if the file is not executed within a WORKSPACE\BaseTools folder.

 @REM

-@REM Copyright (c) 2006, Intel Corporation

-@REM All rights reserved. This program and the accompanying materials

-@REM are licensed and made available under the terms and conditions of the BSD License

-@REM which accompanies this distribution.  The full text of the license may be found at

-@REM http://opensource.org/licenses/bsd-license.php

+@REM Copyright (c) 2006 - 2008, Intel Corporation.  All rights reserved.

+@REM

+@REM This program and the accompanying materials are licensed and made available

+@REM under the terms and conditions of the BSD Licensewhich accompanies this 

+@REM distribution.  The full text of the license may be found at:

+@REM   http://opensource.org/licenses/bsd-license.php

 @REM

 @REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR 

+@REM IMPLIED.

 @REM

 

 @echo off

+pushd .

 

-REM ##############################################################

-REM # You should not have to modify anything below this line

-REM #

+@REM ##############################################################

+@REM # You should not have to modify anything below this line

+@REM #

 

-if /I "%1"=="-h" goto usage

-if /I "%1"=="-help" goto usage

-if /I "%1"=="--help" goto usage

-if /I "%1"=="/h" goto usage

-if /I "%1"=="/?" goto usage

-if /I "%1"=="/help" goto usage

+@if /I "%1"=="-h" goto Usage

+@if /I "%1"=="-help" goto Usage

+@if /I "%1"=="--help" goto Usage

+@if /I "%1"=="/h" goto Usage

+@if /I "%1"=="/help" goto Usage

+@if /I "%1"=="/?" goto Usage

 

-if /I "%1"=="Reconfig" (

-  if NOT "%2"=="" set EDK_TOOLS_PATH=%2

-) else (

-  if NOT "%1"=="" set EDK_TOOLS_PATH=%1

-)

 

-REM

-REM Check the required system environment variables

-REM

+:loop

+  @if "%1"=="" goto setup_workspace

+  @if /I "%1"=="--nt32" (

+    @REM Ignore --nt32 flag

+    shift

+    goto loop

+  )

+  @if /I "%1"=="Reconfig" (

+    shift

+    set RECONFIG=TRUE

+    goto loop

+  )

+  @if /I "%1"=="Rebuild" (

+    shift

+    set REBUILD=TRUE

+    goto loop

+  )

+  @if /I "%1"=="ForceRebuild" (

+    shift

+    set FORCE_REBUILD=TRUE

+    goto loop

+  )

+  if "%1"=="" goto setup_workspace

+  if exist %1 (

+    if not defined BASE_TOOLS_PATH (

+      if exist %1\Source set BASE_TOOLS_PATH=%1

+      shift

+      goto loop

+    )

+    if not defined EDK_TOOLS_PATH (

+      if exist %1\Bin\Win32 set EDK_TOOLS_PATH=%1

+      shift

+      goto loop

+    )

+    echo.

+    echo !!! ERROR !!! Unknown argument, %1 !!!

+    echo.

+    goto end

+  ) else (

+    echo.

+    echo !!! ERROR !!! Unknown argument, %1 !!!

+    echo.

+    goto end

+  )

+  goto loop

+

+

+@REM

+@REM Check the required system environment variables

+@REM

 

 :setup_workspace

-REM

-REM check the EDK_TOOLS_PATH

-REM

-if not defined EDK_TOOLS_PATH goto no_tools_path

-if exist %EDK_TOOLS_PATH% goto set_path

-echo.

-echo !!!WARNING!!! %EDK_TOOLS_PATH% doesn't exist. %WORKSPACE%\BaseTools will be used !!!

-echo.

+  REM

+  REM check the EDK_TOOLS_PATH

+  REM

+  if not defined EDK_TOOLS_PATH goto no_EDK_TOOLS_PATH

+  if exist %EDK_TOOLS_PATH% goto set_PATH

 

-:no_tools_path

-if exist %WORKSPACE%\BaseTools (

-  set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools

-) else (

-  echo.

-  echo !!!WARNING!!! No tools path found. Please set EDK_TOOLS_PATH !!!

-  echo.

-  goto end

-)

+:no_EDK_TOOLS_PATH

+  if not defined WORKSPACE (

+    if defined BASE_TOOLS_PATH (

+      set EDK_TOOLS_PATH=%BASE_TOOLS_PATH%

+      goto set_PATH

+    ) else (

+      echo.

+      echo !!! ERROR !!! Neither BASE_TOOLS_PATH nor EDK_TOOLS_PATH are set. !!!

+      echo.

+      goto end

+    )

+  ) else (

+    if exist %WORKSPACE%\BaseTools\Bin (

+      set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools

+      goto set_PATH

+    ) else (

+      echo.

+      echo !!! ERROR !!! No tools path available. Please set EDK_TOOLS_PATH !!!

+      echo.

+      goto end

+    )

+  )

 

-:set_path

-if defined WORKSPACE_TOOLS_PATH goto check_path

-set PATH=%EDK_TOOLS_PATH%\Bin;%EDK_TOOLS_PATH%\Bin\Win32;%PATH%

-set WORKSPACE_TOOLS_PATH=%EDK_TOOLS_PATH%

-goto path_ok

+:set_PATH

+  if defined WORKSPACE_TOOLS_PATH goto check_PATH

+  set PATH=%EDK_TOOLS_PATH%\Bin;%EDK_TOOLS_PATH%\Bin\Win32;%PATH%

+  set WORKSPACE_TOOLS_PATH=%EDK_TOOLS_PATH%

+  goto PATH_ok

 

-:check_path

-if "%EDK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok

-set PATH=%EDK_TOOLS_PATH%\Bin;%EDK_TOOLS_PATH%\Bin\Win32;%PATH%

-set WORKSPACE_TOOLS_PATH=%EDK_TOOLS_PATH%

-echo Resetting the PATH variable to include the EDK_TOOLS_PATH for this WORKSPACE

+:check_PATH

+  if "%EDK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto PATH_ok

+  set PATH=%EDK_TOOLS_PATH%\Bin;%EDK_TOOLS_PATH%\Bin\Win32;%PATH%

+  set WORKSPACE_TOOLS_PATH=%EDK_TOOLS_PATH%

+  echo Resetting the PATH variable to include the EDK_TOOLS_PATH for this session.

 

-:path_ok

-echo           PATH = %PATH%

-echo.

-echo      WORKSPACE = %WORKSPACE%

-echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH%

-echo.

+:PATH_ok

+  echo           PATH      = %PATH%

+  echo.

+  if defined WORKSPACE (

+    echo      WORKSPACE      = %WORKSPACE%

+  )

+  echo EDK_TOOLS_PATH      = %EDK_TOOLS_PATH%

+  if defined BASE_TOOLS_PATH (

+    echo BASE_TOOLS_PATH     = %EDK_TOOLS_PATH%

+  )

+  echo.

 

 REM

 REM copy *.template to %WORKSPACE%\Conf

 REM

+if not defined WORKSPACE (

+   if defined RECONFIG (

+     echo.

+     echo !!! WARNING !!! WORKSPACE environment variable was not set, cannot Reconfig !!!

+     echo.

+   )

+   goto skip_reconfig

+)

+

 if NOT exist %WORKSPACE%\Conf (

   mkdir %WORKSPACE%\Conf

 ) else (

-  if /I "%1"=="Reconfig" (

+  if defined RECONFIG (

     echo.

     echo  Over-writing the files in the WORKSPACE\Conf directory

     echo  using the default template files

     echo.

   )

 )

+

 if NOT exist %WORKSPACE%\Conf\FrameworkDatabase.db (

   echo copying ... FrameworkDatabase.template to %WORKSPACE%\Conf\FrameworkDatabase.db

   copy %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %WORKSPACE%\Conf\FrameworkDatabase.db > nul

 ) else (

-  if /I "%1"=="Reconfig" copy /Y %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %WORKSPACE%\Conf\FrameworkDatabase.db > nul

+  if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %WORKSPACE%\Conf\FrameworkDatabase.db > nul

 )

+

 if NOT exist %WORKSPACE%\Conf\target.txt (

   echo copying ... target.template to %WORKSPACE%\Conf\target.txt

   copy %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul

 ) else (

-  if /I "%1"=="Reconfig" copy /Y %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul

+  if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul

 )

+

 if NOT exist %WORKSPACE%\Conf\tools_def.txt (

   echo copying ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt

   copy %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul

 ) else (

-  if /I "%1"=="Reconfig" copy /Y %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul

+  if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul

 )

+

 if NOT exist %WORKSPACE%\Conf\build_rule.txt (

   echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt

   copy %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul

 ) else (

-  if /I "%1"=="Reconfig" copy /Y %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul

+  if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul

 )

 

-REM

-REM copy XMLSchema to %EDK_TOOLS_PATH%\Conf\XMLSchema

-REM

-REM echo copying ... XMLSchema to %EDK_TOOLS_PATH%\Conf\XMLSchema

-REM xcopy %WORKSPACE%\Conf\XMLSchema %EDK_TOOLS_PATH%\Conf\XMLSchema /S /I /D /F /Q > nul

+:skip_reconfig

+

+@REM

+@REM Test if we are going to have to do a build

+@REM

+if defined FORCE_REBUILD goto check_build_environment

+if defined REBUILD goto check_build_environment

+if not exist "%EDK_TOOLS_PATH%\Bin" goto check_build_environment

+

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\BootSectImage.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\build.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\EfiLdrImage.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\EfiRom.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\GenBootSector.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\GenFds.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\GenFfs.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\GenFv.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\GenFw.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\GenPage.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\GenSec.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\GenVtf.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\MigrationMsa2Inf.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\Split.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\TargetTool.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\TianoCompress.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\Trim.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\VfrCompile.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\Fpd2Dsc.exe" goto check_build_environment

+IF NOT EXIST "%EDK_TOOLS_PATH%\Bin\Win32\VolInfo.exe" goto check_build_environment

 

-REM

-REM Done!!!

-REM

 goto end

 

-:usage

-echo.

-echo  "Usage: %0 [/? | /h | /help | -h | -help | --help] [Reconfig] [tools_path]"

-echo.

-echo                      tools_path       Tools' path. EDK_TOOLS_PATH will be set to this path.

+:check_build_environment

+

+  if not defined FORCE_REBUILD (

+    echo.

+    echo Rebuilding of tools is not required.  Binaries of the latest,

+    echo tested versions of the tools have been tested and included in the

+    echo EDK II repository.

+    echo.

+    echo If you really want to build the tools, use the FORCE_REBUILD option.

+    echo.

+    goto end

+  )

+

+  if not defined BASE_TOOLS_PATH (

+     if not exist "Source\C\Makefile" (

+       if not exist "%EDK_TOOLS_PATH%\Source\C\Makefile" goto no_source_files

+       set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%

+     ) else (

+       set BASE_TOOLS_PATH=%CD%

+     )

+  )

+  set PATH=%BASE_TOOLS_PATH%\Bin\Win32;%PATH%

+

+  set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python

+

+  if not defined PYTHON_HOME (

+    if defined PYTHONHOME (

+      set PYTHON_HOME=%PYTHONHOME%

+    ) else (

+      echo.

+      echo  !!! ERROR !!! PYTHON is required to build or execute the tools !!!

+      echo.

+      goto end

+    )

+  )

+

+  @REM We have Python, now test for FreezePython application

+  if not defined PYTHON_FREEZER_PATH (

+    @REM see if we can find FreezePython.ex

+    if exist "%PYTHON_HOME%\Tools\cx_Freeze-3.0.3\FreezePython.exe" (

+      set PYTHON_FREEZER_PATH=%PYTHON_HOME%\Tools\cx_Freeze-3.0.3

+    ) 

+    if exist "%PYTHON_HOME%\Tools\cx_Freeze\FreezePython.exe" (

+      set PYTHON_FREEZER_PATH=%PYTHON_HOME%\Tools\cx_Freeze

+    ) 

+    if exist "C:\cx_Freeze\FreezePython.exe" (

+        set PYTHON_FREEZER_PATH=C:\cx_Freeze

+    )

+    if exist "C:\cx_Freeze-3.0.3" (

+        set PYTHON_FREEZER_PATH=C:\cx_Freeze-3.0.3

+    )

+    if not defined PYTHON_FREEZER_PATH (

+      echo.

+      echo !!! WARNING !!! Will not be able to compile Python programs to .exe

+      echo Will setup environment to run Python scripts directly.

+      echo.

+      set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python

+      set PATH=%PYTHONPATH%\build;%PYTHONPATH%\GenFds;%PYTHONPATH%\Trim;%PATH%

+      set PATHEXT=%PATHEXT%;.py

+    )

+  )

+  

+  echo BASE_TOOLS_PATH     = %BASE_TOOLS_PATH%

+  echo     PYTHON_PATH     = %PYTHON_PATH%

+  echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%

+  echo.

+

+  if defined VCINSTALLDIR goto VisualStudioAvailable

+  if defined VS71COMNTOOLS (

+    call "%VS71COMNTOOLS%\vsvars32.bat"

+  ) else (

+    if defined VS80COMNTOOLS (

+      call "%VS80COMNTOOLS%\vsvars32.bat"

+    ) else (

+      echo.

+      echo !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!

+      echo.

+      goto end

+    )

+  )

+

+:VisualStudioAvailable

+  if defined FORCE_REBUILD goto CleanAndBuild

+  goto IncrementalBuild

+

+:CleanAndBuild

+  pushd .

+  cd %BASE_TOOLS_PATH%

+  call nmake cleanall

+  del /f /q %BASE_TOOLS_PATH%\Bin\Win32\*.*

+  popd

+  @REM Let CleanAndBuild fall through to IncrementalBuild

+

+

+:IncrementalBuild

+  pushd .

+  cd %BASE_TOOLS_PATH%

+  call nmake c

+  popd

+

+  if defined PYTHON_FREEZER_PATH (

+    echo BUILDING PYTHON TOOLS

+    pushd .

+    cd %BASE_TOOLS_PATH%

+    call nmake python

+    popd

+  ) else (

+    echo.

+    echo !!! WARNING !!! Cannot make executable from Python code, executing python scripts instead !!!

+    echo.

+  )

+  goto end

+

+

+:no_source_files

+  echo.

+  echo !!! ERROR !!! Cannot build BaseTools applications - no source directory located !!!

+  echo.

+  goto end

+

+:Usage

+  echo.

+  echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]]"

+  echo.

+  echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path. 

+  echo         edk_tools_path    EDK_TOOLS_PATH will be set to this path.

+  echo         Rebuild           If sources are available perform an Incremental build, only 

+  echo                           build those updated tools.

+  echo         ForceRebuild      If sources are available, rebuild all tools regardless of 

+  echo                           whether they have been updated or not.

+  echo         Reconfig          Reinstall target.txt, tools_def.txt and build_rule.txt.

 echo.

 

 :end

+set REBUILD=

+set FORCE_REBUILD=

+set RECONFIG=

+popd

+

 @echo on

 

diff --git a/BuildNotes2.txt b/BuildNotes2.txt
index ffec64462d..fe02cdc202 100644
--- a/BuildNotes2.txt
+++ b/BuildNotes2.txt
@@ -32,8 +32,12 @@ In a command window, change to the top-level directory of the EDK II source.
 

 First, set up your workspace. If you have had a setup, please make sure that

 you don't have newer *.template in WORKSPACE\BaseTools\Conf. Otherwise remove

-*.txt files in WORKSPACE\Conf in advance.

-    c:\MyWork\edk2\> edksetup newbuild

+*.txt files in WORKSPACE\Conf in advance.  For the reference build of the Nt32

+Platform emulation environment, use the --nt32 option for edksetup.  Building

+other platforms or modules do not require this option, as Visual Studio standard

+includes, libraries and/or dlls are not required for normal development.

+

+    c:\MyWork\edk2\> edksetup --nt32

 

 Second, go to the module directory (For example, MdeModulePkg\Application\HelloWorld),

 and then begin to build

@@ -99,7 +103,7 @@ have the Python interpreter (version 2.5) installed. The source of Python code i
 		AutoGen/AutoGen.py  - Generate AutoGen.c/.h and makefile only

 

 	"build.py" steps:

-		1. Run "edksetup.bat newbuild"

+		1. Run "edksetup.bat"

         2. set PYTHONPATH to the local directory of above source (BaseTools/Source/Python)

 		3. Set ACTIVE_PLATFORM in WORKSPACE\Conf

 		4. Go to platform or module directory

@@ -107,7 +111,7 @@ have the Python interpreter (version 2.5) installed. The source of Python code i
 		   directly.

 

 	"AutoGen.py" steps:

-		1. Run "edksetup.bat newbuild"

+		1. Run "edksetup.bat"

         2. set PYTHONPATH to the local directory of above source (BaseTools/Source/Python)

 		3. Set ACTIVE_PLATFORM in WORKSPACE\Conf

 		4. Run "<python_interpreter.exe> <python_source_dir>/AutoGen/AutoGen.py" or "<python_source_dir>/AutoGen/AutoGen.py"

diff --git a/edksetup.bat b/edksetup.bat
index 91b83c637d..30c8da17b5 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,5 +1,7 @@
+@REM @file

+@REM   Windows batch file to setup a WORKSPACE environment

 @REM

-@REM Copyright (c) 2006, Intel Corporation

+@REM Copyright (c) 2006 - 2008, Intel Corporation

 @REM All rights reserved. This program and the accompanying materials

 @REM are licensed and made available under the terms and conditions of the BSD License

 @REM which accompanies this distribution.  The full text of the license may be found at

@@ -9,13 +11,15 @@
 @REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 @REM

 

-@REM set following environment in this file or in command shell

+@REM set following environment in this file or in command shell for the older,

+@REM      JAVA/Ant build

 @REM set JAVA_HOME=C:\Java\jdk1.5.0_06

 @REM set ANT_HOME=C:\ANT

 @REM set XMLBEANS_HOME=C:\xmlbeans

 @REM set CYGWIN_HOME=C:\cygwin

 

-@REM usage: edksetup.bat [Rebuild] [ForceRebuild] [Reconfig]

+@REM usage: 

+@REM   edksetup.bat [--nt32] [AntBuild] [Rebuild] [ForceRebuild] [Reconfig]

 @REM if the argument, skip is present, only the paths and the

 @REM test and set of environment settings are performed. 

 

@@ -38,7 +42,13 @@ set WORKSPACE=%CD%
 @if /I "%1"=="/h" goto Usage

 @if /I "%1"=="/?" goto Usage

 @if /I "%1"=="/help" goto Usage

-@if /I not "%1"=="--nt32" goto check_new_build

+

+@if /I not "%1"=="--nt32" goto check_Ant_build

+

+@REM Flag, --nt32 is set

+@REM The Nt32 Emluation Platform requires Microsoft Libraries

+@REM and headers to interface with Windows.

+

 if not defined VCINSTALLDIR (

   if defined VS71COMNTOOLS (

     call "%VS71COMNTOOLS%\vsvars32.bat"

@@ -54,44 +64,88 @@ if not defined VCINSTALLDIR (
 )

 shift

 

-:check_new_build

-@if /I "%1"=="NewBuild" goto NewBuild

+:check_Ant_build

+  @if /I "%1"=="AntBuild" goto AntBuild

 

-:AntBuild

 @REM

-@REM Check the required system environment variables

+@REM Default is new, Makefile Base Build

 @REM

 

-:check_vc

-if defined VCINSTALLDIR goto check_cygwin

-if defined VS71COMNTOOLS (

- call "%VS71COMNTOOLS%\vsvars32.bat"

-) else (

+@if /I "%1"=="NewBuild" shift

+@if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools

+@IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools

+@call %EDK_TOOLS_PATH%\toolsetup.bat %*

+@goto end

+

+:BadBaseTools

+  @REM

+  @REM Need the BaseTools Package in order to build

+  @REM

   echo.

-  echo !!! WARNING !!! Cannot find Visual Studio !!!

+  echo !!! ERROR !!! The BaseTools Package was not found !!!

   echo.

-)

+  echo Set the system environment variable, EDK_TOOLS_PATH to the BaseTools,

+  echo For example,

+  echo   set EDK_TOOLS_PATH=C:\MyTools\BaseTools

+  echo The setup script, toolsetup.bat must reside in this folder.

+  echo.

+  @goto end

+

+@REM With the exception of the :end and :Usage tags, all information below

+@REM these lines is for the JAVA/Ant Build!

+

+:AntBuild

+  @REM

+  @REM Check the required system environment variables

+  @REM

+  @if /I "%1"=="AntBuild" shift

+

+  set FOUND="FALSE"

+  if exist "Tools\Jars" set FOUND="TRUE"

+  if exist "%EDK_TOOLS_PATH%\Tools\Jars" set FOUND="TRUE"

+  if %FOUND%=="FALSE" (

+    echo.

+    echo !!! ERROR !!! You have selected the Java/Ant build, however those tools

+    echo               cannot be found in this WORKSPACE.

+    echo.

+    echo               Please double check that the AntTools project is installed

+    echo               in this WORKSPACE.

+    echo.

+    set FOUND=""

+    goto end

+  )

+  set FOUND=""

+

+:check_vc

+  if defined VCINSTALLDIR goto check_cygwin

+  if defined VS71COMNTOOLS (

+   call "%VS71COMNTOOLS%\vsvars32.bat"

+  ) else (

+    echo.

+    echo !!! WARNING !!! Cannot find Visual Studio !!!

+    echo.

+  )

 

 :check_cygwin

-if defined CYGWIN_HOME goto check_java

-if exist c:\cygwin (

-  set CYGWIN_HOME=c:\cygwin

-) else (

-  echo.

-  echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!

-  echo.

-)

+  if defined CYGWIN_HOME goto check_java

+  if exist c:\cygwin (

+    set CYGWIN_HOME=c:\cygwin

+  ) else (

+    echo.

+    echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!

+    echo.

+  )

 

 :check_java

-if "%JAVA_HOME%"=="" goto no_jdk

+  if "%JAVA_HOME%"=="" goto no_jdk

 

 :check_ant

-if "%ANT_HOME%"=="" goto no_ant

-if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib

+  if "%ANT_HOME%"=="" goto no_ant

+  if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib

 

 :check_xmlbeans

-if "%XMLBEANS_HOME%"=="" goto no_xmlbeans

-if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8

+  if "%XMLBEANS_HOME%"=="" goto no_xmlbeans

+  if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8

 

 set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin

 

@@ -105,15 +159,15 @@ echo Setting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORK
 goto path_ok

 

 :check_path

-if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok

-set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%

-set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin

-echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE

+  if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok

+  set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%

+  set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin

+  echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE

 

 :path_ok

 

-@if /I "%1"=="ForceRebuild" goto ForceBuild

-@if /I "%1"=="Reconfig" goto Reconfig

+  @if /I "%1"=="ForceRebuild" goto ForceBuild

+  @if /I "%1"=="Reconfig" goto Reconfig

 

 @IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild

 @IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild

@@ -160,150 +214,152 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 goto skipbuild

 

 :ForceBuild 

-call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall

+  call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall

 

 :NormalBuild

-@REM

-@REM Start to build the Framework Tools

-@REM

-

-echo.

-echo Building the Framework Tools

-echo.

-

-@REM

-@REM We are going to create the SurfaceArea.jar file first so that the other

-@REM Java Programs can use it.

-@REM It needs the XMLBEANS libraries in order to compile.

-@REM

-set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%

-

-call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea

-

-@REM

-@REM Now we can make the other Java Programs

-@REM All of the remaining Java Programs require the SurfaceArea library to compile

-@REM

-set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%

+  @REM

+  @REM Start to build the Framework Tools

+  @REM

 

-call ant -f %WORKSPACE%\Tools\build.xml JavaCode

-

-@REM

-@REM We have all of the Java Programs and add-in classes created, so we can start

-@REM using the cpp-tasks to create our tools

-@REM

-set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%

-

-call ant -f %WORKSPACE%\Tools\build.xml C_Code

+  echo.

+  echo Building the Framework Tools

+  echo.

 

-@REM

-@REM Done!!!

-@REM

-goto end

+  @REM

+  @REM We are going to create the SurfaceArea.jar file first so that the other

+  @REM Java Programs can use it.

+  @REM It needs the XMLBEANS libraries in order to compile.

+  @REM

+  set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%

+

+  call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea

+

+  @REM

+  @REM Now we can make the other Java Programs

+  @REM All of the remaining Java Programs require the SurfaceArea library to compile

+  @REM

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%

+

+  call ant -f %WORKSPACE%\Tools\build.xml JavaCode

+

+  @REM

+  @REM We have all of the Java Programs and add-in classes created, so we can start

+  @REM using the cpp-tasks to create our tools

+  @REM

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%

+

+  call ant -f %WORKSPACE%\Tools\build.xml C_Code

+

+  @REM

+  @REM Done!!!

+  @REM

+  goto end

 

 :no_jdk

-echo.

-echo !!! Please install Java, and set JAVA_HOME !!!

-echo.

-goto end

+  echo.

+  echo !!! Please install Java, and set JAVA_HOME !!!

+  echo.

+  goto end

 

 :no_ant

-echo.

-echo !!! Please install Apache Ant, and set ANT_HOME !!!

-echo.

-goto end

+  echo.

+  echo !!! Please install Apache Ant, and set ANT_HOME !!!

+  echo.

+  goto end

 

 :no_antcontrib

-echo.

-echo !!! Please install Ant-contrib to ANT_HOME !!!

-echo.

-goto end

+  echo.

+  echo !!! Please install Ant-contrib to ANT_HOME !!!

+  echo.

+  goto end

 

 :no_xmlbeans

-echo.

-echo !!! Please install XML Beans, and set XMLBEANS_HOME !!!

-echo.

-goto end

+  echo.

+  echo !!! Please install XML Beans, and set XMLBEANS_HOME !!!

+  echo.

+  goto end

 

 :no_saxon8

-echo.

-echo !!! Please copy saxon8.jar file to XMLBEANS_HOME\lib !!!

-echo.

-goto end

+  echo.

+  echo !!! Please copy saxon8.jar file to XMLBEANS_HOME\lib !!!

+  echo.

+  goto end

 

 :skipbuild

-@REM

-@REM This just sets up the CLASSPATH, the rest of the environment should have been set already.

-@REM

-echo.

-echo WORKSPACE:     %WORKSPACE%

-echo JAVA_HOME:     %JAVA_HOME%

-echo ANT_HOME:      %ANT_HOME%

-echo XMLBEANS_HOME: %XMLBEANS_HOME%

-echo CYGWIN_HOME:   %CYGWIN_HOME%

-echo PATH:          %PATH%

-echo.

-set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-dom.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-xpath.jar;%CLASSPATH%

-set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%

-set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%

-echo CLASSPATH:     %CLASSPATH%

-goto end

+  @REM

+  @REM This just sets up the CLASSPATH, the rest of the environment should have been set already.

+  @REM

+  echo.

+  echo WORKSPACE:     %WORKSPACE%

+  echo JAVA_HOME:     %JAVA_HOME%

+  echo ANT_HOME:      %ANT_HOME%

+  echo XMLBEANS_HOME: %XMLBEANS_HOME%

+  echo CYGWIN_HOME:   %CYGWIN_HOME%

+  echo PATH:          %PATH%

+  echo.

+  set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-dom.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-xpath.jar;%CLASSPATH%

+  set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%

+  set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%

+  echo CLASSPATH:     %CLASSPATH%

+  goto end

 

 :Reconfig

-@REM

-@REM Reinstall all config files

-@REM

-call ant -f %WORKSPACE%\Tools\build.xml reconfig

-goto end

+  @REM

+  @REM Reinstall all config files

+  @REM

+  call ant -f %WORKSPACE%\Tools\build.xml reconfig

+  goto end

 

 :Usage

-echo.

-echo  Usage: "%0 [--nt32] [NewBuild | Rebuild | ForceRebuild | Reconfig]"

-echo         --nt32         Call vsvars32.bat for NT32 platform build

-echo         NewBuild       Using new build tools in BaseTools package

-echo         Rebuild        Incremental build, only build those updated tools (Ant build only)

-echo         ForceRebuild   Rebuild all tools neither updated or not (Ant build only)

-echo         Reconfig       Reinstall target.txt, tools_def.txt, FrameworkDatabase.db (Ant build only) 

-echo.

-echo  Note that target.template, tools_def.template, FrameworkDatabase.template will be

-echo  only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectively if they

-echo  are not existed. Using option [Reconfig] to do the force copy. 

-echo.

-@goto end

-

-:NewBuild

-@IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild

-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools

-@call BaseTools\toolsetup.bat

-@goto end

+  echo.

+  echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32] [AntBuild | Rebuild | ForceRebuild ] [Reconfig]"

+  echo         --nt32         Call vsvars32.bat for NT32 platform build.

+  echo.

+  echo         Rebuild        If sources are available perform an Incremental build, only 

+  echo                        build those updated tools.

+  echo         ForceRebuild   If sources are available, rebuild all tools regardless of 

+  echo                        whether they have been updated or not.

+  echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.

+  echo.

+  echo  JAVA/ANT Build

+  echo         AntBuild       Using older Java/ANT build tools in Tools directory.

+  echo         Rebuild        Incremental build, only build those updated tools.

+  echo         ForceRebuild   Rebuild all tools regardless of whether they have been updated or not.

+  echo         Reconfig       Reinstall target.txt, tools_def.txt and FrameworkDatabase.db.

+  echo.

+  echo  Note that target.template, tools_def.template, build_rules.template and the 

+  echo  FrameworkDatabase.template will be only copied to target.txt, tools_def.txt, build_rule.txt and

+  echo  FrameworkDatabase.db respectively if they do not exist. Using option [Reconfig] to force the copy. 

+  echo.

+  @goto end

 

 :end

-@popd

-@echo on

+  @popd

+  @echo on