update default and comment to resolve confusion

[mirror_edk2.git] / EdkShellPkg / EdkShellPkg.dsc

diff --git a/EdkShellPkg/EdkShellPkg.dsc b/EdkShellPkg/EdkShellPkg.dsc
index 322a6a7a8d42c756ed29dfffa54ba23006e22999..6a2335aaa288d959d5e6c2254bfe458fd23407b0 100644 (file)
--- a/EdkShellPkg/EdkShellPkg.dsc
+++ b/EdkShellPkg/EdkShellPkg.dsc
@@ -24,6 +24,11 @@
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
+# \r
+# Change the macro to the directory containing the source code from EDK Shell Project.  \r
+# This is a workspace relative directory\r
+#  \r
+DEFINE EDK_SHELL_DIR             = EdkShellPkg/Shell\r
 \r
 [Libraries]\r
   #\r
@@ -35,7 +40,6 @@
   EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf\r
   EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf\r
   EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIA64Lib/CpuIA64Lib.inf\r
-  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf\r
   EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf\r
   EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf\r
   #\r
@@ -68,63 +72,62 @@
   #\r
   # Shell Library\r
   #\r
-  EdkShellPkg/Shell/Library/EfiShellLib.inf\r
+  $(EDK_SHELL_DIR)/Library/EfiShellLib.inf\r
 \r
+[Libraries.IA32, Libraries.X64]\r
+  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf\r
 \r
 [Components]\r
