diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-02 14:41:49 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-02 14:58:00 -0700 |
commit | 4449fcc5b8d104817c67135229682c66c3d892ca (patch) | |
tree | 327f617de2e296ddb4e62c50bf07ec8b5dcf0a3e /src/WixToolset.Core/Compiler_Patch.cs | |
parent | 9cca339473d77c7036035f949239f5231c325968 (diff) | |
download | wix-4449fcc5b8d104817c67135229682c66c3d892ca.tar.gz wix-4449fcc5b8d104817c67135229682c66c3d892ca.tar.bz2 wix-4449fcc5b8d104817c67135229682c66c3d892ca.zip |
Enable codepages and languages to be set via .wxl files
Fixes wixtoolset/issues#5801
Diffstat (limited to 'src/WixToolset.Core/Compiler_Patch.cs')
-rw-r--r-- | src/WixToolset.Core/Compiler_Patch.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/WixToolset.Core/Compiler_Patch.cs b/src/WixToolset.Core/Compiler_Patch.cs index a2cadd67..c9cae183 100644 --- a/src/WixToolset.Core/Compiler_Patch.cs +++ b/src/WixToolset.Core/Compiler_Patch.cs | |||
@@ -24,7 +24,7 @@ namespace WixToolset.Core | |||
24 | { | 24 | { |
25 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 25 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
26 | string patchId = null; | 26 | string patchId = null; |
27 | var codepage = 0; | 27 | string codepage = null; |
28 | ////bool versionMismatches = false; | 28 | ////bool versionMismatches = false; |
29 | ////bool productMismatches = false; | 29 | ////bool productMismatches = false; |
30 | var allowRemoval = false; | 30 | var allowRemoval = false; |
@@ -53,7 +53,7 @@ namespace WixToolset.Core | |||
53 | patchId = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib, true); | 53 | patchId = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib, true); |
54 | break; | 54 | break; |
55 | case "Codepage": | 55 | case "Codepage": |
56 | codepage = this.Core.GetAttributeCodePageValue(sourceLineNumbers, attrib); | 56 | codepage = this.Core.GetAttributeLocalizableCodePageValue(sourceLineNumbers, attrib); |
57 | break; | 57 | break; |
58 | case "AllowMajorVersionMismatches": | 58 | case "AllowMajorVersionMismatches": |
59 | ////versionMismatches = (YesNoType.Yes == this.core.GetAttributeYesNoValue(sourceLineNumbers, attrib)); | 59 | ////versionMismatches = (YesNoType.Yes == this.core.GetAttributeYesNoValue(sourceLineNumbers, attrib)); |
@@ -149,7 +149,7 @@ namespace WixToolset.Core | |||
149 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Manufacturer")); | 149 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Manufacturer")); |
150 | } | 150 | } |
151 | 151 | ||
152 | this.Core.CreateActiveSection(this.activeName, SectionType.Patch, codepage, this.Context.CompilationId); | 152 | this.Core.CreateActiveSection(this.activeName, SectionType.Patch, this.Context.CompilationId); |
153 | 153 | ||
154 | foreach (var child in node.Elements()) | 154 | foreach (var child in node.Elements()) |
155 | { | 155 | { |
@@ -197,8 +197,9 @@ namespace WixToolset.Core | |||
197 | 197 | ||
198 | if (!this.Core.EncounteredError) | 198 | if (!this.Core.EncounteredError) |
199 | { | 199 | { |
200 | this.Core.AddSymbol(new WixPatchIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, patchId)) | 200 | this.Core.AddSymbol(new WixPatchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, patchId)) |
201 | { | 201 | { |
202 | Codepage = codepage, | ||
202 | ClientPatchId = clientPatchId, | 203 | ClientPatchId = clientPatchId, |
203 | OptimizePatchSizeForLargeFiles = optimizePatchSizeForLargeFiles, | 204 | OptimizePatchSizeForLargeFiles = optimizePatchSizeForLargeFiles, |
204 | ApiPatchingSymbolFlags = apiPatchingSymbolFlags, | 205 | ApiPatchingSymbolFlags = apiPatchingSymbolFlags, |