X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=BaseTools%2Ftoolsetup.bat;h=58fd26a4b585ab0ffce782d4974bc978cb48a767;hb=HEAD;hp=6fe63e4baa1d2fcae3bcfacc838879f17bcebe9b;hpb=7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa;p=mirror_edk2.git
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 6fe63e4baa..58fd26a4b5 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -3,21 +3,15 @@
@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 - 2018, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2019, 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
pushd .
+set SCRIPT_ERROR=0
@REM ##############################################################
@REM # You should not have to modify anything below this line
@@ -33,14 +27,6 @@ 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
- )
if /I "%1"=="Reconfig" (
shift
set RECONFIG=TRUE
@@ -56,6 +42,36 @@ if /I "%1"=="/?" goto Usage
set FORCE_REBUILD=TRUE
goto loop
)
+ if /I "%1"=="VS2019" (
+ shift
+ set VS2019=TRUE
+ set VSTool=VS2019
+ goto loop
+ )
+ if /I "%1"=="VS2017" (
+ shift
+ set VS2017=TRUE
+ set VSTool=VS2017
+ goto loop
+ )
+ if /I "%1"=="VS2015" (
+ shift
+ set VS2015=TRUE
+ set VSTool=VS2015
+ goto loop
+ )
+ if /I "%1"=="VS2013" (
+ shift
+ set VS2013=TRUE
+ set VSTool=VS2013
+ goto loop
+ )
+ if /I "%1"=="VS2012" (
+ shift
+ set VS2012=TRUE
+ set VSTool=VS2012
+ goto loop
+ )
if "%1"=="" goto setup_workspace
if exist %1 (
if not defined BASE_TOOLS_PATH (
@@ -166,7 +182,29 @@ IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" (
@echo.
goto end
)
-call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat
+if defined VS2019 (
+ call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2019
+) else if defined VS2017 (
+ call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2017
+) else if defined VS2015 (
+ call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2015
+ call %EDK_TOOLS_PATH%\get_vsvars.bat VS2015
+) else if defined VS2013 (
+ call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2013
+ call %EDK_TOOLS_PATH%\get_vsvars.bat VS2013
+) else if defined VS2012 (
+ call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2012
+ call %EDK_TOOLS_PATH%\get_vsvars.bat VS2012
+) else (
+ call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat
+ call %EDK_TOOLS_PATH%\get_vsvars.bat
+)
+if %SCRIPT_ERROR% NEQ 0 (
+ @echo.
+ @echo !!! ERROR !!! %VSTool% is not installed !!!
+ @echo.
+ goto end
+)
if not defined CONF_PATH (
set CONF_PATH=%WORKSPACE%\Conf
@@ -189,7 +227,7 @@ if NOT exist %CONF_PATH% (
) else (
if defined RECONFIG (
echo.
- echo Over-writing the files in the CONF_PATH directory
+ echo Overwriting the files in the CONF_PATH directory
echo using the default template files
echo.
)
@@ -202,7 +240,7 @@ if NOT exist %CONF_PATH%\target.txt (
)
copy %EDK_TOOLS_PATH%\Conf\target.template %CONF_PATH%\target.txt > nul
) else (
- if defined RECONFIG echo over-write ... target.template to %CONF_PATH%\target.txt
+ if defined RECONFIG echo overwrite ... target.template to %CONF_PATH%\target.txt
if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\target.template %CONF_PATH%\target.txt > nul
)
@@ -213,7 +251,7 @@ if NOT exist %CONF_PATH%\tools_def.txt (
)
copy %EDK_TOOLS_PATH%\Conf\tools_def.template %CONF_PATH%\tools_def.txt > nul
) else (
- if defined RECONFIG echo over-write ... tools_def.template to %CONF_PATH%\tools_def.txt
+ if defined RECONFIG echo overwrite ... tools_def.template to %CONF_PATH%\tools_def.txt
if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\tools_def.template %CONF_PATH%\tools_def.txt > nul
)
@@ -261,7 +299,6 @@ 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
@@ -270,7 +307,7 @@ goto check_build_environment
:check_c_tools
echo.
- echo !!! ERROR !!! Binary C tools are missing. They are requried to be built from BaseTools Source.
+ echo !!! ERROR !!! Binary C tools are missing. They are required to be built from BaseTools Source.
echo.
:check_build_environment
@@ -355,12 +392,33 @@ goto end
goto check_freezer_path
)
+
+
:check_freezer_path
endlocal
+
+ %PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL
+ if %ERRORLEVEL% EQU 0 (
+ goto use_pip_basetools
+ ) else (
+ REM reset ERRORLEVEL
+ type nul>nul
+ goto use_builtin_basetools
+ )
+
+:use_builtin_basetools
+ @echo Using EDK2 in-source Basetools
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%
+ goto print_python_info
+
+:use_pip_basetools
+ @echo Using Pip Basetools
+ set "PATH=%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%"
+ set BASETOOLS_PYTHON_SOURCE=edk2basetools
+ goto print_python_info
:print_python_info
echo PATH = %PATH%
@@ -380,7 +438,7 @@ goto end
goto end
)
)
- call "%EDK_TOOLS_PATH%\get_vsvars.bat"
+
if not defined VCINSTALLDIR (
@echo.
@echo !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!
@@ -414,7 +472,7 @@ goto end
:Usage
@echo.
- echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]]"
+ echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]"
@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.
@@ -423,11 +481,22 @@ goto end
@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 VS2012 Set the env for VS2012 build.
+ @echo VS2013 Set the env for VS2013 build.
+ @echo VS2015 Set the env for VS2015 build.
+ @echo VS2017 Set the env for VS2017 build.
+ @echo VS2019 Set the env for VS2019 build.
@echo.
:end
set REBUILD=
set FORCE_REBUILD=
set RECONFIG=
+set VS2019=
+set VS2017=
+set VS2015=
+set VS2013=
+set VS2012=
+set VSTool=
popd