From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F37731A1E4F for ; Tue, 18 Oct 2016 21:55:10 -0700 (PDT) Received: from SHIAC15.asiapacific.hpqcorp.net (unknown [16.169.181.76]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 76BC342; Wed, 19 Oct 2016 04:55:08 +0000 (UTC) From: Cinnamon Shia To: edk2-devel@lists.01.org Cc: liming.gao@intel.com, Cinnamon Shia Date: Wed, 19 Oct 2016 12:54:53 +0800 Message-Id: <20161019045453.25416-1-cinnamon.shia@hpe.com> X-Mailer: git-send-email 2.10.0.windows.1 Subject: [PATCH] Edk2Setup.bat: Support building platforms with Python source X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Oct 2016 04:55:11 -0000 Following the same approach as toolsetup.bat: If build.exe, TargetTool.exe, Trim.exe or GenFds.exe is missing, run its Python source instead. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Cinnamon Shia --- Edk2Setup.bat | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/Edk2Setup.bat b/Edk2Setup.bat index 2d13234..953a870 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,7 @@ @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 -) + @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 +413,29 @@ ) @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 + +@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 end + ) +) + +@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 ( @@ -504,5 +524,6 @@ @set SCRIPT= @set LIST_VS_VERSIONS= @set PYTHON_FREEZER_PATH= +@set PYTHON_BUILD= @echo on @exit /B 1 -- 2.10.0.windows.1