StdLib: Move GetPass.c out of Uefi and into PosixLib. Create LibPosix to contain...

[mirror_edk2.git] / StdLib / StdLib.dsc

diff --git a/StdLib/StdLib.dsc b/StdLib/StdLib.dsc
index d01a2d6cb904c65f44c7676305c9a25e6e03b0a0..8077b045f8fb65cc49c58bc03c789d96bc1115e6 100644 (file)
--- a/StdLib/StdLib.dsc
+++ b/StdLib/StdLib.dsc
@@ -8,8 +8,10 @@
 #\r
 # This package contains:\r
 #       Standard C Library.\r
+#       Sockets Library.\r
+#       Posix Library.\r
 #\r
-#   Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #   This program and the accompanying materials\r
 #   are licensed and made available under the terms and conditions of the BSD License\r
 #   which accompanies this distribution. The full text of the license may be found at\r
@@ -25,15 +27,22 @@
   PLATFORM_VERSION               = 0.01\r
   DSC_SPECIFICATION              = 0x00010006\r
   OUTPUT_DIRECTORY               = Build/StdLib\r
-  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|ARM\r
+  SUPPORTED_ARCHITECTURES        = IA32|X64|ARM\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
+#\r
+#  Debug output control\r
+#\r
+  DEFINE DEBUG_ENABLE_OUTPUT      = FALSE       # Set to TRUE to enable debug output\r
+  DEFINE DEBUG_PRINT_ERROR_LEVEL  = 0x80000000  # Flags to control amount of debug output\r
+  DEFINE DEBUG_PROPERTY_MASK      = 0x0f\r
+\r
 [PcdsFeatureFlag]\r
 \r
 [PcdsFixedAtBuild]\r
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f\r
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|$(DEBUG_PROPERTY_MASK)\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|$(DEBUG_PRINT_ERROR_LEVEL)\r
 \r
 [PcdsFixedAtBuild.IPF]\r
 \r
@@ -55,7 +64,12 @@
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  !if $(DEBUG_ENABLE_OUTPUT)\r
+    DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf\r
+    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
+  !else   ## DEBUG_ENABLE_OUTPUT\r
+    DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  !endif  ## DEBUG_ENABLE_OUTPUT\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
@@ -113,16 +127,21 @@
   StdLib/LibC/Uefi/Devices/daConsole.inf\r
   StdLib/LibC/Uefi/Devices/daShell.inf\r
 \r
+# Additional, non-standard, libraries\r
+  StdLib/LibC/Containers/ContainerLib.inf\r
+\r
 # Additional libraries for POSIX functionality.\r
+  StdLib/PosixLib/PosixLib.inf\r
   StdLib/PosixLib/Err/LibErr.inf\r
   StdLib/PosixLib/Gen/LibGen.inf\r
   StdLib/PosixLib/Glob/LibGlob.inf\r
   StdLib/PosixLib/Stringlist/LibStringlist.inf\r
+  StdLib/LibC/Uefi/InteractiveIO/IIO.inf\r
 \r
 #    Socket Libraries - LibC based\r
-#  StdLib/BsdSocketLib/BsdSocketLib.inf\r
-#  StdLib/EfiSocketLib/EfiSocketLib.inf\r
-#  StdLib/UseSocketDxe/UseSocketDxe.inf\r
+  StdLib/BsdSocketLib/BsdSocketLib.inf\r
+  StdLib/EfiSocketLib/EfiSocketLib.inf\r
+  StdLib/UseSocketDxe/UseSocketDxe.inf\r
 \r
 ##############################################################################\r
 #\r