-  #\r
-  # Shell.inf & ShellFull.inf can not be included at once to avoid over\r
-  #\r
-  EdkShellPkg/Shell/Shell.inf\r
-  EdkShellPkg/Shell/ShellFull.inf\r
-  EdkShellPkg/Shell/attrib/attrib.inf\r
-  EdkShellPkg/Shell/cls/cls.inf\r
-  EdkShellPkg/Shell/comp/comp.inf\r
-  EdkShellPkg/Shell/cp/cp.inf\r
-  EdkShellPkg/Shell/date/date.inf\r
-  EdkShellPkg/Shell/dblk/dblk.inf\r
-  EdkShellPkg/Shell/devices/devices.inf\r
-  EdkShellPkg/Shell/DeviceTree/devicetree.inf\r
-  EdkShellPkg/Shell/dmem/dmem.inf\r
-  EdkShellPkg/Shell/dmpstore/dmpstore.inf\r
-  EdkShellPkg/Shell/drivers/drivers.inf\r
-  EdkShellPkg/Shell/drvcfg/drvcfg.inf\r
-  EdkShellPkg/Shell/drvdiag/drvdiag.inf\r
-  EdkShellPkg/Shell/edit/edit.inf\r
-  EdkShellPkg/Shell/EfiCompress/compress.inf\r
-  EdkShellPkg/Shell/EfiDecompress/Decompress.inf\r
-  EdkShellPkg/Shell/err/err.inf\r
-  EdkShellPkg/Shell/guid/guid.inf\r
-  EdkShellPkg/Shell/hexedit/hexedit.inf\r
-  EdkShellPkg/Shell/IfConfig/IfConfig.inf\r
-  EdkShellPkg/Shell/IpConfig/IpConfig.inf\r
-  EdkShellPkg/Shell/load/load.inf\r
-  EdkShellPkg/Shell/LoadPciRom/LoadPciRom.inf\r
-  EdkShellPkg/Shell/ls/ls.inf\r
-  EdkShellPkg/Shell/mem/mem.inf\r
-  EdkShellPkg/Shell/memmap/memmap.inf\r
-  EdkShellPkg/Shell/mkdir/mkdir.inf\r
-  EdkShellPkg/Shell/mm/mm.inf\r
-  EdkShellPkg/Shell/mode/mode.inf\r
-  EdkShellPkg/Shell/mount/mount.inf\r
-  EdkShellPkg/Shell/mv/mv.inf\r
-  EdkShellPkg/Shell/newshell/nshell.inf\r
-  EdkShellPkg/Shell/openinfo/openinfo.inf\r
-  EdkShellPkg/Shell/pci/pci.inf\r
-  EdkShellPkg/Shell/Ping/Ping.inf\r
-  EdkShellPkg/Shell/reset/reset.inf\r
-  EdkShellPkg/Shell/rm/rm.inf\r
-  EdkShellPkg/Shell/sermode/sermode.inf\r
-  EdkShellPkg/Shell/SmbiosView/Smbiosview.inf\r
-  EdkShellPkg/Shell/stall/stall.inf\r
-  EdkShellPkg/Shell/TelnetMgmt/TelnetMgmt.inf\r
-  EdkShellPkg/Shell/time/time.inf\r
-  EdkShellPkg/Shell/touch/touch.inf\r
-  EdkShellPkg/Shell/type/type.inf\r
-  EdkShellPkg/Shell/tzone/timezone.inf\r
-  EdkShellPkg/Shell/unload/unload.inf\r
-  EdkShellPkg/Shell/ver/Ver.inf\r
-  EdkShellPkg/Shell/vol/Vol.inf\r
+  $(EDK_SHELL_DIR)/Shell.inf\r
+  $(EDK_SHELL_DIR)/ShellFull.inf\r
+  $(EDK_SHELL_DIR)/attrib/attrib.inf\r
+  $(EDK_SHELL_DIR)/cls/cls.inf\r
+  $(EDK_SHELL_DIR)/comp/comp.inf\r
+  $(EDK_SHELL_DIR)/cp/cp.inf\r
+  $(EDK_SHELL_DIR)/date/date.inf\r
+  $(EDK_SHELL_DIR)/dblk/dblk.inf\r
+  $(EDK_SHELL_DIR)/devices/devices.inf\r
+  $(EDK_SHELL_DIR)/DeviceTree/devicetree.inf\r
+  $(EDK_SHELL_DIR)/dmem/dmem.inf\r
+  $(EDK_SHELL_DIR)/dmpstore/dmpstore.inf\r
+  $(EDK_SHELL_DIR)/drivers/drivers.inf\r
+  $(EDK_SHELL_DIR)/drvcfg/drvcfg.inf\r
+  $(EDK_SHELL_DIR)/drvdiag/drvdiag.inf\r
+  $(EDK_SHELL_DIR)/edit/edit.inf\r
+  $(EDK_SHELL_DIR)/EfiCompress/compress.inf\r
+  $(EDK_SHELL_DIR)/EfiDecompress/Decompress.inf\r
+  $(EDK_SHELL_DIR)/err/err.inf\r
+  $(EDK_SHELL_DIR)/guid/guid.inf\r
+  $(EDK_SHELL_DIR)/hexedit/hexedit.inf\r
+  $(EDK_SHELL_DIR)/IfConfig/IfConfig.inf\r
+  $(EDK_SHELL_DIR)/IpConfig/IpConfig.inf\r
+  $(EDK_SHELL_DIR)/load/load.inf\r
+  $(EDK_SHELL_DIR)/LoadPciRom/LoadPciRom.inf\r
+  $(EDK_SHELL_DIR)/ls/ls.inf\r
+  $(EDK_SHELL_DIR)/mem/mem.inf\r
+  $(EDK_SHELL_DIR)/memmap/memmap.inf\r
+  $(EDK_SHELL_DIR)/mkdir/mkdir.inf\r
+  $(EDK_SHELL_DIR)/mm/mm.inf\r
+  $(EDK_SHELL_DIR)/mode/mode.inf\r
+  $(EDK_SHELL_DIR)/mount/mount.inf\r
+  $(EDK_SHELL_DIR)/mv/mv.inf\r
+  $(EDK_SHELL_DIR)/newshell/nshell.inf\r
+  $(EDK_SHELL_DIR)/openinfo/openinfo.inf\r
+  $(EDK_SHELL_DIR)/pci/pci.inf\r
+  $(EDK_SHELL_DIR)/Ping/Ping.inf\r
+  $(EDK_SHELL_DIR)/reset/reset.inf\r
+  $(EDK_SHELL_DIR)/rm/rm.inf\r
+  $(EDK_SHELL_DIR)/sermode/sermode.inf\r
+  $(EDK_SHELL_DIR)/SmbiosView/Smbiosview.inf\r
+  $(EDK_SHELL_DIR)/stall/stall.inf\r
+  $(EDK_SHELL_DIR)/TelnetMgmt/TelnetMgmt.inf\r
+  $(EDK_SHELL_DIR)/time/time.inf\r
+  $(EDK_SHELL_DIR)/touch/touch.inf\r
+  $(EDK_SHELL_DIR)/type/type.inf\r
+  $(EDK_SHELL_DIR)/tzone/timezone.inf\r
+  $(EDK_SHELL_DIR)/unload/unload.inf\r
+  $(EDK_SHELL_DIR)/ver/Ver.inf\r
+  $(EDK_SHELL_DIR)/vol/Vol.inf\r
 \r
 [BuildOptions]\r
   *_*_IA32_CC_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32\r