X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Edk2Setup.bat;h=017e88de86c4b8495ec50e26a02ba543acb00f81;hb=85974aef1332d2d8f480f121875dc57795220dd1;hp=2d132349bc326e94951510667628c12c08fd0c8b;hpb=485eb3a252b21becb5bace55320ddbfdc8e1c83f;p=mirror_edk2.git
diff --git a/Edk2Setup.bat b/Edk2Setup.bat
index 2d132349bc..017e88de86 100755
--- a/Edk2Setup.bat
+++ b/Edk2Setup.bat
@@ -27,6 +27,7 @@
@REM build.exe Version 0.51 Developer Build based on Revision: 15668
@REM
@REM Copyright (c) 2014, Intel Corporation. All rights reserved.
+@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP
@REM 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
@@ -59,6 +60,7 @@
@set SRC_CONF=
@set ARGUMENT=
@set SCRIPT=EDKSETUP_BAT
+@set PYTHON_BUILD=
@if not defined ORIGINAL_PATH set "ORIGINAL_PATH=%PATH%"
@REM Always set the WORKSPACE environment variable to the current directory
@@ -352,12 +354,16 @@
@if defined REBUILD_TOOLS goto SetConf
@if defined SVN_PULL goto SetConf
-@if not exist "%EDK_TOOLS_PATH%\Bin\Win32\build.exe" (
- @echo ERROR : %EDK_TOOLS_PATH%\Bin\Win32\build.exe does not exist
- @echo Re-run this script using --reset, --pull or --rebuild
- @echo.
- @goto ExitFailure
+
+@REM call set_vsprefix_envs.bat to set up the PREFIX env for VS tool path.
+@IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" (
+ @echo.
+ @echo !!! ERROR !!! The set_vsprefix_envs.bat was not found !!!
+ @echo.
+ @goto ExitFailure
)
+@call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat
+
@echo.
@echo Rebuilding of the tools is not required. Binaries of the latest,
@echo tested versions of the tools have been tested and included in the
@@ -416,6 +422,31 @@
)
@set "PATH=%EDK_TOOLS_BIN%;%PATH%"
+@if NOT EXIST "%EDK_TOOLS_BIN%\build.exe" @set PYTHON_BUILD=TRUE
+@if NOT EXIST "%EDK_TOOLS_BIN%\GenFds.exe" @set PYTHON_BUILD=TRUE
+@if NOT EXIST "%EDK_TOOLS_BIN%\TargetTool.exe" @set PYTHON_BUILD=TRUE
+@if NOT EXIST "%EDK_TOOLS_BIN%\Trim.exe" @set PYTHON_BUILD=TRUE
+
+@if not defined PYTHON_BUILD goto SvnPull
+
+@echo !!! WARNING !!! Setup environment to run Python scripts directly.
+
+@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.
+ @goto ExitFailure
+ )
+)
+
+@set PATH=%PATH%;%BASE_TOOLS_PATH%\BinWrappers\WindowsLike
+@set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
+@set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
+
+:SvnPull
@if "%REBUILD_TOOLS%"=="TRUE" @goto Rebuild
@if "%SVN_PULL%"== "TRUE" (
if defined PYTHONHOME (
@@ -485,6 +516,7 @@
@set SCRIPT=
@set LIST_VS_VERSIONS=
@set PYTHON_FREEZER_PATH=
+@set PYTHON_BUILD=
@echo on
@exit /B 0
@@ -504,5 +536,6 @@
@set SCRIPT=
@set LIST_VS_VERSIONS=
@set PYTHON_FREEZER_PATH=
+@set PYTHON_BUILD=
@echo on
@exit /B 1