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 81F3E81D68 for ; Thu, 3 Nov 2016 19:19:59 -0700 (PDT) Received: from SHIAC15.asiapacific.hpqcorp.net (shiac15.asiapacific.hpqcorp.net [16.159.109.53]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 4936D46; Fri, 4 Nov 2016 02:19:59 +0000 (UTC) From: Cinnamon Shia To: edk2-devel@lists.01.org Cc: yonghong.zhu@intel.com, liming.gao@intel.com, Cinnamon Shia Date: Fri, 4 Nov 2016 10:19:46 +0800 Message-Id: <20161104021946.14924-1-cinnamon.shia@hpe.com> X-Mailer: git-send-email 2.10.0.windows.1 Subject: [PATCH] BaseTools/Edk2Setup.bat: Fix build errors from VS tools PREFIX ENV missing 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: Fri, 04 Nov 2016 02:19:59 -0000 BaseTools/set_vsprefix_envs.bat is introduced for setting the PREFIX ENV of VS tools in tools_def.template. For example: DEFINE VS2015_BIN = ENV(VS2015_PREFIX)Vc\bin DEFINE VS2015_DLL = ENV(VS2015_PREFIX)Common7\IDE;DEF(VS2015_BIN) DEFINE VS2015_BINX64 = DEF(VS2015_BIN)\x86_amd64 The issue is EdkSetup.bat calls BaseTools\set_vsprefix_envs.bat but Edk2Setup.bat does not. Edk2Setup.bat should call BaseTools/set_vsprefix_envs.bat to set up the PREFIX ENV of VS tools. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Cinnamon Shia --- Edk2Setup.bat | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Edk2Setup.bat b/Edk2Setup.bat index 68f46dc..017e88d 100755 --- a/Edk2Setup.bat +++ b/Edk2Setup.bat @@ -355,6 +355,15 @@ @if defined REBUILD_TOOLS goto SetConf @if defined SVN_PULL goto SetConf +@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 -- 2.10.0.windows.1