From a0d32706685b21e87ae2b4e274ccb9309066cf89 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Tue, 28 Oct 2014 22:28:16 +0900 Subject: [PATCH] WinMerge*.iss: Always create MergePlugins folder even though not installing plugins --HG-- branch : stable --- Installer/InnoSetup/WinMerge.iss | 3 +++ Installer/InnoSetup/WinMergeX64.iss | 3 +++ Translations/WinMerge/English.pot | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 3bf180673..9521ba43b 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -520,6 +520,9 @@ Source: ..\..\Externals\winimerge\freeimage-license-gplv2.txt; DestDir: {app}\Wi Source: ..\..\Externals\winimerge\Build\Release\WinIMerge.exe; DestDir: {app}\WinIMerge; Components: WinIMerge Source: ..\..\Externals\winimerge\Build\Release\WinIMergeLib.dll; DestDir: {app}\WinIMerge; Components: WinIMerge +[Dirs] +Name: "{app}\MergePlugins" + [Icons] ;Start Menu Icons Name: {group}\WinMerge; Filename: {app}\{code:ExeName}; AppUserModelID: "Thingamahoochie.WinMerge" diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss index f87cfc01b..7647fc5a9 100644 --- a/Installer/InnoSetup/WinMergeX64.iss +++ b/Installer/InnoSetup/WinMergeX64.iss @@ -499,6 +499,9 @@ Source: ..\..\Externals\winimerge\freeimage-license-gplv2.txt; DestDir: {app}\Wi Source: ..\..\Externals\winimerge\Build\x64\Release\WinIMerge.exe; DestDir: {app}\WinIMerge; Components: WinIMerge Source: ..\..\Externals\winimerge\Build\x64\Release\WinIMergeLib.dll; DestDir: {app}\WinIMerge; Components: WinIMerge +[Dirs] +Name: "{app}\MergePlugins" + [Icons] ;Start Menu Icons Name: {group}\WinMerge; Filename: {app}\{code:ExeName}; AppUserModelID: "Thingamahoochie.WinMerge" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 5127cbfe4..2f86424fb 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2014-10-28 12:20+0000\n" +"POT-Creation-Date: 2014-10-28 22:00+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" -- 2.11.0