cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-09-21 12:49:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix msi build

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2019-04-12 21:28:22 -04:00
parent f282edd719
commit c209a48bd6
3 changed files with 49 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NAPS2.Setup.Msi/NAPS2.Setup.Msi.wxs
View File

@ -24,7 +24,6 @@
<ComponentRef Id="Deps" />
<ComponentRef Id="DepsWin32" />
<ComponentRef Id="DepsWin64" />
<ComponentRef Id="twaindsm" />
<ComponentRef Id="ApplicationShortcut" />
<ComponentRef Id="RegistryEntries" />
<ComponentGroupRef Id="LangComponents" />
@ -85,23 +84,16 @@
<DirectoryRef Id="LIBFOLDER">
<Component Id="Deps" Guid="04AC2B17-BDFA-4AA0-B8CA-0AE208D9193A">
<!-- Dependencies -->
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\NAPS2.Core.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\NAPS2.DI.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\NAPS2.Lib.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\NAPS2.Sdk.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\CommandLine.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\Ghostscript.NET.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ICSharpCode.SharpZipLib.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\Microsoft.Threading.Tasks.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\Microsoft.Threading.Tasks.Extensions.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\MimeKit.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\Newtonsoft.Json.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\Ninject.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\NLog.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\NTwain.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\PdfSharp.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\System.IO.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\System.Runtime.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\System.Threading.Tasks.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\System.ValueTuple.dll" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\zxing.dll" />
</Component>
@ -110,14 +102,16 @@
<!-- Platform-specific dependencies -->
<DirectoryRef Id="LIBWIN32FOLDER">
<Component Id="DepsWin32" Guid="2BE3E5A4-7526-4074-90A1-5B4E830EA337">
<File Source="..\NAPS2.Setup\lib\win32\twaindsm.dll" Id="twaindsm_win32" />
<File Source="..\NAPS2.Setup\lib\win32\NAPS2.WIA.dll" Id="naps2wia_win32" />
<File Source="..\NAPS2.Setup\lib\win32\pdfium.dll" Id="pdfium_win32" />
<File Source="..\NAPS2.Setup\lib\win32\twaindsm.dll" Id="twaindsm_win32" />
</Component>
</DirectoryRef>
<DirectoryRef Id="LIBWIN64FOLDER">
<Component Id="DepsWin64" Guid="9F734E22-7835-43B9-8B58-E10EF6484DD7">
<File Source="..\NAPS2.Setup\lib\win64\twaindsm.dll" Id="twaindsm_win64" />
<File Source="..\NAPS2.Setup\lib\win64\NAPS2.WIA.dll" Id="naps2wia_win64" />
<File Source="..\NAPS2.Setup\lib\win64\twaindsm.dll" Id="twaindsm_win64" />
<File Source="..\NAPS2.Setup\lib\win64\pdfium.dll" Id="pdfium_win64" />
</Component>
</DirectoryRef>

4
NAPS2.Setup/LanguageComponents.tt
View File

@ -14,7 +14,7 @@
<Fragment Id='LanguageComponentsFragment'>
<#
var setupDirPath = Path.GetDirectoryName(this.Host.TemplateFile);
var outputDirPath = Path.Combine(setupDirPath, @"..\NAPS2.Sdk\bin\InstallerEXE");
var outputDirPath = Path.Combine(setupDirPath, @"..\NAPS2.Sdk\bin\InstallerMSI");
var outputDir = new DirectoryInfo(outputDirPath);
#>
<ComponentGroup Id="LangComponents">
@ -35,7 +35,7 @@
#>
<Directory Id="LangFolder_<#= langName.Replace("-", "_") #>" Name="<#= langName #>">
<Component Id="LangComponent_<#= langName.Replace("-", "_") #>">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\\<#= langName #>\NAPS2.Core.resources.dll" Id="LangFile_<#= langName.Replace("-", "_") #>" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\\<#= langName #>\NAPS2.Sdk.resources.dll" Id="LangFile_<#= langName.Replace("-", "_") #>" />
</Component>
</Directory>
<#

