aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-02 14:41:49 -0700
committerRob Mensching <rob@firegiant.com>2021-04-02 14:58:00 -0700
commit4449fcc5b8d104817c67135229682c66c3d892ca (patch)
tree327f617de2e296ddb4e62c50bf07ec8b5dcf0a3e /src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
parent9cca339473d77c7036035f949239f5231c325968 (diff)
downloadwix-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.WindowsInstaller/Bind/GenerateDatabaseCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
index f125f497..b8cca752 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
@@ -18,7 +18,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
18 { 18 {
19 private const string IdtsSubFolder = "_idts"; 19 private const string IdtsSubFolder = "_idts";
20 20
21 public GenerateDatabaseCommand(IMessaging messaging, IBackendHelper backendHelper, FileSystemManager fileSystemManager, WindowsInstallerData data, string outputPath, TableDefinitionCollection tableDefinitions, string intermediateFolder, int codepage, bool keepAddedColumns, bool suppressAddingValidationRows, bool useSubdirectory) 21 public GenerateDatabaseCommand(IMessaging messaging, IBackendHelper backendHelper, FileSystemManager fileSystemManager, WindowsInstallerData data, string outputPath, TableDefinitionCollection tableDefinitions, string intermediateFolder, bool keepAddedColumns, bool suppressAddingValidationRows, bool useSubdirectory)
22 { 22 {
23 this.Messaging = messaging; 23 this.Messaging = messaging;
24 this.BackendHelper = backendHelper; 24 this.BackendHelper = backendHelper;
@@ -27,14 +27,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
27 this.OutputPath = outputPath; 27 this.OutputPath = outputPath;
28 this.TableDefinitions = tableDefinitions; 28 this.TableDefinitions = tableDefinitions;
29 this.IntermediateFolder = intermediateFolder; 29 this.IntermediateFolder = intermediateFolder;
30 this.Codepage = codepage;
31 this.KeepAddedColumns = keepAddedColumns; 30 this.KeepAddedColumns = keepAddedColumns;
32 this.SuppressAddingValidationRows = suppressAddingValidationRows; 31 this.SuppressAddingValidationRows = suppressAddingValidationRows;
33 this.UseSubDirectory = useSubdirectory; 32 this.UseSubDirectory = useSubdirectory;
34 } 33 }
35 34
36 private int Codepage { get; }
37
38 private IBackendHelper BackendHelper { get; } 35 private IBackendHelper BackendHelper { get; }
39 36
40 private FileSystemManager FileSystemManager { get; } 37 private FileSystemManager FileSystemManager { get; }
@@ -88,12 +85,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
88 type |= OpenDatabase.OpenPatchFile; 85 type |= OpenDatabase.OpenPatchFile;
89 } 86 }
90 87
91 // Localize the codepage if a value was specified directly.
92 if (-1 != this.Codepage)
93 {
94 this.Data.Codepage = this.Codepage;
95 }
96
97 try 88 try
98 { 89 {
99 Directory.CreateDirectory(Path.GetDirectoryName(this.OutputPath)); 90 Directory.CreateDirectory(Path.GetDirectoryName(this.OutputPath));