From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9D61C1A1E1E for ; Mon, 12 Sep 2016 17:00:45 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP; 12 Sep 2016 17:00:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,325,1470726000"; d="scan'208";a="7631444" Received: from orsmsx109.amr.corp.intel.com ([10.22.240.7]) by fmsmga006.fm.intel.com with ESMTP; 12 Sep 2016 17:00:45 -0700 Received: from orsmsx112.amr.corp.intel.com (10.22.240.13) by ORSMSX109.amr.corp.intel.com (10.22.240.7) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 12 Sep 2016 17:00:44 -0700 Received: from orsmsx108.amr.corp.intel.com ([169.254.2.61]) by ORSMSX112.amr.corp.intel.com ([169.254.3.251]) with mapi id 14.03.0248.002; Mon, 12 Sep 2016 17:00:44 -0700 From: "Bjorge, Erik C" To: "Gao, Liming" , "edk2-devel@lists.01.org" CC: "Zhu, Yonghong" , "Kinney, Michael D" Thread-Topic: [Patch 3/4] BaseTools: Update Python Makefile not to depend on PYTHON_FREEZER_PATH Thread-Index: AQHSDQ91PPhu45IRt0qDgA7b089N1aB2iZWA Date: Tue, 13 Sep 2016 00:00:43 +0000 Message-ID: <7FE3244EBB31F1449E4EC79CFE44E3F4796FEE0E@ORSMSX108.amr.corp.intel.com> References: <1473696210-6264-1-git-send-email-liming.gao@intel.com> <1473696210-6264-4-git-send-email-liming.gao@intel.com> In-Reply-To: <1473696210-6264-4-git-send-email-liming.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzMzY2FkNjktOTVmMS00NGQzLTg4YTMtOWUyMjg5OTQ5YWYzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6InhtRHA1WUp2NUdwcWhaYnlST1VURjRFcERKTzRXTzNZeHNaRXd2NXdSMUE9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Subject: Re: [Patch 3/4] BaseTools: Update Python Makefile not to depend on PYTHON_FREEZER_PATH 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:00:45 -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:03 AM > To: edk2-devel@lists.01.org > Cc: Zhu, Yonghong ; Kinney, Michael D > ; Bjorge, Erik C > Subject: [Patch 3/4] BaseTools: Update Python Makefile not to depend on > PYTHON_FREEZER_PATH >=20 > If PYTHON_FREEZER_PATH is not set, Python tools will not be freeze. >=20 > Cc: Yonghong Zhu > Cc: Michael Kinney > Cc: Erik Bjorge > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Liming Gao > --- > BaseTools/Source/Python/Makefile | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) >=20 > 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. > # >=20 > -!IFNDEF PYTHON_FREEZER_PATH > -!ERROR PYTHON_FREEZER_PATH must be defined! > +!IFNDEF PYTHON_HOME > +!ERROR PYTHON_HOME must be defined! > !ENDIF >=20 > +!IFDEF PYTHON_FREEZER_PATH > !IF EXIST ($(PYTHON_FREEZER_PATH)\cxfreeze) > # Using cx_Freeze 4.2.3 with Python 2.7.2 > FREEZE=3D$(PYTHON_HOME)\python $(PYTHON_FREEZER_PATH)\cxfreeze > !ELSE > -# Using cx_Freeze 3.0.3 with Python 2.5.4 > -FREEZE=3D$(PYTHON_FREEZER_PATH)\FreezePython.exe > +!ERROR PYTHON_FREEZER_PATH does not exist! > +!ENDIF > !ENDIF >=20 >=20 > MODULES=3Dencodings.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=3D$(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 >=20 > +!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 >=20 > SetPythonPath: > set PYTHONPATH=3D$(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 >=20 > -- > 2.8.0.windows.1