From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F41061A1E1D for ; Mon, 12 Sep 2016 17:13:30 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP; 12 Sep 2016 17:13:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,325,1470726000"; d="scan'208";a="7634758" Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by fmsmga006.fm.intel.com with ESMTP; 12 Sep 2016 17:13:30 -0700 Received: from orsmsx108.amr.corp.intel.com ([169.254.2.61]) by ORSMSX103.amr.corp.intel.com ([169.254.5.152]) with mapi id 14.03.0248.002; Mon, 12 Sep 2016 17:13:30 -0700 From: "Bjorge, Erik C" To: "Gao, Liming" , "edk2-devel@lists.01.org" CC: "Zhu, Yonghong" , "Kinney, Michael D" Thread-Topic: [Patch 4/4] BaseTools: Update toolsetup.bat to set PYTHONPATH env to run python source Thread-Index: AQHSDQ92N+aPJ8Dc/0+vhid3sO4T1qB2i2VQ Date: Tue, 13 Sep 2016 00:13:28 +0000 Message-ID: <7FE3244EBB31F1449E4EC79CFE44E3F4796FEE29@ORSMSX108.amr.corp.intel.com> References: <1473696210-6264-1-git-send-email-liming.gao@intel.com> <1473696210-6264-5-git-send-email-liming.gao@intel.com> In-Reply-To: <1473696210-6264-5-git-send-email-liming.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTljZjczNTktMzhiNy00ZDAxLWI4ZTEtNmEzMmViOWJjYzgzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6ImFoM05Sek9Bc2haSGx4Rk40WllIYWhFaHB5QTBLUVozOXdhYzJkR1FcL05NPSJ9 x-ctpclassification: CTP_IC x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Subject: Re: [Patch 4/4] BaseTools: Update toolsetup.bat to set PYTHONPATH env to run 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: Tue, 13 Sep 2016 00:13:31 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Erik Bjorge > -----Original Message----- > From: Gao, Liming > Sent: Monday, September 12, 2016 9:04 AM > To: edk2-devel@lists.01.org > Cc: Zhu, Yonghong ; Kinney, Michael D > ; Bjorge, Erik C > Subject: [Patch 4/4] BaseTools: Update toolsetup.bat to set PYTHONPATH > env to run python source >=20 > When python tool exe doesn't exist, toolsetup.bat will set up > PYTHONPATH, > and set python tool dos script directory into system PATH. >=20 > Cc: Yonghong Zhu > Cc: Michael Kinney > Cc: Erik Bjorge > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Liming Gao > --- > BaseTools/toolsetup.bat | 101 +++++++++++++++++++++-------------------- > ------- > 1 file changed, 44 insertions(+), 57 deletions(-) >=20 > diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat > index a64938d..6d416d4 100755 > --- a/BaseTools/toolsetup.bat > +++ b/BaseTools/toolsetup.bat > @@ -247,39 +247,38 @@ 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 >=20 > -IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" 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 > +IF NOT EXIST "%EDK_TOOLS_BIN%\EfiRom.exe" goto check_c_tools > +IF NOT EXIST "%EDK_TOOLS_BIN%\GenBootSector.exe" goto check_c_tools > +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%\GenPage.exe" goto check_c_tools > +IF NOT EXIST "%EDK_TOOLS_BIN%\GenSec.exe" goto check_c_tools > +IF NOT EXIST "%EDK_TOOLS_BIN%\GenVtf.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 > + > +goto check_python_tools > + > +:check_c_tools > + echo. > + echo Binary C tools are missing. They are requried to be built from > BaseTools Source. > + echo. > + > +:check_python_tools > IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto > check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\EfiRom.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\GenBootSector.exe" goto > check_build_environment > IF NOT EXIST "%EDK_TOOLS_BIN%\GenFds.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\GenFfs.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\GenFv.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\GenFw.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\GenPage.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\GenSec.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\GenVtf.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\Split.exe" goto check_build_environment > IF NOT EXIST "%EDK_TOOLS_BIN%\TargetTool.exe" goto > check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\TianoCompress.exe" goto > check_build_environment > IF NOT EXIST "%EDK_TOOLS_BIN%\Trim.exe" goto check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\VfrCompile.exe" goto > check_build_environment > -IF NOT EXIST "%EDK_TOOLS_BIN%\VolInfo.exe" goto check_build_environment >=20 > goto end >=20 > :check_build_environment > - > - if not defined FORCE_REBUILD ( > - echo. > - echo Rebuilding of tools is not required. Binaries of the latest, > - echo tested versions of the tools have been tested and included in > the > - echo EDK II repository. > - echo. > - echo If you really want to build the tools, use the ForceRebuild > option. > - echo. > - goto end > - ) > + if defined BASETOOLS_PYTHON_SOURCE goto VisualStudioAvailable >=20 > if not defined BASE_TOOLS_PATH ( > if not exist "Source\C\Makefile" ( > @@ -289,10 +288,6 @@ goto end > set BASE_TOOLS_PATH=3D%CD% > ) > ) > - set PATH=3D%BASE_TOOLS_PATH%\Bin\Win32;%PATH% > - > - set BASETOOLS_PYTHON_SOURCE=3D%BASE_TOOLS_PATH%\Source\Python > - set PYTHONPATH=3D%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH% >=20 > if not defined PYTHON_HOME ( > if defined PYTHONHOME ( > @@ -307,36 +302,30 @@ goto end >=20 > @REM We have Python, now test for FreezePython application > if not defined PYTHON_FREEZER_PATH ( > - @REM see if we can find FreezePython.ex > - if exist "%PYTHON_HOME%\Tools\cx_Freeze-3.0.3\FreezePython.exe" ( > - set PYTHON_FREEZER_PATH=3D%PYTHON_HOME%\Tools\cx_Freeze-3.0.3 > - ) > - if exist "%PYTHON_HOME%\Tools\cx_Freeze\FreezePython.exe" ( > - set PYTHON_FREEZER_PATH=3D%PYTHON_HOME%\Tools\cx_Freeze > - ) > - if exist "C:\cx_Freeze\FreezePython.exe" ( > - set PYTHON_FREEZER_PATH=3DC:\cx_Freeze > - ) > - if exist "C:\cx_Freeze-3.0.3" ( > - set PYTHON_FREEZER_PATH=3DC:\cx_Freeze-3.0.3 > - ) > - if not defined PYTHON_FREEZER_PATH ( > - echo. > - echo !!! WARNING !!! Will not be able to compile Python programs > to .exe > - echo Will setup environment to run Python scripts directly. > - echo. > - set "PATH=3D%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%" > - set "PATH=3D%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%" > - set "PATH=3D%BASETOOLS_PYTHON_SOURCE%\build;%PATH%" > - set PATHEXT=3D%PATHEXT%;.py > - ) > + echo. > + echo !!! WARNING !!! PYTHON_FREEZER_PATH environment variable is > not set. > + echo Setup environment to run Python scripts directly. > + echo. > + set "PATH=3D%PATH%;%BASE_TOOLS_PATH%\BinWrappers\WindowsLike" > ) > + > + set BASETOOLS_PYTHON_SOURCE=3D%BASE_TOOLS_PATH%\Source\Python > + set PYTHONPATH=3D%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH% >=20 > - echo BASE_TOOLS_PATH =3D %BASE_TOOLS_PATH% > - echo PYTHON_PATH =3D %PYTHON_PATH% > - echo PYTHON_FREEZER_PATH =3D %PYTHON_FREEZER_PATH% > + echo PATH =3D %PATH% > + echo PYTHON_HOME =3D %PYTHON_HOME% > + echo PYTHONPATH =3D %PYTHONPATH% > + if defined PYTHON_FREEZER_PATH ( > + echo PYTHON_FREEZER_PATH =3D %PYTHON_FREEZER_PATH% > + ) > echo. >=20 > +:VisualStudioAvailable > + if not defined FORCE_REBUILD ( > + if not defined REBUILD ( > + goto end > + ) > + ) > call "%EDK_TOOLS_PATH%\get_vsvars.bat" > if not defined VCINSTALLDIR ( > @echo. > @@ -344,8 +333,6 @@ goto end > @echo. > goto end > ) > - > -:VisualStudioAvailable > if not defined FORCE_REBUILD goto IncrementalBuild >=20 > :CleanAndBuild > -- > 2.8.0.windows.1