diff options
Diffstat (limited to 'src/WixToolset.Core/Librarian.cs')
-rw-r--r-- | src/WixToolset.Core/Librarian.cs | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs index a3bdc170..81d3a0ed 100644 --- a/src/WixToolset.Core/Librarian.cs +++ b/src/WixToolset.Core/Librarian.cs | |||
@@ -30,7 +30,6 @@ namespace WixToolset.Core | |||
30 | /// <summary> | 30 | /// <summary> |
31 | /// Create a library by combining several intermediates (objects). | 31 | /// Create a library by combining several intermediates (objects). |
32 | /// </summary> | 32 | /// </summary> |
33 | /// <param name="sections">The sections to combine into a library.</param> | ||
34 | /// <returns>Returns the new library.</returns> | 33 | /// <returns>Returns the new library.</returns> |
35 | public Intermediate Combine(ILibraryContext context) | 34 | public Intermediate Combine(ILibraryContext context) |
36 | { | 35 | { |
@@ -79,26 +78,6 @@ namespace WixToolset.Core | |||
79 | return this.Messaging.EncounteredError ? null : library; | 78 | return this.Messaging.EncounteredError ? null : library; |
80 | } | 79 | } |
81 | 80 | ||
82 | /// <summary> | ||
83 | /// Validate that a library contains one entry section and no duplicate symbols. | ||
84 | /// </summary> | ||
85 | /// <param name="library">Library to validate.</param> | ||
86 | private void Validate(Intermediate library) | ||
87 | { | ||
88 | var find = new FindEntrySectionAndLoadSymbolsCommand(this.Messaging, library.Sections); | ||
89 | find.Execute(); | ||
90 | |||
91 | // TODO: Consider bringing this sort of verification back. | ||
92 | // foreach (Section section in library.Sections) | ||
93 | // { | ||
94 | // ResolveReferencesCommand resolve = new ResolveReferencesCommand(find.EntrySection, find.Symbols); | ||
95 | // resolve.Execute(); | ||
96 | // | ||
97 | // ReportDuplicateResolvedSymbolErrorsCommand reportDupes = new ReportDuplicateResolvedSymbolErrorsCommand(find.SymbolsWithDuplicates, resolve.ResolvedSections); | ||
98 | // reportDupes.Execute(); | ||
99 | // } | ||
100 | } | ||
101 | |||
102 | private List<string> ResolveFilePathsToEmbed(ILibraryContext context, IEnumerable<IntermediateSection> sections) | 81 | private List<string> ResolveFilePathsToEmbed(ILibraryContext context, IEnumerable<IntermediateSection> sections) |
103 | { | 82 | { |
104 | var embedFilePaths = new List<string>(); | 83 | var embedFilePaths = new List<string>(); |
@@ -140,5 +119,21 @@ namespace WixToolset.Core | |||
140 | 119 | ||
141 | return embedFilePaths; | 120 | return embedFilePaths; |
142 | } | 121 | } |
122 | |||
123 | private void Validate(Intermediate library) | ||
124 | { | ||
125 | var find = new FindEntrySectionAndLoadSymbolsCommand(this.Messaging, library.Sections, OutputType.Library); | ||
126 | find.Execute(); | ||
127 | |||
128 | // TODO: Consider bringing this sort of verification back. | ||
129 | // foreach (Section section in library.Sections) | ||
130 | // { | ||
131 | // ResolveReferencesCommand resolve = new ResolveReferencesCommand(find.EntrySection, find.Symbols); | ||
132 | // resolve.Execute(); | ||
133 | // | ||
134 | // ReportDuplicateResolvedSymbolErrorsCommand reportDupes = new ReportDuplicateResolvedSymbolErrorsCommand(find.SymbolsWithDuplicates, resolve.ResolvedSections); | ||
135 | // reportDupes.Execute(); | ||
136 | // } | ||
137 | } | ||
143 | } | 138 | } |
144 | } | 139 | } |