Sync BaseTool trunk (version r2423) into EDKII BaseTools. The change mainly includes:
1. Fix !include issues 2. Fix Trim to skip the postfix 'U' for hexadecimal and decimal numbers 3. Fix building error C2733 when building C++ code. 4. Add GCC46 tool chain definition 5. Add new RVCT and RVCTLINUX tool chains Signed-off-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12782 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@ -27,7 +27,6 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\Database.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\DataType.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\DecClassObject.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\DecClassObjectLight.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\Dictionary.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\DscClassObject.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\EdkIIWorkspace.py \
|
||||
@ -38,7 +37,6 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\GlobalData.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\Identification.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\InfClassObject.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\InfClassObjectLight.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\MigrationUtilities.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\Misc.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\Parsing.py \
|
||||
@ -46,8 +44,6 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\TargetTxtClassObject.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\ToolDefClassObject.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\VpdInfoFile.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\XmlParser.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\XmlRoutines.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\__init__.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Common\BuildVersion.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Workspace\BuildClassObject.py \
|
||||
@ -65,6 +61,7 @@ COMMON_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\Common\BuildToolError.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Autogen\UniClassObject.py \
|
||||
$(BASE_TOOLS_PATH)\Source\Python\Autogen\__init__.py
|
||||
|
||||
UPT_BUILDVERSION_PYTHON=$(BASE_TOOLS_PATH)\Source\Python\UPT\BuildVersion.py
|
||||
|
||||
all: SetPythonPath $(APPLICATIONS)
|
||||
|
||||
@ -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)
|
||||
@pushd . & @cd BPDG & @$(FREEZE) --include-modules=$(MODULES) --install-dir=$(BIN_DIR) BPDG.py & @popd
|
||||
|
||||
$(BIN_DIR)\UPT.exe: $(BASE_TOOLS_PATH)\Source\Python\UPT\UPT.py $(BASE_TOOLS_PATH)\Source\Python\UPT\UPT.py $(COMMON_PYTHON)
|
||||
$(BIN_DIR)\UPT.exe: $(BASE_TOOLS_PATH)\Source\Python\UPT\UPT.py $(UPT_BUILDVERSION_PYTHON)
|
||||
@pushd . & @cd UPT & @$(FREEZE) --include-modules=$(MODULES) --install-dir=$(BIN_DIR) UPT.py & @popd
|
||||
|
||||
clean:
|
||||
|
Reference in New Issue
Block a user