From: sdottaka <sdottaka@users.sourceforge.net>
Date: Sun, 14 Jun 2015 13:08:17 +0000 (+0900)
Subject: Installer: Install GnuWin32 Patch for Windows
X-Git-Tag: 2.16.4+-jp-10~850^2~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e6f9d6e83708f28ac577e3c8d0a4b0c911e2872e;p=winmerge-jp%2Fwinmerge-jp.git

Installer: Install GnuWin32 Patch for Windows

--HG--
branch : stable
---

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index 0e6dd4cb1..76f67b78d 100755
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -177,6 +177,7 @@ Name: Plugins; Description: {cm:Plugins}; Flags: disablenouninstallwarning; Type
 Name: Frhed; Description: {cm:Frhed}; Flags: disablenouninstallwarning; Types: full typical
 Name: WinIMerge; Description: {cm:WinIMerge}; Flags: disablenouninstallwarning; Types: full typical
 Name: ArchiveSupport; Description: {cm:ArchiveSupport}; Flags: disablenouninstallwarning; Types: full typical
+Name: Patch; Description: {cm:Patch}; Flags: disablenouninstallwarning; Types: full typical
 
 ;Language components
 Name: Languages; Description: {cm:Languages}; Flags: disablenouninstallwarning
@@ -525,6 +526,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
 
+;GnuWin32 Patch for Windows
+Source: C:\Program Files\WinMerge\GnuWin32\*.*; DestDir: {app}\GnuWin32; Flags: recursesubdirs; Components: Patch
+
 [Dirs]
 Name: "{app}\MergePlugins"
 
diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss
index e383fe9dd..2ad7681a2 100644
--- a/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@ -180,6 +180,7 @@ Name: Plugins; Description: {cm:Plugins}; Flags: disablenouninstallwarning; Type
 Name: Frhed; Description: {cm:Frhed}; Flags: disablenouninstallwarning; Types: full typical
 Name: WinIMerge; Description: {cm:WinIMerge}; Flags: disablenouninstallwarning; Types: full typical
 Name: ArchiveSupport; Description: {cm:ArchiveSupport}; Flags: disablenouninstallwarning; Types: full typical
+Name: Patch; Description: {cm:Patch}; Flags: disablenouninstallwarning; Types: full typical
 
 ;Language components
 Name: Languages; Description: {cm:Languages}; Flags: disablenouninstallwarning
@@ -504,6 +505,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
 
+;GnuWin32 Patch for Windows
+Source: C:\Program Files\WinMerge\GnuWin32\*.*; DestDir: {app}\GnuWin32; Flags: recursesubdirs; Components: Patch
+
 [Dirs]
 Name: "{app}\MergePlugins"
 
diff --git a/Translations/InnoSetup/English.isl b/Translations/InnoSetup/English.isl
index ed6626b90..151c0d52d 100755
--- a/Translations/InnoSetup/English.isl
+++ b/Translations/InnoSetup/English.isl
@@ -337,6 +337,7 @@ Frhed=Frhed(Free hex editor)
 WinIMerge=WinIMerge(Image Diff/Merge)
 ArchiveSupport=Archive Support
 ShellExtension32bit=32-bit WinMerge ShellExtension
+Patch=GnuWin32 Patch for Windows
 
 ;Localization Components
 Languages=Languages