X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2Ftoolsetup.bat;h=23dae40b209489243fdebe61a3c2636c008941ee;hb=e2a673b85336bc2d88f0b3975679b2ae7bf92f2e;hp=310ddd030c077debab1e0c3b88e1c9ff1324515a;hpb=1834aeeac68677cb2040b101428966a5654d73dc;p=mirror_edk2.git
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 310ddd030c..23dae40b20 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -1,18 +1,12 @@
@REM @file
-@REM This stand-alone program is typically called by the edksetup.bat 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 - 2013, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2018, 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
-@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
-@REM IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
@@ -33,6 +27,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
@@ -114,15 +111,13 @@ if /I "%1"=="/?" goto Usage
:set_PATH
if defined WORKSPACE_TOOLS_PATH goto check_PATH
if not defined EDK_TOOLS_BIN (
- if exist %EDK_TOOLS_PATH%\Bin\Win32 (
- set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
- ) else (
+ set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
+ if not exist %EDK_TOOLS_PATH%\Bin\Win32 (
echo.
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
- echo.
- goto end
+ echo.
)
)
set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -132,15 +127,13 @@ if /I "%1"=="/?" goto Usage
:check_PATH
if "%EDK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto PATH_ok
if not defined EDK_TOOLS_BIN (
- if exist %EDK_TOOLS_PATH%\Bin\Win32 (
- set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
- ) else (
+ set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
+ if not exist %EDK_TOOLS_PATH%\Bin\Win32 (
echo.
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
- echo.
- goto end
+ echo.
)
)
set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -160,7 +153,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 (
@@ -171,7 +175,7 @@ if NOT exist %CONF_PATH% (
)
)
)
-
+
:CopyConf
if NOT exist %CONF_PATH% (
mkdir %CONF_PATH%
@@ -243,40 +247,27 @@ echo.
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%" goto check_build_environment
-IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_build_environment
-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
+IF NOT EXIST "%EDK_TOOLS_BIN%\EfiRom.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%\GenSec.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 end
+goto check_build_environment
-:check_build_environment
+:check_c_tools
+ echo.
+ echo !!! ERROR !!! Binary C tools are missing. They are required to be built from BaseTools Source.
+ echo.
- 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
- )
+:check_build_environment
+ set PYTHONHASHSEED=1
if not defined BASE_TOOLS_PATH (
if not exist "Source\C\Makefile" (
@@ -286,65 +277,102 @@ 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 (
+:defined_python
+if defined PYTHON_COMMAND if not defined PYTHON3_ENABLE (
+ goto check_python_available
+)
+if defined PYTHON3_ENABLE (
+ if "%PYTHON3_ENABLE%" EQU "TRUE" (
+ set PYTHON_COMMAND=py -3
+ goto check_python_available
+ ) else (
+ goto check_python2
+ )
+)
+if not defined PYTHON_COMMAND if not defined PYTHON3_ENABLE (
+ set PYTHON_COMMAND=py -3
+ py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1
+ setlocal enabledelayedexpansion
+ set /p PythonCheck=<"PythonCheck.txt"
+ del PythonCheck.txt
+ if "!PythonCheck!" NEQ "TRUE" (
+ if not defined PYTHON_HOME if not defined PYTHONHOME (
+ endlocal
+ set PYTHON_COMMAND=
echo.
- echo !!! ERROR !!! PYTHON_HOME is required to build or execute the tools, please set it. !!!
+ echo !!! ERROR !!! Binary python tools are missing.
+ echo PYTHON_COMMAND, PYTHON3_ENABLE or PYTHON_HOME
+ echo Environment variable is not set successfully.
+ echo They is required to build or execute the python tools.
echo.
goto end
+ ) else (
+ goto check_python2
)
+ ) else (
+ goto check_freezer_path
)
+)
- @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.
- goto UpdatePATH
- )
- else (
- goto UpdateEnv
- )
+:check_python2
+endlocal
+if defined PYTHON_HOME (
+ if EXIST "%PYTHON_HOME%" (
+ set PYTHON_COMMAND=%PYTHON_HOME%\python.exe
+ goto check_python_available
)
- else (
- goto UpdateEnv
+)
+if defined PYTHONHOME (
+ if EXIST "%PYTHONHOME%" (
+ set PYTHON_HOME=%PYTHONHOME%
+ set PYTHON_COMMAND=%PYTHON_HOME%\python.exe
+ goto check_python_available
)
-
-:UpdatePATH
- 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
- goto UpdateEnv
-
-:UpdateEnv
- echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH%
- echo PYTHON_PATH = %PYTHON_PATH%
- echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%
+)
+echo.
+echo !!! ERROR !!! PYTHON_HOME is not defined or The value of this variable does not exist
+echo.
+goto end
+:check_python_available
+%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1
+ setlocal enabledelayedexpansion
+ set /p PythonCheck=<"PythonCheck.txt"
+ del PythonCheck.txt
+ if "!PythonCheck!" NEQ "TRUE" (
+ echo.
+ echo ! ERROR ! "%PYTHON_COMMAND%" is not installed or added to environment variables
+ echo.
+ goto end
+ ) else (
+ goto check_freezer_path
+ )
+
+:check_freezer_path
+ endlocal
+ if defined BASETOOLS_PYTHON_SOURCE goto print_python_info
+ set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
+ set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
+ set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
+
+:print_python_info
+ echo PATH = %PATH%
+ if defined PYTHON3_ENABLE if "%PYTHON3_ENABLE%" EQU "TRUE" (
+ echo PYTHON3_ENABLE = %PYTHON3_ENABLE%
+ echo PYTHON3 = %PYTHON_COMMAND%
+ ) else (
+ echo PYTHON3_ENABLE = FALSE
+ echo PYTHON_COMMAND = %PYTHON_COMMAND%
+ )
+ echo PYTHONPATH = %PYTHONPATH%
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.
@@ -352,8 +380,6 @@ goto end
@echo.
goto end
)
-
-:VisualStudioAvailable
if not defined FORCE_REBUILD goto IncrementalBuild
:CleanAndBuild
@@ -370,18 +396,6 @@ goto end
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
@@ -395,11 +409,11 @@ goto end
@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 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 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 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.