From 662cf01493951cb9eda521d9557b716e93f618dc Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 4 Oct 2012 11:33:58 -0700
Subject: [PATCH] Remove solidbreak from installer flags since there's no
longer optional components
---
.../packages/win_installer/dictionaries/fragment_stddict.iss | 2 +-
aegisub/packages/win_installer/fragment_assdraw.iss | 2 +-
aegisub/packages/win_installer/fragment_codecs_32.iss | 2 +-
aegisub/packages/win_installer/fragment_docs.iss | 2 +-
aegisub/packages/win_installer/fragment_mainprogram.iss | 2 +-
aegisub/packages/win_installer/fragment_translations.iss | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/aegisub/packages/win_installer/dictionaries/fragment_stddict.iss b/aegisub/packages/win_installer/dictionaries/fragment_stddict.iss
index 3e92139ce..7b7ee1924 100644
--- a/aegisub/packages/win_installer/dictionaries/fragment_stddict.iss
+++ b/aegisub/packages/win_installer/dictionaries/fragment_stddict.iss
@@ -43,7 +43,7 @@ VersionInfoDescription=Aegisub 3.0 {#LANGNAME} dictionary
Source: src\dictionaries\{#LANGCODE}.aff; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: dic/{#LANGCODE}
Source: src\dictionaries\{#LANGCODE}.dic; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: dic/{#LANGCODE}
#ifndef NOTHES
-Source: src\dictionaries\th_{#LANGCODE}.dat; DestDir: {app}\dictionaries; Flags: ignoreversion solidbreak; Components: th/{#LANGCODE}
+Source: src\dictionaries\th_{#LANGCODE}.dat; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: th/{#LANGCODE}
Source: src\dictionaries\th_{#LANGCODE}.idx; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: th/{#LANGCODE}
#endif
diff --git a/aegisub/packages/win_installer/fragment_assdraw.iss b/aegisub/packages/win_installer/fragment_assdraw.iss
index a7c90dd30..2acd41076 100644
--- a/aegisub/packages/win_installer/fragment_assdraw.iss
+++ b/aegisub/packages/win_installer/fragment_assdraw.iss
@@ -35,7 +35,7 @@
[Files]
; ASSDraw3
-Source: src\ASSDraw3.exe; DestDir: {app}; Flags: ignoreversion solidbreak
+Source: src\ASSDraw3.exe; DestDir: {app}; Flags: ignoreversion
Source: src\ASSDraw3.chm; DestDir: {app}; Flags: ignoreversion
[Icons]
diff --git a/aegisub/packages/win_installer/fragment_codecs_32.iss b/aegisub/packages/win_installer/fragment_codecs_32.iss
index de5236b84..eb68e5b77 100644
--- a/aegisub/packages/win_installer/fragment_codecs_32.iss
+++ b/aegisub/packages/win_installer/fragment_codecs_32.iss
@@ -35,7 +35,7 @@
[Files]
; avisynth
-DestDir: {app}; Source: src\devil.dll; Flags: ignoreversion solidbreak
+DestDir: {app}; Source: src\devil.dll; Flags: ignoreversion
DestDir: {app}; Source: src\avisynth.dll; Flags: ignoreversion
DestDir: {app}; Source: src\DirectShowSource.dll; Flags: ignoreversion
; ffmpegsource
diff --git a/aegisub/packages/win_installer/fragment_docs.iss b/aegisub/packages/win_installer/fragment_docs.iss
index c7656b711..e2463ee09 100644
--- a/aegisub/packages/win_installer/fragment_docs.iss
+++ b/aegisub/packages/win_installer/fragment_docs.iss
@@ -34,5 +34,5 @@
[Files]
; documentation
-Source: src\docs\*; DestDir: {app}\docs; Flags: ignoreversion recursesubdirs solidbreak; Excludes: *svn
+Source: src\docs\*; DestDir: {app}\docs; Flags: ignoreversion recursesubdirs; Excludes: *svn
diff --git a/aegisub/packages/win_installer/fragment_mainprogram.iss b/aegisub/packages/win_installer/fragment_mainprogram.iss
index 52ade070f..cc7e1f54c 100644
--- a/aegisub/packages/win_installer/fragment_mainprogram.iss
+++ b/aegisub/packages/win_installer/fragment_mainprogram.iss
@@ -40,7 +40,7 @@ Name: main/qcklnch; Description: Quick launch icon; Types: custom compact full
[Files]
; main
-DestDir: {app}; Source: ..\..\bin\aegisub{#ARCH}.exe; Flags: ignoreversion solidbreak
+DestDir: {app}; Source: ..\..\bin\aegisub{#ARCH}.exe; Flags: ignoreversion
DestDir: {app}; Source: ..\..\bin\aegisub{#ARCH}.pdb; Flags: ignoreversion
DestDir: {app}; Source: license.txt; Flags: ignoreversion; Tasks: ; Languages:
diff --git a/aegisub/packages/win_installer/fragment_translations.iss b/aegisub/packages/win_installer/fragment_translations.iss
index 345b06ee6..e7bb334f0 100644
--- a/aegisub/packages/win_installer/fragment_translations.iss
+++ b/aegisub/packages/win_installer/fragment_translations.iss
@@ -37,7 +37,7 @@
[Files]
; localization (commented out ones are out of date; some don't have wxstd.mo)
-Source: src\mo\ca.mo; DestDir: {app}\locale\ca; DestName: aegisub.mo; Flags: ignoreversion solidbreak
+Source: src\mo\ca.mo; DestDir: {app}\locale\ca; DestName: aegisub.mo; Flags: ignoreversion
Source: src\mo\wxstd-ca.mo; DestDir: {app}\locale\ca; DestName: wxstd.mo; Flags: ignoreversion
Source: src\mo\cs.mo; DestDir: {app}\locale\cs; DestName: aegisub.mo; Flags: ignoreversion
Source: src\mo\wxstd-cs.mo; DestDir: {app}\locale\cs; DestName: wxstd.mo; Flags: ignoreversion
--
GitLab