public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Bjorge, Erik C" <erik.c.bjorge@intel.com>
To: "Gao, Liming" <liming.gao@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Zhu, Yonghong" <yonghong.zhu@intel.com>,
	"Kinney, Michael D" <michael.d.kinney@intel.com>
Subject: Re: [Patch 3/4] BaseTools: Update Python Makefile not to depend on PYTHON_FREEZER_PATH
Date: Tue, 13 Sep 2016 00:00:43 +0000	[thread overview]
Message-ID: <7FE3244EBB31F1449E4EC79CFE44E3F4796FEE0E@ORSMSX108.amr.corp.intel.com> (raw)
In-Reply-To: <1473696210-6264-4-git-send-email-liming.gao@intel.com>

Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

> -----Original Message-----
> From: Gao, Liming
> Sent: Monday, September 12, 2016 9:03 AM
> To: edk2-devel@lists.01.org
> Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>
> Subject: [Patch 3/4] BaseTools: Update Python Makefile not to depend on
> PYTHON_FREEZER_PATH
> 
> If PYTHON_FREEZER_PATH is not set, Python tools will not be freeze.
> 
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Cc: Erik Bjorge <erik.c.bjorge@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Source/Python/Makefile | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/Makefile
> b/BaseTools/Source/Python/Makefile
> index 28be671..e7755cd 100644
> --- a/BaseTools/Source/Python/Makefile
> +++ b/BaseTools/Source/Python/Makefile
> @@ -11,16 +11,17 @@
>  # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
>  #
> 
> -!IFNDEF PYTHON_FREEZER_PATH
> -!ERROR PYTHON_FREEZER_PATH must be defined!
> +!IFNDEF PYTHON_HOME
> +!ERROR PYTHON_HOME must be defined!
>  !ENDIF
> 
> +!IFDEF PYTHON_FREEZER_PATH
>  !IF EXIST ($(PYTHON_FREEZER_PATH)\cxfreeze)
>  # Using cx_Freeze 4.2.3 with Python 2.7.2
>  FREEZE=$(PYTHON_HOME)\python $(PYTHON_FREEZER_PATH)\cxfreeze
>  !ELSE
> -# Using cx_Freeze 3.0.3 with Python 2.5.4
> -FREEZE=$(PYTHON_FREEZER_PATH)\FreezePython.exe
> +!ERROR PYTHON_FREEZER_PATH does not exist!
> +!ENDIF
>  !ENDIF
> 
> 
> MODULES=encodings.cp437,encodings.gbk,encodings.utf_16,encodings.utf_8,e
> ncodings.utf_16_le,encodings.latin_1,encodings.ascii
> @@ -236,7 +237,14 @@
> CMD_UPT=$(BASE_TOOLS_PATH)\Source\Python\UPT\Core\DependencyRules.py \
>      $(BASE_TOOLS_PATH)\Source\Python\UPT\Xml\XmlParser.py \
>      $(BASE_TOOLS_PATH)\Source\Python\UPT\Xml\XmlParserMisc.py
> 
> +!IFDEF PYTHON_FREEZER_PATH
>  all: SetPythonPath $(APPLICATIONS)
> +!ELSE
> +all:
> +  @echo.
> +  @echo !!! WARNING !!! PYTHON_FREEZER_PATH is not set.
> +  @echo Cannot make executable from Python code, executing python
> scripts instead !!!
> +!ENDIF
> 
>  SetPythonPath:
>    set PYTHONPATH=$(BASE_TOOLS_PATH)\Source\Python
> @@ -310,5 +318,6 @@ $(BIN_DIR)\TestRoot.pub.pem:
> $(BASE_TOOLS_PATH)\Source\Python\Pkcs7Sign\TestRoot
>  clean:
>  cleanall:
>    @del /f /q $(BIN_DIR)\*.pyd $(BIN_DIR)\*.dll
> +  @del /f /q $(BASE_TOOLS_PATH)\Source\Python\*.pyc
>    @for %%i in ($(APPLICATIONS)) do @del /f /q %%i
> 
> --
> 2.8.0.windows.1



  reply	other threads:[~2016-09-13  0:00 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-12 16:03 [Patch 0/4] Add support for running python tools from source on Windows Liming Gao
2016-09-12 16:03 ` [Patch 1/4] BaseTools: Add Windows batch files to run python tool from Source Liming Gao
2016-09-12 23:59   ` Bjorge, Erik C
2016-09-12 16:03 ` [Patch 2/4] BaseTools: Update python tool to call external tools with shell true mode Liming Gao
2016-09-13  0:00   ` Bjorge, Erik C
2016-09-12 16:03 ` [Patch 3/4] BaseTools: Update Python Makefile not to depend on PYTHON_FREEZER_PATH Liming Gao
2016-09-13  0:00   ` Bjorge, Erik C [this message]
2016-09-12 16:03 ` [Patch 4/4] BaseTools: Update toolsetup.bat to set PYTHONPATH env to run python source Liming Gao
2016-09-13  0:13   ` Bjorge, Erik C
2016-09-21  2:50 ` [Patch 0/4] Add support for running python tools from source on Windows Zhu, Yonghong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7FE3244EBB31F1449E4EC79CFE44E3F4796FEE0E@ORSMSX108.amr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox