X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkShellPkg%2FEdkShellPkg.dsc;h=7986dbc99b8a4b814d9bd0c306ab66c5b28bcca6;hp=322a6a7a8d42c756ed29dfffa54ba23006e22999;hb=b703aec9f1af9b86a4fafef56729ecf993547118;hpb=b6d1a17dd7ef1ded75c92bef51d8bd559744f981

diff --git a/EdkShellPkg/EdkShellPkg.dsc b/EdkShellPkg/EdkShellPkg.dsc
index 322a6a7a8d..7986dbc99b 100644
--- a/EdkShellPkg/EdkShellPkg.dsc
+++ b/EdkShellPkg/EdkShellPkg.dsc
@@ -24,6 +24,15 @@
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
+# 
+# Change the macro to the directory containing the source code from EDK Shell Project.  
+# This is a workspace relative directory
+#
+# DEFINE EDK_SHELL_DIR           = EdkShellPkg/Shell  # when "Shell" directory is under $(WORKSPACE)/EdkShellPkg 
+#
+DEFINE EDK_SHELL_DIR             = Shell  # when "Shell" directory is directly under $(WORKSPACE) 
+
+
 
 [Libraries]
   #
@@ -34,8 +43,7 @@
   EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
   EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
   EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
-  EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIA64Lib/CpuIA64Lib.inf
-  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
+  EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf
   EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf
   EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
   #
@@ -68,63 +76,81 @@
   #
   # Shell Library
   #
-  EdkShellPkg/Shell/Library/EfiShellLib.inf
+  $(EDK_SHELL_DIR)/Library/EfiShellLib.inf
+
+[Libraries.IA32, Libraries.X64]
+  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
 
+###################################################################################################
+#
+# Components Section - list of the modules and components that will be processed by compilation
+#                      tools and the EDK II tools to generate PE32/PE32+/Coff image files.
+#
+# Note: The EDK II DSC file is not used to specify how compiled binary images get placed
+#       into firmware volume images. This section is just a list of modules to compile from
+#       source into UEFI-compliant binaries.
+#       It is the FDF file that contains information on combining binary files into firmware
+#       volume images, whose concept is beyond UEFI and is described in PI specification.
+#       Binary modules do not need to be listed in this section, as they should be
+#       specified in the FDF file. For example: Shell binary (Shell_Full.efi), FAT binary (Fat.efi),
+#       Logo (Logo.bmp), and etc.
+#       There may also be modules listed in this section that are not required in the FDF file,
+#       When a module listed here is excluded from FDF file, then UEFI-compliant binary will be
+#       generated for it, but the binary will not be put into any firmware volume.
+#
+###################################################################################################
 
 [Components]
-  #
-  # Shell.inf & ShellFull.inf can not be included at once to avoid over
-  #
-  EdkShellPkg/Shell/Shell.inf
-  EdkShellPkg/Shell/ShellFull.inf
-  EdkShellPkg/Shell/attrib/attrib.inf
-  EdkShellPkg/Shell/cls/cls.inf
-  EdkShellPkg/Shell/comp/comp.inf
-  EdkShellPkg/Shell/cp/cp.inf
-  EdkShellPkg/Shell/date/date.inf
-  EdkShellPkg/Shell/dblk/dblk.inf
-  EdkShellPkg/Shell/devices/devices.inf
-  EdkShellPkg/Shell/DeviceTree/devicetree.inf
-  EdkShellPkg/Shell/dmem/dmem.inf
-  EdkShellPkg/Shell/dmpstore/dmpstore.inf
-  EdkShellPkg/Shell/drivers/drivers.inf
-  EdkShellPkg/Shell/drvcfg/drvcfg.inf
-  EdkShellPkg/Shell/drvdiag/drvdiag.inf
-  EdkShellPkg/Shell/edit/edit.inf
-  EdkShellPkg/Shell/EfiCompress/compress.inf
-  EdkShellPkg/Shell/EfiDecompress/Decompress.inf
-  EdkShellPkg/Shell/err/err.inf
-  EdkShellPkg/Shell/guid/guid.inf
-  EdkShellPkg/Shell/hexedit/hexedit.inf
-  EdkShellPkg/Shell/IfConfig/IfConfig.inf
-  EdkShellPkg/Shell/IpConfig/IpConfig.inf
-  EdkShellPkg/Shell/load/load.inf
-  EdkShellPkg/Shell/LoadPciRom/LoadPciRom.inf
-  EdkShellPkg/Shell/ls/ls.inf
-  EdkShellPkg/Shell/mem/mem.inf
-  EdkShellPkg/Shell/memmap/memmap.inf
-  EdkShellPkg/Shell/mkdir/mkdir.inf
-  EdkShellPkg/Shell/mm/mm.inf
-  EdkShellPkg/Shell/mode/mode.inf
-  EdkShellPkg/Shell/mount/mount.inf
-  EdkShellPkg/Shell/mv/mv.inf
-  EdkShellPkg/Shell/newshell/nshell.inf
-  EdkShellPkg/Shell/openinfo/openinfo.inf
-  EdkShellPkg/Shell/pci/pci.inf
-  EdkShellPkg/Shell/Ping/Ping.inf
-  EdkShellPkg/Shell/reset/reset.inf
-  EdkShellPkg/Shell/rm/rm.inf
-  EdkShellPkg/Shell/sermode/sermode.inf
-  EdkShellPkg/Shell/SmbiosView/Smbiosview.inf
-  EdkShellPkg/Shell/stall/stall.inf
-  EdkShellPkg/Shell/TelnetMgmt/TelnetMgmt.inf
-  EdkShellPkg/Shell/time/time.inf
-  EdkShellPkg/Shell/touch/touch.inf
-  EdkShellPkg/Shell/type/type.inf
-  EdkShellPkg/Shell/tzone/timezone.inf
-  EdkShellPkg/Shell/unload/unload.inf
-  EdkShellPkg/Shell/ver/Ver.inf
-  EdkShellPkg/Shell/vol/Vol.inf
+  $(EDK_SHELL_DIR)/Shell.inf
+  $(EDK_SHELL_DIR)/ShellFull.inf
+  $(EDK_SHELL_DIR)/attrib/attrib.inf
+  $(EDK_SHELL_DIR)/cls/cls.inf
+  $(EDK_SHELL_DIR)/comp/comp.inf
+  $(EDK_SHELL_DIR)/cp/cp.inf
+  $(EDK_SHELL_DIR)/date/date.inf
+  $(EDK_SHELL_DIR)/dblk/dblk.inf
+  $(EDK_SHELL_DIR)/devices/devices.inf
+  $(EDK_SHELL_DIR)/DeviceTree/devicetree.inf
+  $(EDK_SHELL_DIR)/dmem/dmem.inf
+  $(EDK_SHELL_DIR)/dmpstore/dmpstore.inf
+  $(EDK_SHELL_DIR)/drivers/drivers.inf
+  $(EDK_SHELL_DIR)/drvcfg/drvcfg.inf
+  $(EDK_SHELL_DIR)/drvdiag/drvdiag.inf
+  $(EDK_SHELL_DIR)/edit/edit.inf
+  $(EDK_SHELL_DIR)/EfiCompress/compress.inf
+  $(EDK_SHELL_DIR)/EfiDecompress/Decompress.inf
+  $(EDK_SHELL_DIR)/err/err.inf
+  $(EDK_SHELL_DIR)/guid/guid.inf
+  $(EDK_SHELL_DIR)/hexedit/hexedit.inf
+  $(EDK_SHELL_DIR)/IfConfig/IfConfig.inf
+  $(EDK_SHELL_DIR)/IpConfig/IpConfig.inf
+  $(EDK_SHELL_DIR)/load/load.inf
+  $(EDK_SHELL_DIR)/LoadPciRom/LoadPciRom.inf
+  $(EDK_SHELL_DIR)/ls/ls.inf
+  $(EDK_SHELL_DIR)/mem/mem.inf
+  $(EDK_SHELL_DIR)/memmap/memmap.inf
+  $(EDK_SHELL_DIR)/mkdir/mkdir.inf
+  $(EDK_SHELL_DIR)/mm/mm.inf
+  $(EDK_SHELL_DIR)/mode/mode.inf
+  $(EDK_SHELL_DIR)/mount/mount.inf
+  $(EDK_SHELL_DIR)/mv/mv.inf
+  $(EDK_SHELL_DIR)/newshell/nshell.inf
+  $(EDK_SHELL_DIR)/openinfo/openinfo.inf
+  $(EDK_SHELL_DIR)/pci/pci.inf
+  $(EDK_SHELL_DIR)/Ping/Ping.inf
+  $(EDK_SHELL_DIR)/reset/reset.inf
+  $(EDK_SHELL_DIR)/rm/rm.inf
+  $(EDK_SHELL_DIR)/sermode/sermode.inf
+  $(EDK_SHELL_DIR)/SmbiosView/Smbiosview.inf
+  $(EDK_SHELL_DIR)/stall/stall.inf
+  $(EDK_SHELL_DIR)/TelnetMgmt/TelnetMgmt.inf
+  $(EDK_SHELL_DIR)/time/time.inf
+  $(EDK_SHELL_DIR)/touch/touch.inf
+  $(EDK_SHELL_DIR)/type/type.inf
+  $(EDK_SHELL_DIR)/tzone/timezone.inf
+  $(EDK_SHELL_DIR)/unload/unload.inf
+  $(EDK_SHELL_DIR)/ver/Ver.inf
+  $(EDK_SHELL_DIR)/vol/Vol.inf
 
 [BuildOptions]
   *_*_IA32_CC_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32