82
NAPS2.Setup/LanguageComponents.wxs
View File

@ -49,207 +49,207 @@
<DirectoryRef Id="LIBFOLDER">
<Directory Id="LangFolder_af" Name="af">
<Component Id="LangComponent_af">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\af\NAPS2.Core.resources.dll" Id="LangFile_af" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\af\NAPS2.Sdk.resources.dll" Id="LangFile_af" />
</Component>
</Directory>
<Directory Id="LangFolder_ar" Name="ar">
<Component Id="LangComponent_ar">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ar\NAPS2.Core.resources.dll" Id="LangFile_ar" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ar\NAPS2.Sdk.resources.dll" Id="LangFile_ar" />
</Component>
</Directory>
<Directory Id="LangFolder_bg" Name="bg">
<Component Id="LangComponent_bg">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\bg\NAPS2.Core.resources.dll" Id="LangFile_bg" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\bg\NAPS2.Sdk.resources.dll" Id="LangFile_bg" />
</Component>
</Directory>
<Directory Id="LangFolder_ca" Name="ca">
<Component Id="LangComponent_ca">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ca\NAPS2.Core.resources.dll" Id="LangFile_ca" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ca\NAPS2.Sdk.resources.dll" Id="LangFile_ca" />
</Component>
</Directory>
<Directory Id="LangFolder_cs" Name="cs">
<Component Id="LangComponent_cs">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\cs\NAPS2.Core.resources.dll" Id="LangFile_cs" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\cs\NAPS2.Sdk.resources.dll" Id="LangFile_cs" />
</Component>
</Directory>
<Directory Id="LangFolder_da" Name="da">
<Component Id="LangComponent_da">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\da\NAPS2.Core.resources.dll" Id="LangFile_da" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\da\NAPS2.Sdk.resources.dll" Id="LangFile_da" />
</Component>
</Directory>
<Directory Id="LangFolder_de" Name="de">
<Component Id="LangComponent_de">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\de\NAPS2.Core.resources.dll" Id="LangFile_de" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\de\NAPS2.Sdk.resources.dll" Id="LangFile_de" />
</Component>
</Directory>
<Directory Id="LangFolder_el" Name="el">
<Component Id="LangComponent_el">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\el\NAPS2.Core.resources.dll" Id="LangFile_el" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\el\NAPS2.Sdk.resources.dll" Id="LangFile_el" />
</Component>
</Directory>
<Directory Id="LangFolder_es" Name="es">
<Component Id="LangComponent_es">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\es\NAPS2.Core.resources.dll" Id="LangFile_es" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\es\NAPS2.Sdk.resources.dll" Id="LangFile_es" />
</Component>
</Directory>
<Directory Id="LangFolder_et" Name="et">
<Component Id="LangComponent_et">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\et\NAPS2.Core.resources.dll" Id="LangFile_et" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\et\NAPS2.Sdk.resources.dll" Id="LangFile_et" />
</Component>
</Directory>
<Directory Id="LangFolder_fa" Name="fa">
<Component Id="LangComponent_fa">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\fa\NAPS2.Core.resources.dll" Id="LangFile_fa" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\fa\NAPS2.Sdk.resources.dll" Id="LangFile_fa" />
</Component>
</Directory>
<Directory Id="LangFolder_fi" Name="fi">
<Component Id="LangComponent_fi">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\fi\NAPS2.Core.resources.dll" Id="LangFile_fi" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\fi\NAPS2.Sdk.resources.dll" Id="LangFile_fi" />
</Component>
</Directory>
<Directory Id="LangFolder_fr" Name="fr">
<Component Id="LangComponent_fr">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\fr\NAPS2.Core.resources.dll" Id="LangFile_fr" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\fr\NAPS2.Sdk.resources.dll" Id="LangFile_fr" />
</Component>
</Directory>
<Directory Id="LangFolder_he" Name="he">
<Component Id="LangComponent_he">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\he\NAPS2.Core.resources.dll" Id="LangFile_he" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\he\NAPS2.Sdk.resources.dll" Id="LangFile_he" />
</Component>
</Directory>
<Directory Id="LangFolder_hr" Name="hr">
<Component Id="LangComponent_hr">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\hr\NAPS2.Core.resources.dll" Id="LangFile_hr" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\hr\NAPS2.Sdk.resources.dll" Id="LangFile_hr" />
</Component>
</Directory>
<Directory Id="LangFolder_hu" Name="hu">
<Component Id="LangComponent_hu">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\hu\NAPS2.Core.resources.dll" Id="LangFile_hu" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\hu\NAPS2.Sdk.resources.dll" Id="LangFile_hu" />
</Component>
</Directory>
<Directory Id="LangFolder_it" Name="it">
<Component Id="LangComponent_it">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\it\NAPS2.Core.resources.dll" Id="LangFile_it" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\it\NAPS2.Sdk.resources.dll" Id="LangFile_it" />
</Component>
</Directory>
<Directory Id="LangFolder_ja" Name="ja">
<Component Id="LangComponent_ja">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ja\NAPS2.Core.resources.dll" Id="LangFile_ja" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ja\NAPS2.Sdk.resources.dll" Id="LangFile_ja" />
</Component>
</Directory>
<Directory Id="LangFolder_ko" Name="ko">
<Component Id="LangComponent_ko">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ko\NAPS2.Core.resources.dll" Id="LangFile_ko" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ko\NAPS2.Sdk.resources.dll" Id="LangFile_ko" />
</Component>
</Directory>
<Directory Id="LangFolder_lt" Name="lt">
<Component Id="LangComponent_lt">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\lt\NAPS2.Core.resources.dll" Id="LangFile_lt" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\lt\NAPS2.Sdk.resources.dll" Id="LangFile_lt" />
</Component>
</Directory>
<Directory Id="LangFolder_lv" Name="lv">
<Component Id="LangComponent_lv">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\lv\NAPS2.Core.resources.dll" Id="LangFile_lv" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\lv\NAPS2.Sdk.resources.dll" Id="LangFile_lv" />
</Component>
</Directory>
<Directory Id="LangFolder_nb" Name="nb">
<Component Id="LangComponent_nb">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\nb\NAPS2.Core.resources.dll" Id="LangFile_nb" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\nb\NAPS2.Sdk.resources.dll" Id="LangFile_nb" />
</Component>
</Directory>
<Directory Id="LangFolder_nl" Name="nl">
<Component Id="LangComponent_nl">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\nl\NAPS2.Core.resources.dll" Id="LangFile_nl" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\nl\NAPS2.Sdk.resources.dll" Id="LangFile_nl" />
</Component>
</Directory>
<Directory Id="LangFolder_nn" Name="nn">
<Component Id="LangComponent_nn">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\nn\NAPS2.Core.resources.dll" Id="LangFile_nn" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\nn\NAPS2.Sdk.resources.dll" Id="LangFile_nn" />
</Component>
</Directory>
<Directory Id="LangFolder_pl" Name="pl">
<Component Id="LangComponent_pl">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\pl\NAPS2.Core.resources.dll" Id="LangFile_pl" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\pl\NAPS2.Sdk.resources.dll" Id="LangFile_pl" />
</Component>
</Directory>
<Directory Id="LangFolder_pt_BR" Name="pt-BR">
<Component Id="LangComponent_pt_BR">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\pt-BR\NAPS2.Core.resources.dll" Id="LangFile_pt_BR" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\pt-BR\NAPS2.Sdk.resources.dll" Id="LangFile_pt_BR" />
</Component>
</Directory>
<Directory Id="LangFolder_pt_PT" Name="pt-PT">
<Component Id="LangComponent_pt_PT">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\pt-PT\NAPS2.Core.resources.dll" Id="LangFile_pt_PT" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\pt-PT\NAPS2.Sdk.resources.dll" Id="LangFile_pt_PT" />
</Component>
</Directory>
<Directory Id="LangFolder_ro" Name="ro">
<Component Id="LangComponent_ro">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ro\NAPS2.Core.resources.dll" Id="LangFile_ro" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ro\NAPS2.Sdk.resources.dll" Id="LangFile_ro" />
</Component>
</Directory>
<Directory Id="LangFolder_ru" Name="ru">
<Component Id="LangComponent_ru">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ru\NAPS2.Core.resources.dll" Id="LangFile_ru" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\ru\NAPS2.Sdk.resources.dll" Id="LangFile_ru" />
</Component>
</Directory>
<Directory Id="LangFolder_si" Name="si">
<Component Id="LangComponent_si">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\si\NAPS2.Core.resources.dll" Id="LangFile_si" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\si\NAPS2.Sdk.resources.dll" Id="LangFile_si" />
</Component>
</Directory>
<Directory Id="LangFolder_sk" Name="sk">
<Component Id="LangComponent_sk">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sk\NAPS2.Core.resources.dll" Id="LangFile_sk" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sk\NAPS2.Sdk.resources.dll" Id="LangFile_sk" />
</Component>
</Directory>
<Directory Id="LangFolder_sl" Name="sl">
<Component Id="LangComponent_sl">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sl\NAPS2.Core.resources.dll" Id="LangFile_sl" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sl\NAPS2.Sdk.resources.dll" Id="LangFile_sl" />
</Component>
</Directory>
<Directory Id="LangFolder_sq" Name="sq">
<Component Id="LangComponent_sq">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sq\NAPS2.Core.resources.dll" Id="LangFile_sq" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sq\NAPS2.Sdk.resources.dll" Id="LangFile_sq" />
</Component>
</Directory>
<Directory Id="LangFolder_sr_Cyrl" Name="sr-Cyrl">
<Component Id="LangComponent_sr_Cyrl">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sr-Cyrl\NAPS2.Core.resources.dll" Id="LangFile_sr_Cyrl" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sr-Cyrl\NAPS2.Sdk.resources.dll" Id="LangFile_sr_Cyrl" />
</Component>
</Directory>
<Directory Id="LangFolder_sr_Latn" Name="sr-Latn">
<Component Id="LangComponent_sr_Latn">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sr-Latn\NAPS2.Core.resources.dll" Id="LangFile_sr_Latn" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sr-Latn\NAPS2.Sdk.resources.dll" Id="LangFile_sr_Latn" />
</Component>
</Directory>
<Directory Id="LangFolder_sv" Name="sv">
<Component Id="LangComponent_sv">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sv\NAPS2.Core.resources.dll" Id="LangFile_sv" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\sv\NAPS2.Sdk.resources.dll" Id="LangFile_sv" />
</Component>
</Directory>
<Directory Id="LangFolder_tr" Name="tr">
<Component Id="LangComponent_tr">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\tr\NAPS2.Core.resources.dll" Id="LangFile_tr" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\tr\NAPS2.Sdk.resources.dll" Id="LangFile_tr" />
</Component>
</Directory>
<Directory Id="LangFolder_uk" Name="uk">
<Component Id="LangComponent_uk">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\uk\NAPS2.Core.resources.dll" Id="LangFile_uk" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\uk\NAPS2.Sdk.resources.dll" Id="LangFile_uk" />
</Component>
</Directory>
<Directory Id="LangFolder_vi" Name="vi">
<Component Id="LangComponent_vi">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\vi\NAPS2.Core.resources.dll" Id="LangFile_vi" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\vi\NAPS2.Sdk.resources.dll" Id="LangFile_vi" />
</Component>
</Directory>
<Directory Id="LangFolder_zh_CHS" Name="zh-CHS">
<Component Id="LangComponent_zh_CHS">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\zh-CHS\NAPS2.Core.resources.dll" Id="LangFile_zh_CHS" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\zh-CHS\NAPS2.Sdk.resources.dll" Id="LangFile_zh_CHS" />
</Component>
</Directory>
<Directory Id="LangFolder_zh_TW" Name="zh-TW">
<Component Id="LangComponent_zh_TW">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\zh-TW\NAPS2.Core.resources.dll" Id="LangFile_zh_TW" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\zh-TW\NAPS2.Sdk.resources.dll" Id="LangFile_zh_TW" />
</Component>
</Directory>
</DirectoryRef>