X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2Ftoolsetup.bat;h=890521434d60953b953b116d9540caa244fb5b0b;hb=8230d45bba517d78c20634425587efeb6fa14d7c;hp=76fd8bb6ef9e78188f73c4d93c3511e72dc2ba7f;hpb=35ba063da8d7058c1650678d217b5c025255230d;p=mirror_edk2.git
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 76fd8bb6ef..890521434d 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -3,7 +3,8 @@
@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 - 2013, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP
@REM
@REM This program and the accompanying materials are licensed and made available
@REM under the terms and conditions of the BSD License which accompanies this
@@ -33,6 +34,9 @@ if /I "%1"=="/?" goto Usage
:loop
if "%1"=="" goto setup_workspace
if /I "%1"=="--nt32" (
+ if /I "%2" == "X64" (
+ shift
+ )
@REM Ignore --nt32 flag
shift
goto loop
@@ -160,7 +164,18 @@ if not defined WORKSPACE (
goto skip_reconfig
)
-set CONF_PATH=%WORKSPACE%\Conf
+IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" (
+ @echo.
+ @echo !!! ERROR !!! The set_vsprefix_envs.bat was not found !!!
+ @echo.
+ goto end
+)
+call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat
+
+if not defined CONF_PATH (
+ set CONF_PATH=%WORKSPACE%\Conf
+)
+
if NOT exist %CONF_PATH% (
if defined PACKAGES_PATH (
for %%i IN (%PACKAGES_PATH%) DO (
@@ -244,39 +259,39 @@ if defined FORCE_REBUILD goto check_build_environment
if defined REBUILD goto check_build_environment
if not exist "%EDK_TOOLS_PATH%" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_build_environment
+IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\EfiRom.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\GenBootSector.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\GenFfs.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\GenFv.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\GenFw.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\GenPage.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\GenSec.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\GenVtf.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\Split.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\TianoCompress.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\VfrCompile.exe" goto check_c_tools
+IF NOT EXIST "%EDK_TOOLS_BIN%\VolInfo.exe" goto check_c_tools
+
+goto check_python_tools
+
+:check_c_tools
+ echo.
+ echo !!! ERROR !!! Binary C tools are missing. They are requried to be built from BaseTools Source.
+ echo.
+ goto end
+
+:check_python_tools
IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\EfiRom.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenBootSector.exe" goto check_build_environment
IF NOT EXIST "%EDK_TOOLS_BIN%\GenFds.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenFfs.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenFv.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenFw.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenPage.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenSec.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\GenVtf.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\Split.exe" goto check_build_environment
IF NOT EXIST "%EDK_TOOLS_BIN%\TargetTool.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\TianoCompress.exe" goto check_build_environment
IF NOT EXIST "%EDK_TOOLS_BIN%\Trim.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\VfrCompile.exe" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\VolInfo.exe" goto check_build_environment
goto end
: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 ForceRebuild option.
- echo.
- goto end
- )
+ if defined BASETOOLS_PYTHON_SOURCE goto VisualStudioAvailable
if not defined BASE_TOOLS_PATH (
if not exist "Source\C\Makefile" (
@@ -286,17 +301,14 @@ goto end
set BASE_TOOLS_PATH=%CD%
)
)
- set PATH=%BASE_TOOLS_PATH%\Bin\Win32;%PATH%
-
- set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
- set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
if not defined PYTHON_HOME (
if defined PYTHONHOME (
set PYTHON_HOME=%PYTHONHOME%
) else (
echo.
- echo !!! ERROR !!! PYTHON_HOME is required to build or execute the tools, please set it. !!!
+ echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set.
+ echo PYTHON_HOME is required to build or execute the python tools.
echo.
goto end
)
@@ -304,36 +316,30 @@ 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 "PATH=%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%"
- set "PATH=%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%"
- set "PATH=%BASETOOLS_PYTHON_SOURCE%\build;%PATH%"
- set PATHEXT=%PATHEXT%;.py
- )
+ echo.
+ echo !!! WARNING !!! PYTHON_FREEZER_PATH environment variable is not set.
+ echo Setup environment to run Python scripts directly.
+ echo.
+ set "PATH=%PATH%;%BASE_TOOLS_PATH%\BinWrappers\WindowsLike"
)
+
+ set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
+ set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
- echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH%
- echo PYTHON_PATH = %PYTHON_PATH%
- echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%
+ echo PATH = %PATH%
+ echo PYTHON_HOME = %PYTHON_HOME%
+ echo PYTHONPATH = %PYTHONPATH%
+ if defined PYTHON_FREEZER_PATH (
+ echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%
+ )
echo.
+:VisualStudioAvailable
+ if not defined FORCE_REBUILD (
+ if not defined REBUILD (
+ goto end
+ )
+ )
call "%EDK_TOOLS_PATH%\get_vsvars.bat"
if not defined VCINSTALLDIR (
@echo.
@@ -341,8 +347,6 @@ goto end
@echo.
goto end
)
-
-:VisualStudioAvailable
if not defined FORCE_REBUILD goto IncrementalBuild
:CleanAndBuild