From 8615152bc263a3dcfa3b7390abf318d3d417d176 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Tue, 15 Oct 2019 17:45:10 +0200
Subject: [PATCH] [windows] add Amaranth in installer
---
.gitmodules | 3 +++
packages/win_installer/aegisub3.iss | 1 +
packages/win_installer/fragment_fonts.iss | 7 +++++++
packages/win_installer/fragment_mainprogram.iss | 1 +
vendor/japan7-fonts | 1 +
5 files changed, 13 insertions(+)
create mode 100644 packages/win_installer/fragment_fonts.iss
create mode 160000 vendor/japan7-fonts
diff --git a/.gitmodules b/.gitmodules
index e34fcc897..248421b2f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
path = vendor/uchardet
url = https://gitlab.freedesktop.org/uchardet/uchardet.git
ignore = dirty
+[submodule "vendor/japan7-fonts"]
+ path = vendor/japan7-fonts
+ url = https://github.com/odrling/japan7-fonts.git
diff --git a/packages/win_installer/aegisub3.iss b/packages/win_installer/aegisub3.iss
index 2683e02c1..bc74569b9 100644
--- a/packages/win_installer/aegisub3.iss
+++ b/packages/win_installer/aegisub3.iss
@@ -50,6 +50,7 @@ ArchitecturesAllowed=x64
#include "fragment_automation.iss"
#include "fragment_translations.iss"
#include "fragment_spelling.iss"
+#include "fragment_fonts.iss"
#ifdef DEPCTRL
#include "fragment_runtimes.iss"
#endif
diff --git a/packages/win_installer/fragment_fonts.iss b/packages/win_installer/fragment_fonts.iss
new file mode 100644
index 000000000..5f80d9082
--- /dev/null
+++ b/packages/win_installer/fragment_fonts.iss
@@ -0,0 +1,7 @@
+
+[Files]
+DestDir: {app}\FontsLicenses; DestName: Amaranth-OFL.txt; Source: ..\..\vendor\japan7-fonts\Amaranth\OFL.txt; Flags: ignoreversion; Components: fonts
+DestDir: "{fonts}"; FontInstall: "Amaranth"; Source: ..\..\vendor\japan7-fonts\Amaranth\Amaranth-Regular.ttf; Flags: onlyifdoesntexist uninsneveruninstall; Components: fonts
+DestDir: "{fonts}"; FontInstall: "Amaranth"; Source: ..\..\vendor\japan7-fonts\Amaranth\Amaranth-Bold.ttf; Flags: onlyifdoesntexist uninsneveruninstall; Components: fonts
+DestDir: "{fonts}"; FontInstall: "Amaranth"; Source: ..\..\vendor\japan7-fonts\Amaranth\Amaranth-Italic.ttf; Flags: onlyifdoesntexist uninsneveruninstall; Components: fonts
+DestDir: "{fonts}"; FontInstall: "Amaranth"; Source: ..\..\vendor\japan7-fonts\Amaranth\Amaranth-BoldItalic.ttf; Flags: onlyifdoesntexist uninsneveruninstall; Components: fonts
diff --git a/packages/win_installer/fragment_mainprogram.iss b/packages/win_installer/fragment_mainprogram.iss
index f314b021c..135f2b2c6 100644
--- a/packages/win_installer/fragment_mainprogram.iss
+++ b/packages/win_installer/fragment_mainprogram.iss
@@ -46,6 +46,7 @@ Name: "macros\modules\luajson"; Description: "LuaJSON"; Types: full
Name: "dictionaries"; Description: "Spellcheck Dictionaries"; Types: full
Name: "dictionaries\en_US"; Description: "English (US)"; Types: full
Name: "translations"; Description: "Aegisub Translations"; Types: full
+Name: "fonts"; Description: "Bundled fonts"; Types: full
[Tasks]
Name: "startmenuicon"; Description: "{cm:StartMenuIcon}"; GroupDescription: "{cm:AdditionalIcons}"
diff --git a/vendor/japan7-fonts b/vendor/japan7-fonts
new file mode 160000
index 000000000..74ef0dea8
--- /dev/null
+++ b/vendor/japan7-fonts
@@ -0,0 +1 @@
+Subproject commit 74ef0dea87e3c10bbf0b4df90b663b8868d9cbd5
--
GitLab