]> granicus.if.org Git - llvm/commit
llvm-mt: implement simple merging of manifests, not factoring namespaces.
authorEric Beckmann <ecbeckmann@google.com>
Tue, 25 Jul 2017 22:50:25 +0000 (22:50 +0000)
committerEric Beckmann <ecbeckmann@google.com>
Tue, 25 Jul 2017 22:50:25 +0000 (22:50 +0000)
commitb0707e1a0da16d397fac6d6ccf01b866bf75179d
treee2687c6f7b8c917716a8f7cb60d0bd7081169726
parent2f55a43107d5b2c57e58cce1ed157cd7cb8a695b
llvm-mt: implement simple merging of manifests, not factoring namespaces.

Summary:
Does a simple merge, where mergeable elements are combined, all others
are appended.  Does not apply trickly namespace rules.

Subscribers: llvm-commits, hiraditya

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@309047 91177308-0d34-0410-b5e6-96231b3b80d8
include/llvm/Support/WindowsManifestMerger.h
lib/Support/WindowsManifestMerger.cpp
test/tools/llvm-mt/Inputs/additional.manifest [new file with mode: 0644]
test/tools/llvm-mt/Inputs/conflicting.manifest [new file with mode: 0644]
test/tools/llvm-mt/Inputs/test_manifest.manifest
test/tools/llvm-mt/conflicting.test [new file with mode: 0644]
test/tools/llvm-mt/simple_merge.test [new file with mode: 0644]
tools/llvm-mt/llvm-mt.cpp