Sync BaseTool trunk (version r2423) into EDKII BaseTools. The change mainly includes:

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

diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/Makefile
index f6890787ee20836c148b1610042a5de48e07ea97..a1a0a5e6391b1d1439ade80a7f0c0c028986c544 100644 (file)
--- a/BaseTools/Source/Python/Makefile
+++ b/BaseTools/Source/Python/Makefile
@@ -27,7 +27,6 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
               $(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\DecClassObjectLight.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
@@ -38,7 +37,6 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
               $(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\InfClassObjectLight.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
@@ -46,8 +44,6 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
               $(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
-              $(BASE_TOOLS_PATH)\Source\Python\Common\XmlParser.py \\r
-              $(BASE_TOOLS_PATH)\Source\Python\Common\XmlRoutines.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\__init__.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Common\BuildVersion.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Workspace\BuildClassObject.py \\r
@@ -65,6 +61,7 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
               $(BASE_TOOLS_PATH)\Source\Python\Autogen\UniClassObject.py \\r
               $(BASE_TOOLS_PATH)\Source\Python\Autogen\__init__.py\r
 \r
+UPT_BUILDVERSION_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\UPT\BuildVersion.py\r
               \r
 all: SetPythonPath $(APPLICATIONS)\r
 \r
@@ -104,7 +101,7 @@ $(BIN_DIR)\PatchPcdValue.exe: $(BASE_TOOLS_PATH)\Source\Python\PatchPcdValue\Pat
 $(BIN_DIR)\BPDG.exe: $(BASE_TOOLS_PATH)\Source\Python\BPDG\BPDG.py $(COMMON_PYTHON)\r
   @pushd . & @cd BPDG & @$(FREEZE) --include-modules=$(MODULES) --install-dir=$(BIN_DIR) BPDG.py & @popd\r
 \r
-$(BIN_DIR)\UPT.exe: $(BASE_TOOLS_PATH)\Source\Python\UPT\UPT.py $(BASE_TOOLS_PATH)\Source\Python\UPT\UPT.py $(COMMON_PYTHON)\r
+$(BIN_DIR)\UPT.exe: $(BASE_TOOLS_PATH)\Source\Python\UPT\UPT.py $(UPT_BUILDVERSION_PYTHON)\r
   @pushd . & @cd UPT & @$(FREEZE) --include-modules=$(MODULES) --install-dir=$(BIN_DIR) UPT.py & @popd\r
 \r
 clean:\r