Move manifest utils into separate lib, to reduce libxml2 deps.

Summary:
Previously were in support.  Since many many things depend on support,
were all forced to also depend on libxml2, which we only want in a few cases.
This puts all the libxml2 deps in a separate lib to be used only in a few
places.

Reviewers: ruiu, thakis, rnk

Subscribers: mgorny, hiraditya, llvm-commits

Differential Revision: https://reviews.llvm.org/D35819

llvm-svn: 309070

llvm/include/llvm/module.modulemap

@@ -306,3 +306,9 @@ module LLVM_Support_DataTypes_Src {
   header "llvm/Support/DataTypes.h"
   export *
 }
+
+module LLVM_WindowsManifest {
+  requires cplusplus
+  umbrella "WindowsManifest"
+  module * { export * }
+}

llvm/lib/CMakeLists.txt

@@ -25,3 +25,4 @@ add_subdirectory(Passes)
 add_subdirectory(ToolDrivers)
 add_subdirectory(XRay)
 add_subdirectory(Testing)
+add_subdirectory(WindowsManifest)

llvm/lib/LLVMBuild.txt

@@ -42,6 +42,7 @@ subdirectories =
  Testing
  ToolDrivers
  Transforms
+ WindowsManifest
 
 [component_0]
 type = Group

llvm/lib/Support/CMakeLists.txt

@@ -27,9 +27,6 @@ elseif( CMAKE_HOST_UNIX )
   if( UNIX AND NOT (BEOS OR HAIKU) )
     set(system_libs ${system_libs} m)
   endif()
-  if( LLVM_LIBXML2_ENABLED )
-    set(system_libs ${system_libs} ${LIBXML2_LIBS})
-  endif()
 endif( MSVC OR MINGW )
 
 add_llvm_library(LLVMSupport
@@ -113,7 +110,6 @@ add_llvm_library(LLVMSupport
   Triple.cpp
   Twine.cpp
   Unicode.cpp
-  WindowsManifestMerger.cpp
   YAMLParser.cpp
   YAMLTraits.cpp
   raw_os_ostream.cpp

llvm/lib/WindowsManifest/CMakeLists.txt

@@ -0,0 +1,18 @@
+set(system_libs)
+if( CMAKE_HOST_UNIX )
+  if( LLVM_LIBXML2_ENABLED )
+    set(system_libs ${system_libs} ${LIBXML2_LIBS})
+  endif()
+endif()
+
+add_llvm_library(LLVMWindowsManifest
+  WindowsManifestMerger.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/WindowsManifest
+  ${Backtrace_INCLUDE_DIRS}
+
+  LINK_LIBS ${system_libs}
+  )
+
+set_property(TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS "${system_libs}")

llvm/lib/WindowsManifest/LLVMBuild.txt

@@ -0,0 +1,22 @@
+;===- ./lib/WindowsManifest/LLVMBuild.txt ----------------------*- Conf -*--===;
+;
+;                     The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Library
+name = WindowsManifest
+parent = Libraries
+required_libraries = Support

llvm/lib/Support/WindowsManifestMerger.cpp → llvm/lib/WindowsManifest/WindowsManifestMerger.cpp

@@ -11,7 +11,7 @@
 //
 //===---------------------------------------------------------------------===//
 
-#include "llvm/Support/WindowsManifestMerger.h"
+#include "llvm/WindowsManifest/WindowsManifestMerger.h"
 #include "llvm/Support/MemoryBuffer.h"
 
 #include <stdarg.h>

llvm/tools/llvm-mt/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(LLVM_LINK_COMPONENTS
   Option
   Support
+  WindowsManifest
   )
 
 set(LLVM_TARGET_DEFINITIONS Opts.td)

llvm/tools/llvm-mt/LLVMBuild.txt

@@ -19,4 +19,4 @@
 type = Tool
 name = llvm-mt
 parent = Tools
-required_libraries = Option Support
+required_libraries = Option Support WindowsManifest

llvm/tools/llvm-mt/llvm-mt.cpp

@@ -22,8 +22,8 @@
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/Signals.h"
-#include "llvm/Support/WindowsManifestMerger.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/WindowsManifest/WindowsManifestMerger.h"
 
 #include <system_error>