From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: zhijux.fan@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Sun, 29 Sep 2019 01:02:46 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Sep 2019 01:02:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,562,1559545200"; d="dat'59?scan'59,208,59";a="184496311" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga008.jf.intel.com with ESMTP; 29 Sep 2019 01:02:45 -0700 Received: from fmsmsx152.amr.corp.intel.com (10.18.125.5) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 29 Sep 2019 01:02:45 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by FMSMSX152.amr.corp.intel.com (10.18.125.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 29 Sep 2019 01:02:44 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.96]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.206]) with mapi id 14.03.0439.000; Sun, 29 Sep 2019 16:02:43 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH] BaseTools:Reconfig reset environment value set by edksetup script Thread-Topic: [PATCH] BaseTools:Reconfig reset environment value set by edksetup script Thread-Index: AdV2nEO3/51qBGOBTAOQMwBGShUzfA== Date: Sun, 29 Sep 2019 08:02:42 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 48268 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFC4B85SHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFC4B85SHSMSX101ccrcor_ Content-Type: text/plain; charset="windows-1256" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1985 Reconfig option should not only update build config files. This option should reset environment value set by edksetup script, such as EDK_TOOLS_PATH/PYTHONPATH. If so, this option will be valuable for the user to switch the different WORKSPACEs. We can locate BASETOOLS by setting the WORKSPACE in a directory separate from BASETOOLS,but it can't switch workspaces. for example, set WORKSPACE=3DC:\work\edk2 in directory C:\ run C:\work\edk2\edksetup in directory C:\ switch workspaces, set WORKSPACE=3DC:\workspace\edk2 run C:\workspace\edk2\edksetup in directory C:\ This situation does not apply with Reconfig, So I use the "clean" option to clear the environment variables associated with edksetup run "C:\workspace\edk2\edksetup clean" in directory C:\, run "C:\workspace\edk2\edksetup" in directory C:\ This patch is going to fix that issue. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- edksetup.bat | 28 ++++++++++++++++++++++++++-- edksetup.sh | 31 ++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/edksetup.bat b/edksetup.bat index 024f57a4b7..00075ca48e 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -25,6 +25,29 @@ pushd . cd %~dp0 =20 +if /I "%1" neq "Reconfig" ( + if /I "%1" neq "EnvClean" ( + goto CheckCD + ) +) + +set EDK_TOOLS_BIN=3D +set CONF_PATH=3D +set BASETOOLS_PYTHON_SOURCE=3D +set EDK_TOOLS_PATH=3D +set WORKSPACE=3D + +if /I "%1"=3D=3D"Reconfig" ( + echo reset environment value set by edksetup script + goto CheckCD +) + +if /I "%1"=3D=3D"EnvClean" ( + echo clean environment value set by edksetup script + goto end +) + +:CheckCD if not defined WORKSPACE ( goto SetWorkSpace ) @@ -142,9 +165,10 @@ if "%1"=3D=3D"" goto end =20 :Usage @echo. - @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Re= build] [ForceRebuild] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]" + @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Re= build] [EnvClean] [ForceRebuild] [VS2019] [VS2017] [VS2015] [VS2013] [VS201= 2]" @echo. - @echo Reconfig Reinstall target.txt, tools_def.txt and bui= ld_rule.txt. + @echo Reconfig Reinstall target.txt, tools_def.txt=EF=BC= =8C build_rule.txt and reset environment value set by edksetup script. + @echo EnvClean Clean environment value by edksetup script. @echo Rebuild Perform incremental rebuild of BaseTools bi= naries. @echo ForceRebuild Force a full rebuild of BaseTools binaries. @echo VS2012 Set the env for VS2012 build. diff --git a/edksetup.sh b/edksetup.sh index 06d2f041e6..211cdc7230 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -33,6 +33,8 @@ function HelpMsg() echo " --reconfig Overwrite the WORKSPACE/Conf/*.txt files w= ith the" echo " template files from the BaseTools/Conf dir= ectory." echo + echo " --envclean Clean environment value by edksetup script= ." + echo echo Please note: This script must be \'sourced\' so the environment can= be changed. echo ". $SCRIPTNAME" echo "source $SCRIPTNAME" @@ -44,6 +46,20 @@ function SetWorkspace() # If WORKSPACE is already set, then we can return right now # export PYTHONHASHSEED=3D1 + if [ -n $RECONFIG ] + then + echo reset environment value set by edksetup script + WORKSPACE=3D + CONF_PATH=3D + fi + + if [ -n $ENVCLEAN ] + then + echo clean environment value by edksetup script + WORKSPACE=3D + CONF_PATH=3D + return 0 + fi if [ -n "$WORKSPACE" ] then return 0 @@ -177,9 +193,14 @@ function SetupPython() =20 function SourceEnv() { - SetWorkspace && - SetupEnv - SetupPython + if [ -n $ENVCLEAN ] + then + SetWorkspace + else + SetWorkspace && + SetupEnv && + SetupPython + fi } =20 I=3D$# @@ -194,6 +215,10 @@ do RECONFIG=3DTRUE shift ;; + --envclean) + ENVCLEAN=3DTRUE + shift + ;;=20 *) HelpMsg break --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFC4B85SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+Im0pAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA6AQAAAAAAADsAAEJgAEAIQAAAEIyMDQ3Q0I0 RTFERUQ1NDg4QjY1QjQ1NEQ5QTdBMzcwAEAHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHCQAdAAgA AgAqAAAARAEBIIADAA4AAADjBwkAHQAIAAIAKgAAAEQBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEoAAABbUEFUQ0hdIEJhc2VUb29sczpSZWNvbmZpZyByZXNldCBlbnZp cm9ubWVudCB2YWx1ZSBzZXQgYnkgZWRrc2V0dXAgc2NyaXB0ADEbAQuAAQAhAAAAQjIwNDdDQjRF MURFRDU0ODhCNjVCNDU0RDlBN0EzNzAAQAcBA5AGALQSAAAzAAAAAgF/AAEAAABIAAAAPEZBRDBE N0UwQUUwRkE1NEQ5ODdGNkU3MjQzNUNBRkQ1MEFGQzRCODVAU0hTTVNYMTAxLmNjci5jb3JwLmlu dGVsLmNvbT4ACwAfDgEAAAACAQkQAQAAAN4IAADaCAAA0hQAAExaRnWnXCLaYQAKZmJpZAQAAGNj wHBnMTI1MgD+A0PwdGV4dAH3AqQD4wIABGNoCsBzZXQwIO8HbQKDAFARTTIKgAa0AoCWfQqACMg7 CWIxOQ7AvwnDFnIKMhZxAoAVYioJsHMJ8ASQYXQFsg5QA2Bzom8BgCBFeBHBbhgwXQZSdgSQF7YC EHIAwHR9CFBuGjEQIAXABaAbZGSaIANSIBAiF7JcdgiQ5HdrC4BkNR1TBPAHQA0XcDAKcRfyYmtt awZzAZAAICBCTV9C4EVHSU59CvwB8QvxER+wWjpoAkBwczrALy9idWd6AxALYCQudAcwbm8FoWUu AQWwZy9zaG93X0EiUS5jZ2k/DdA91RZwOB3gbAuAZQqBJRQCUgWRbmZpZyBvlQUwaQIgICPBdWwc YAcjEAVAAiBseSB1cP5kGIAZ4CJQAxAcYCYFJjDpHnBzLhJAaAQAJmUlBXcm5QlwEgEgCfAdYANg bvMHgAIwIHYHQApQJtArUf5iJ8AJgB9QEhAn4CbQBQPKLCbQdRHAIGEOACUUAEVES19UT09MAFNf UEFUSC9QMlkvwE9OL6IpcElm1SbQby4AdCmoIAPwIqD/KEAZ4CxCAaAecBxwBbAlBfsxIBngdRIA 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 HwBlAAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAf AGQAAQAAAAoAAABTAE0AVABQAAAAAAACAUEAAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAA AIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBA AGkAbgB0AGUAbAAuAGMAbwBtAAAAHwACXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkA bgB0AGUAbAAuAGMAbwBtAAAAAAAfAOVfAQAAADIAAABzAGkAcAA6AHoAaABpAGoAdQB4AC4AZgBh AG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAaDAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoA dQBYAAAAHwAfDAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBt AAAAAAAfAB4MAQAAAAoAAABTAE0AVABQAAAAAAACARkMAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDd AQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBm AGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwABXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEA bgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAPg/AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1 AFgAAAAfACNAAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAAAB8AIkABAAAACgAAAFMATQBUAFAAAAAAAAIB+T8BAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0B D1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYA YQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAldAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBu AEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAAsAQDoBAAAAHwAaAAEAAAASAAAASQBQAE0ALgBOAG8A dABlAAAAAAADAPE/CQQAAAsAQDoBAAAAAwD9P+QEAAACAQswAQAAABAAAACyBHy04d7VSItltFTZ p6NwAwAXAAEAAABAADkAAP3iRJx21QFAAAgwhRgHRZx21QEfAACAhgMCAAAAAADAAAAAAAAARgEA AAAeAAAAYQBjAGMAZQBwAHQAbABhAG4AZwB1AGEAZwBlAAAAAAABAAAADAAAAGUAbgAtAFUAUwAA AB8ANwABAAAAlAAAAFsAUABBAFQAQwBIAF0AIABCAGEAcwBlAFQAbwBvAGwAcwA6AFIAZQBjAG8A bgBmAGkAZwAgAHIAZQBzAGUAdAAgAGUAbgB2AGkAcgBvAG4AbQBlAG4AdAAgAHYAYQBsAHUAZQAg AHMAZQB0ACAAYgB5ACAAZQBkAGsAcwBlAHQAdQBwACAAcwBjAHIAaQBwAHQAAAAfAD0AAQAAAAIA AAAAAAAAAwA2AAAAAAACAXEAAQAAABYAAAAB1XacQ7f/nWoEY4FMA5AzAEZKFTN8AAAfAHAAAQAA AJQAAABbAFAAQQBUAEMASABdACAAQgBhAHMAZQBUAG8AbwBsAHMAOgBSAGUAYwBvAG4AZgBpAGcA IAByAGUAcwBlAHQAIABlAG4AdgBpAHIAbwBuAG0AZQBuAHQAIAB2AGEAbAB1AGUAIABzAGUAdAAg AGIAeQAgAGUAZABrAHMAZQB0AHUAcAAgAHMAYwByAGkAcAB0AAAAHwA1EAEAAACQAAAAPABGAEEA RAAwAEQANwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBFADcAMgA0ADMANQBDAEEARgBE ADUAMABBAEYAQwA0AEIAOAA1AEAAUwBIAFMATQBTAFgAMQAwADEALgBjAGMAcgAuAGMAbwByAHAA LgBpAG4AdABlAGwALgBjAG8AbQA+AAAAAwDeP+gEAABAAAcwdVUCRZx21QECAQsAAQAAABAAAACy BHy04d7VSItltFTZp6NwAwAmAAAAAAACAUcAAQAAADEAAABjPVVTO2E9TUNJO3A9SW50ZWw7bD1T SFNNU1gxMDEtMTkwOTI5MDgwMjQyWi00MjMAAAAAAgEQMAEAAABGAAAAAAAAACZ3vTk77DhJpKYV Pcule0IHAPrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxLp0rT60eaTGQAAAlUwBYAAAAA HwD6PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJWQEAAABAAACACCAGAAAAAADA AAAAAAAARgAAAAC/hQAAECy+Q5x21QELAACACCAGAAAAAADAAAAAAAAARgAAAACChQAAAAAAAB8A AICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBvAGQAdQBjAHQAAAABAAAAGgAA AGQAbABwAGUALQB3AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAYAAAA ZABsAHAALQB2AGUAcgBzAGkAbwBuAAAAAQAAABIAAAAxADEALgAyAC4AMAAuADYAAAAAAB8AAICG AwIAAAAAAMAAAAAAAABGAQAAABoAAABkAGwAcAAtAHIAZQBhAGMAdABpAG8AbgAAAAAAAQAAABQA AABuAG8ALQBhAGMAdABpAG8AbgAAAAMADTT9PwAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAIAAA AHgALQBtAHMALQBoAGEAcwAtAGEAdAB0AGEAYwBoAAAAAQAAAAIAAAAAAAAAHwAAgIYDAgAAAAAA wAAAAAAAAEYBAAAAIgAAAHgALQBvAHIAaQBnAGkAbgBhAHQAaQBuAGcALQBpAHAAAAAAAAEAAAAg AAAAWwAxADAALgAyADMAOQAuADEAMgA3AC4ANAAwAF0AAAAdAA== --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFC4B85SHSMSX101ccrcor_--