1. Added TOOLCHAIN macro in makefile as well as TOOLCHAIN_TAG for bac…

…kward-compatibility. 2. Upgrade the build version git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1304 7335b38e-4728-0410-8992-fb3ffe349368
mcb30 · Aug 14, 2008 · 983c64f · 983c64f
1 parent b6f00d7
commit 983c64f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Source/Python/AutoGen/GenMake.py b/Source/Python/AutoGen/GenMake.py
@@ -226,6 +226,7 @@ class ModuleMakefile(BuildFile):
 # Build Configuration Macro Definition
 #
 ARCH = ${architecture}
+TOOLCHAIN = ${toolchain_tag}
 TOOLCHAIN_TAG = ${toolchain_tag}
 TARGET = ${build_target}
 
@@ -962,6 +963,7 @@ class CustomMakefile(BuildFile):
 # Build Configuration Macro Definition
 #
 ARCH = ${architecture}
+TOOLCHAIN = ${toolchain_tag}
 TOOLCHAIN_TAG = ${toolchain_tag}
 TARGET = ${build_target}
 
@@ -1110,6 +1112,7 @@ class PlatformMakefile(BuildFile):
 #
 # Build Configuration Macro Definition
 #
+TOOLCHAIN = ${toolchain_tag}
 TOOLCHAIN_TAG = ${toolchain_tag}
 TARGET = ${build_target}
 
@@ -1285,6 +1288,7 @@ class TopLevelMakefile(BuildFile):
 #
 # Build Configuration Macro Definition
 #
+TOOLCHAIN = ${toolchain_tag}
 TOOLCHAIN_TAG = ${toolchain_tag}
 TARGET = ${build_target}
 
@@ -1335,7 +1339,7 @@ class TopLevelMakefile(BuildFile):
 #
 fds: init
 \t-@cd $(FV_DIR)
-${BEGIN}\tGenFds -f ${fdf_file} -o $(BUILD_DIR) -t $(TOOLCHAIN_TAG) -b $(TARGET) -p ${active_platform} -a ${build_architecture_list} ${log_level}${END}${BEGIN} -r ${fd} ${END}${BEGIN} -i ${fv} ${END}${BEGIN} -y ${macro} ${END}
+${BEGIN}\tGenFds -f ${fdf_file} -o $(BUILD_DIR) -t $(TOOLCHAIN) -b $(TARGET) -p ${active_platform} -a ${build_architecture_list} ${log_level}${END}${BEGIN} -r ${fd} ${END}${BEGIN} -i ${fv} ${END}${BEGIN} -y ${macro} ${END}
 
 #
 # run command for emulator platform only

diff --git a/Source/Python/build/build.py b/Source/Python/build/build.py
@@ -39,7 +39,7 @@
 import Common.GlobalData as GlobalData
 
 # Version and Copyright
-VersionNumber = "0.1"
+VersionNumber = "0.5"
 __version__ = "%prog Version " + VersionNumber
 __copyright__ = "Copyright (c) 2007, Intel Corporation  All rights reserved."