From 7bfa2ee8a716cfa3223b71506a9f98211547ca7c Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Fri, 13 Jun 2014 17:31:50 +0200 Subject: [PATCH] Fix GTK+ bundle licenses missing from installer --- win32/hexchat.props | 3 ++- win32/installer/hexchat.iss.tt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/win32/hexchat.props b/win32/hexchat.props index 74beb6ff..a86003d0 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -77,7 +77,8 @@ copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)" xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines" "$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines" xcopy /q /s /i etc "$(HexChatRel)\etc" xcopy /q /s /i share "$(HexChatRel)\share" -xcopy /q /s /i "..\..\COPYING" "$(HexChatRel)\" +xcopy /q /s /i "..\..\COPYING" "$(HexChatRel)\share\doc\hexchat\" +xcopy /q /s /i "$(DepsRoot)\share\doc" "$(HexChatRel)\share\doc" xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\" xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\" copy "$(HexChatBin)hcdns.dll" "$(HexChatRel)\plugins" diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 4a110dc5..022b0be0 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -16,7 +16,7 @@ AppPublisherURL=http://hexchat.github.io AppCopyright=Copyright (C) 1998-2010 Peter Zelezny AppSupportURL=https://github.com/hexchat/hexchat/issues AppUpdatesURL=http://hexchat.github.io/downloads.html -LicenseFile=COPYING +LicenseFile=share\doc\hexchat\COPYING UninstallDisplayIcon={app}\hexchat.exe UninstallDisplayName=HexChat #if APPARCH == "x64" @@ -113,7 +113,7 @@ Source: "readme.url"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs -Source: "COPYING"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "atk-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs