1) Incorporated generating top level makefile. Now platform build is possible (no...
authorjwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 25 Jun 2007 17:00:40 +0000 (17:00 +0000)
committerjwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 25 Jun 2007 17:00:40 +0000 (17:00 +0000)
2) Added GenFw.exe for EFI file generation
3) Changed the destination directory of *.template file to WORKSPACE/Conf
4) Commented out several modules in the MdePkg.dsc file since they cannot be found in the MdePkg package directory.
5) Removed the usage of WORKSPACE_DIR macro in makefile. WORKSPACE is used instead all the way.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2733 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Bin/Win32/GenFw.exe [new file with mode: 0644]
BaseTools/Bin/Win32/build.exe
BaseTools/Conf/build_rule.template
BaseTools/toolsetup.bat
MdePkg/MdePkg.dsc

diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe
new file mode 100644 (file)
index 0000000..b751d1e
Binary files /dev/null and b/BaseTools/Bin/Win32/GenFw.exe differ
index 1125bcf..9f78207 100644 (file)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ
index 3fede25..db459d9 100644 (file)
@@ -92,24 +92,24 @@ ToolChainFamilyMapping = {
 Makefile = {
 "nmake"        : {
 "C-Code"    : '''\
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep}
+${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
 ${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(MODULE_DIR)${sep}${fdir}${sep}${fname}
 ''',
 
 "AutoGen-Code"    : '''\
-${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep}
+${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
 ${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(DEBUG_DIR)${sep}${fname}
 ''',
 
 "Masm-Code" : '''\
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep}
+${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
 ${END} "$(PP)" $(PP_FLAGS) $(INC) $(MODULE_DIR)${sep}${fdir}${sep}${fname} > $(@D)${sep}${fbase}.i
        Trim -CONVERT $(@D)${sep}${fbase}.i
        "$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.iii
 ''',
 
 "Iasm-Code" : '''\
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep}
+${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
 ${END} "$(APP)" $(APP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)${sep}${fbase}.i
        "$(ASM)" $(ASM_FLAGS) $(ASM_OUTPUT)$@ $(@D)${sep}${fbase}.i
 ''',
index 3f474a0..9b5f45e 100644 (file)
@@ -78,24 +78,24 @@ echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH%
 echo.\r
 \r
 REM\r
-REM copy *.template to %EDK_TOOLS_PATH%\Conf\r
+REM copy *.template to %WORKSPACE%\Conf\r
 REM\r
-if NOT exist %EDK_TOOLS_PATH%\Conf mkdir %EDK_TOOLS_PATH%\Conf\r
-if NOT exist %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db (\r
-  echo copying ... FrameworkDatabase.template to %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db\r
-  copy %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db > nul\r
+if NOT exist %WORKSPACE%\Conf mkdir %WORKSPACE%\Conf\r
+if NOT exist %WORKSPACE%\Conf\FrameworkDatabase.db (\r
+  echo copying ... FrameworkDatabase.template to %WORKSPACE%\Conf\FrameworkDatabase.db\r
+  copy %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %WORKSPACE%\Conf\FrameworkDatabase.db > nul\r
 )\r
-if NOT exist %EDK_TOOLS_PATH%\Conf\target.txt (\r
-  echo copying ... target.template to %EDK_TOOLS_PATH%\Conf\target.txt\r
-  copy %EDK_TOOLS_PATH%\Conf\target.template %EDK_TOOLS_PATH%\Conf\target.txt > nul\r
+if NOT exist %WORKSPACE%\Conf\target.txt (\r
+  echo copying ... target.template to %WORKSPACE%\Conf\target.txt\r
+  copy %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul\r
 )\r
-if NOT exist %EDK_TOOLS_PATH%\Conf\tools_def.txt (\r
-  echo copying ... tools_def.template to %EDK_TOOLS_PATH%\Conf\tools_def.txt\r
-  copy %EDK_TOOLS_PATH%\Conf\tools_def.template %EDK_TOOLS_PATH%\Conf\tools_def.txt > nul\r
+if NOT exist %WORKSPACE%\Conf\tools_def.txt (\r
+  echo copying ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt\r
+  copy %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul\r
 )\r
-if NOT exist %EDK_TOOLS_PATH%\Conf\build_rule.txt (\r
-  echo copying ... build_rule.template to %EDK_TOOLS_PATH%\Conf\build_rule.txt\r
-  copy %EDK_TOOLS_PATH%\Conf\build_rule.template %EDK_TOOLS_PATH%\Conf\build_rule.txt > nul\r
+if NOT exist %WORKSPACE%\Conf\build_rule.txt (\r
+  echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r
+  copy %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul\r
 )\r
 \r
 REM\r
index a55bc86..5b1bf52 100644 (file)
@@ -84,7 +84,7 @@
   ${WORKSPACE}\MdePkg\Library/BasePciLibCf8/BasePciLibCf8.inf\r
   ${WORKSPACE}\MdePkg\Library/BasePciLibPciExpress/BasePciLibPciExpress.inf\r
   ${WORKSPACE}\MdePkg\Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePeCoffLib/BasePeCoffLib.inf\r
+#  ${WORKSPACE}\MdePkg\Library/BasePeCoffLib/BasePeCoffLib.inf\r
   ${WORKSPACE}\MdePkg\Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
   ${WORKSPACE}\MdePkg\Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf\r
   ${WORKSPACE}\MdePkg\Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf\r
   ${WORKSPACE}\MdePkg\Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
   ${WORKSPACE}\MdePkg\Library/DxePcdLib/DxePcdLib.inf\r
   ${WORKSPACE}\MdePkg\Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/DxeSmbusLib/DxeSmbusLib.inf\r
+#  ${WORKSPACE}\MdePkg\Library/DxeSmbusLib/DxeSmbusLib.inf\r
   ${WORKSPACE}\MdePkg\Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiHobLib/PeiHobLib.inf\r
+#  ${WORKSPACE}\MdePkg\Library/PeiHobLib/PeiHobLib.inf\r
   ${WORKSPACE}\MdePkg\Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
   ${WORKSPACE}\MdePkg\Library/PeimEntryPoint/PeimEntryPoint.inf\r
   ${WORKSPACE}\MdePkg\Library/PeiPcdLib/PeiPcdLib.inf\r
   ${WORKSPACE}\MdePkg\Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf\r
   ${WORKSPACE}\MdePkg\Library/PeiServicesLib/PeiServicesLib.inf\r
   ${WORKSPACE}\MdePkg\Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiSmbusLib/PeiSmbusLib.inf\r
+#  ${WORKSPACE}\MdePkg\Library/PeiSmbusLib/PeiSmbusLib.inf\r
   ${WORKSPACE}\MdePkg\Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
   ${WORKSPACE}\MdePkg\Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
   ${WORKSPACE}\MdePkg\Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r