BaseTools: Replace StandardError with Expression

[mirror_edk2.git] / BaseTools / Source / Python / Makefile

diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/Makefile
index 28be6717fef6942d33e48179e8fb5b88029789f0..d78b12d5050d166489b1957987de529825c3741b 100644 (file)
--- a/BaseTools/Source/Python/Makefile
+++ b/BaseTools/Source/Python/Makefile
@@ -1,7 +1,7 @@
 ## @file\r
 # Windows makefile for Python tools build.\r
 #\r
-# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -11,16 +11,17 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-!IFNDEF PYTHON_FREEZER_PATH\r
-!ERROR PYTHON_FREEZER_PATH must be defined!\r
+!IFNDEF PYTHON_HOME\r
+!ERROR PYTHON_HOME must be defined!\r
 !ENDIF\r
 \r
+!IFDEF PYTHON_FREEZER_PATH\r
 !IF EXIST ($(PYTHON_FREEZER_PATH)\cxfreeze)\r
 # Using cx_Freeze 4.2.3 with Python 2.7.2\r
 FREEZE=$(PYTHON_HOME)\python $(PYTHON_FREEZER_PATH)\cxfreeze\r
 !ELSE\r
-# Using cx_Freeze 3.0.3 with Python 2.5.4\r
-FREEZE=$(PYTHON_FREEZER_PATH)\FreezePython.exe\r
+!ERROR PYTHON_FREEZER_PATH does not exist!\r
+!ENDIF\r
 !ENDIF\r
 \r
 MODULES=encodings.cp437,encodings.gbk,encodings.utf_16,encodings.utf_8,encodings.utf_16_le,encodings.latin_1,encodings.ascii\r
@@ -36,25 +37,16 @@ APPLICATIONS=$(BIN_DIR)\build.exe $(BIN_DIR)\GenFds.exe $(BIN_DIR)\Trim.exe $(BI
 COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\Database.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\DataType.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\DecClassObject.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\Dictionary.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\DscClassObject.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\EdkIIWorkspace.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\EdkIIWorkspaceBuild.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\EdkLogger.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\Expression.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\FdfClassObject.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\FdfParserLite.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\GlobalData.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\Identification.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\InfClassObject.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\LongFilePathOs.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\LongFilePathOsPath.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\LongFilePathSupport.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\MigrationUtilities.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\Misc.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\Parsing.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\String.py \\r
+              $(BASE_TOOLS_PATH)\Source\Python\Common\StringUtils.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\TargetTxtClassObject.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\ToolDefClassObject.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\VpdInfoFile.py \\r
@@ -64,9 +56,6 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
               $(BASE_TOOLS_PATH)\Source\Python\CommonDataClass\DataClass.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\CommonDataClass\Exceptions.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\CommonDataClass\FdfClass.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\CommonDataClass\ModuleClass.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\CommonDataClass\PackageClass.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\CommonDataClass\PlatformClass.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Table\Table.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Table\TableDataModel.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Table\TableDec.py \\r
@@ -87,6 +76,9 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
               $(BASE_TOOLS_PATH)\Source\Python\Workspace\MetaFileTable.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Workspace\WorkspaceCommon.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Workspace\WorkspaceDatabase.py \\r
+              $(BASE_TOOLS_PATH)\Source\Python\Workspace\DecBuildData.py \\r
+              $(BASE_TOOLS_PATH)\Source\Python\Workspace\DscBuildData.py \\r
+              $(BASE_TOOLS_PATH)\Source\Python\Workspace\InfBuildData.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\AutoGen\AutoGen.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\AutoGen\BuildEngine.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\AutoGen\GenC.py \\r
@@ -97,6 +89,7 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
               $(BASE_TOOLS_PATH)\Source\Python\AutoGen\StrGather.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\AutoGen\UniClassObject.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\AutoGen\ValidCheckingInfoObject.py \\r
+              $(BASE_TOOLS_PATH)\Source\Python\AutoGen\GenVar.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\RangeExpression.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\VariableAttributes.py\r
 \r
@@ -114,7 +107,6 @@ CMD_BUILD=$(BASE_TOOLS_PATH)\Source\Python\build\BuildReport.py \
     $(BASE_TOOLS_PATH)\Source\Python\Eot\EotGlobalData.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\Eot\EotToolError.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\Eot\FileProfile.py \\r
-    $(BASE_TOOLS_PATH)\Source\Python\Eot\FvImage.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\Eot\InfParserLite.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\Eot\LzmaCompressor.pyd \\r
     $(BASE_TOOLS_PATH)\Source\Python\Eot\Parser.py \\r
@@ -175,7 +167,7 @@ CMD_UPT=$(BASE_TOOLS_PATH)\Source\Python\UPT\Core\DependencyRules.py \
     $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\Misc.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\ParserValidate.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\Parsing.py \\r
-    $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\String.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\StringUtils.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\UniClassObject.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\UPT\Library\Xml\XmlRoutines.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\UPT\Logger\Log.py \\r
@@ -236,7 +228,34 @@ CMD_UPT=$(BASE_TOOLS_PATH)\Source\Python\UPT\Core\DependencyRules.py \
     $(BASE_TOOLS_PATH)\Source\Python\UPT\Xml\XmlParser.py \\r
     $(BASE_TOOLS_PATH)\Source\Python\UPT\Xml\XmlParserMisc.py\r
 \r
+CMD_ECC=$(BASE_TOOLS_PATH)\Source\Python\Ecc\c.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\Check.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\CLexer.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\CodeFragment.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\CodeFragmentCollector.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\Configuration.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\CParser.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\Database.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\Ecc.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\EccGlobalData.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\EccToolError.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\Exception.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\FileProfile.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\MetaDataParser.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\ParserWarning.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\MetaFileWorkspace\MetaDataTable.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\MetaFileWorkspace\MetaFileParser.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\MetaFileWorkspace\MetaFileTable.py \\r
+    $(BASE_TOOLS_PATH)\Source\Python\Ecc\Xml\XmlRoutines.py\r
+\r
+!IFDEF PYTHON_FREEZER_PATH\r
 all: SetPythonPath $(APPLICATIONS)\r
+!ELSE\r
+all:\r
+  @echo.\r
+  @echo !!! WARNING !!! PYTHON_FREEZER_PATH is not set.\r
+  @echo Cannot make executable from Python code, executing python scripts instead !!!\r
+!ENDIF\r
 \r
 SetPythonPath:\r
   set PYTHONPATH=$(BASE_TOOLS_PATH)\Source\Python\r
@@ -310,5 +329,6 @@ $(BIN_DIR)\TestRoot.pub.pem: $(BASE_TOOLS_PATH)\Source\Python\Pkcs7Sign\TestRoot
 clean:\r
 cleanall:  \r
   @del /f /q $(BIN_DIR)\*.pyd $(BIN_DIR)\*.dll\r
+  @del /f /q $(BASE_TOOLS_PATH)\Source\Python\*.pyc\r
   @for %%i in ($(APPLICATIONS)) do @del /f /q %%i\r
 \r