X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2Ftoolsetup.bat;h=0d4028db785f573e9ddf4a3f9b3694d3e4bfac09;hb=472eb3b89682f7af333ec46f84f990f6b8d4f497;hp=21f5b76e4b1c641755ff1ea26b62297f79a85246;hpb=7419aedd93132f2dfc91e7bf3634fba7e0842c7b;p=mirror_edk2.git
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 21f5b76e4b..0d4028db78 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -1,17 +1,18 @@
@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 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 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
@REM IMPLIED.
@REM
@@ -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
@@ -114,15 +118,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 +134,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,6 +160,14 @@ if not defined WORKSPACE (
goto skip_reconfig
)
+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
)
@@ -174,7 +182,7 @@ if NOT exist %CONF_PATH% (
)
)
)
-
+
:CopyConf
if NOT exist %CONF_PATH% (
mkdir %CONF_PATH%
@@ -246,6 +254,7 @@ 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_c_tools
IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools
@@ -268,7 +277,7 @@ goto check_python_tools
echo.
echo !!! ERROR !!! Binary C tools are missing. They are requried to be built from BaseTools Source.
echo.
- goto end
+ goto check_build_environment
:check_python_tools
IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment
@@ -290,30 +299,44 @@ goto end
)
)
- if not defined PYTHON_HOME (
- if defined PYTHONHOME (
- set PYTHON_HOME=%PYTHONHOME%
- ) else (
- echo.
- 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
+set PYTHON3=py -3
+:check_python_version
+ %PYTHON3% --version >NUL 2>&1
+ if %ERRORLEVEL% NEQ 0 (
+ if defined PYTHON_HOME (
+ if EXIST "%PYTHON_HOME%" (
+ set PYTHON3=%PYTHON_HOME%\python.exe
+ )
)
)
+ %PYTHON3% --version >NUL 2>&1
+ if %ERRORLEVEL% NEQ 0 (
+ echo.
+ echo !!! ERROR !!! %PYTHON3% not install.
+ echo.
+ goto end
+ )
+ FOR /F "TOKENS=1,2" %%i IN ('%PYTHON3% --version') DO set VERSION=%%j
+ if /I "%VERSION%" LSS "3.6" (
+ echo.
+ echo !!! ERROR !!! python version should greater than or equal to version 3.6.
+ echo.
+ goto end
+ )
+:check_freezer_path
@REM We have Python, now test for FreezePython application
if not defined PYTHON_FREEZER_PATH (
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 "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
)
set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
-
+
echo PATH = %PATH%
echo PYTHON_HOME = %PYTHON_HOME%
echo PYTHONPATH = %PYTHONPATH%
@@ -376,11 +399,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.