Skip to content

Commit

Permalink
Merged the latest changes in edk2 tree
Browse files Browse the repository at this point in the history 
git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1259 7335b38e-4728-0410-8992-fb3ffe349368
  • Loading branch information
jwang36 committed Jun 18, 2008
1 parent 976beaf commit e7c41a6
Show file tree
Hide file tree
Showing 3 changed files with 448 additions and 238 deletions.
44 changes: 27 additions & 17 deletions Conf/build_rule.template
View file
Expand Up @@ -78,7 +78,7 @@

## Reserved File-Type
#
# Dont't change following names of file types and their associated files,
# Don't change following names of file types and their associated files,
# which are also used in tools' code
#
# C-Code-File
Expand All @@ -98,6 +98,7 @@
?.cpp
?.Cpp
?.CPP
$(MAKE_FILE)

<OutputFile>
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
Expand All @@ -122,9 +123,11 @@
[Build.Assembly-Code-File]
<InputFile.MSFT, InputFile.INTEL>
Assembly-Code-File = ?.asm, ?.Asm, ?.ASM
$(MAKE_FILE)

<InputFile.GCC>
?.S
$(MAKE_FILE)

<OutputFile>
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
Expand All @@ -135,11 +138,14 @@
"$(ASM)" /Fo${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii

<Command.GCC>
"$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${src}
"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
"$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii

[Build.Iasm-Code-File]
<InputFile>
?.s
$(MAKE_FILE)

<OutputFile>
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
Expand All @@ -154,6 +160,7 @@
?.vfr
?.Vfr
?.VFR
$(MAKE_FILE)

<OutputFile>
$(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c
Expand All @@ -162,7 +169,7 @@
"$(PP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
Trim --vfr-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
-mkdir ${d_path} > NUL 2>&1
VfrCompile -od ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
VfrCompile -l --no-pre-processing --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

[Build.Object-File]
<InputFile>
Expand Down Expand Up @@ -195,9 +202,15 @@
# "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src1} -( ${src2} -)
#
[Build.Static-Library-File]
<InputFile>
<InputFile.MSFT, InputFile.Intel>
?.lib
$(LIBS)
$(MAKE_FILE)

<InputFile.GCC>
?.lib
$(LIBS)
$(MAKE_FILE)

<OutputFile>
$(DEBUG_DIR)(+)$(MODULE_NAME).dll
Expand All @@ -206,16 +219,11 @@
"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src}

<Command.GCC>
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(LIBS) ${src} -)
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\)

[Build.Dynamic-Library-File]
<InputFile.MSFT, InputFile.INTEL>
?.dll
$(MODULE_BUILD_DIR)\Makefile

<InputFile.GCC>
<InputFile>
?.dll
$(MODULE_BUILD_DIR)\Makefile

<OutputFile>
$(DEBUG_DIR)(+)$(MODULE_NAME).efi
Expand All @@ -234,7 +242,9 @@
$(OUTPUT_DIR)(+)$(MODULE_NAME).depex

<Command>
# GenDepex -o ${dst} ${src}
"$(PP)" $(CC_FLAGS) $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

[Build.Acpi-Source-Language-File]
<InputFile>
Expand All @@ -245,7 +255,7 @@

<Command.MSFT, Command.INTEL>
"$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
"$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i
"$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_base}.i

[Build.Acpi-Table-Code-File]
<InputFile>
Expand All @@ -264,13 +274,12 @@
?.asm16, ?.Asm16, ?.ASM16

<OutputFile>
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.com
$(OUTPUT_DIR)(+)${s_base}.com

<Command.MSFT, Command.INTEL>
pushd .
cd $(OUTPUT_DIR)(+)${s_dir}
"$(ASM)" /nologo /omf ${src} /Bl"$(ASMLINK)" $(ASMLINK_FLAGS)
-$(CP) ${dst} $(OUTPUT_DIR) & popd
"$(ASM)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src}
"$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,

[Build.Microcode-File]
<InputFile>
Expand All @@ -291,6 +300,7 @@

<Command>
GenFw -o ${dst} -j ${src}
-$(CP) ${dst} $(BIN_DIR)

[Build.Unicode-Text-File]
<InputFile>
Expand Down
33 changes: 20 additions & 13 deletions Conf/target.template
View file
Expand Up @@ -20,29 +20,30 @@
# PROPERTY Type Use Description
# ---------------- -------- -------- -----------------------------------------------------------
# ACTIVE_PLATFORM Filename Recommended Specify the WORKSPACE relative Path and Filename
# of the platform FPD file that will be used for the build
# This line is required if and only if the current working
# directory does not contain one or more FPD files.
# of the platform description file that will be used for the
# build. This line is required if and only if the current
# working directory does not contain one or more description
# files.
ACTIVE_PLATFORM = Nt32Pkg/Nt32Pkg.dsc

# TARGET List Optional Zero or more of the following: DEBUG, RELEASE,
# UserDefined; separated by a space character.
# If the line is missing or no value is specified, all
# valid targets specified in the FPD file will attempt
# to be built. The following line will build all platform
# targets.
# valid targets specified in the platform description file
# will attempt to be built. The following line will build all
# platform targets.
TARGET = DEBUG

# TARGET_ARCH List Optional What kind of architecture is the binary being target for.
# One, or more, of the following, IA32, IPF, X64, EBC or ARM.
# Multiple values can be specified on a single line, using
# space charaters to separate the values. These are used
# during the parsing of an FPD file, restricting the build
# output target(s.)
# during the parsing of an platform description file,
# restricting the build output target(s.)
# The Build Target ARCH is determined by a logical AND of:
# FPD BuildOptions: <SupportedArchitectures> tag
# platform BuildOptions: <SupportedArchitectures> tag
# If not specified, then all valid architectures specified
# in the FPD file, for which tools are available, will be
# in the platform file, for which tools are available, will be
# built.
TARGET_ARCH = IA32

Expand All @@ -63,9 +64,15 @@ TOOL_CHAIN_TAG = MYTOOLS
# This feature is only available for "spawn" build mode, and
# only for PLATFORM build. The clean, cleanall or
# stand-alone module build is still using the normal way.
MULTIPLE_THREAD = Disable
MULTIPLE_THREAD = Enable

# MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. Default is 2. Recommend to
# MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. Default is 1. Recommend to
# set this value to one more than the number of your compurter
# cores or CPUs.
MAX_CONCURRENT_THREAD_NUMBER = 2
MAX_CONCURRENT_THREAD_NUMBER = 1

# Build rules definition
#
#
BUILD_RULE_CONF = Conf/build_rule.txt

0 comments on commit e7c41a6

Please sign in to comment.