diff --git a/.gitignore b/.gitignore index f1e9c0a1..bf5022b6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ src/pixmaps/inline_pngs.h src/xtm/obj/* win32/build/* win32/ipch/* -win32/xchat.opensdf -win32/xchat.sdf -win32/xchat.suo +win32/hexchat.opensdf +win32/hexchat.sdf +win32/hexchat.suo resource.h diff --git a/xchat.ico b/hexchat.ico similarity index 100% rename from xchat.ico rename to hexchat.ico diff --git a/xchat.png b/hexchat.png similarity index 100% rename from xchat.png rename to hexchat.png diff --git a/plugins/checksum/checksum.vcxproj b/plugins/checksum/checksum.vcxproj index 753ca10e..194526d5 100644 --- a/plugins/checksum/checksum.vcxproj +++ b/plugins/checksum/checksum.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/dns/dns.vcxproj b/plugins/dns/dns.vcxproj index 64df391d..d264548f 100644 --- a/plugins/dns/dns.vcxproj +++ b/plugins/dns/dns.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/doat/doat.vcxproj b/plugins/doat/doat.vcxproj index 33969fc3..f6e22a3f 100644 --- a/plugins/doat/doat.vcxproj +++ b/plugins/doat/doat.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/exec/exec.vcxproj b/plugins/exec/exec.vcxproj index 22e6200a..c68a3a65 100644 --- a/plugins/exec/exec.vcxproj +++ b/plugins/exec/exec.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/fishlim/fishlim.vcxproj b/plugins/fishlim/fishlim.vcxproj index 6b5dcc07..68a240d7 100644 --- a/plugins/fishlim/fishlim.vcxproj +++ b/plugins/fishlim/fishlim.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/lua/lua.vcxproj b/plugins/lua/lua.vcxproj index cbb3c444..c2736bc2 100644 --- a/plugins/lua/lua.vcxproj +++ b/plugins/lua/lua.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/mpcinfo/mpcinfo.vcxproj b/plugins/mpcinfo/mpcinfo.vcxproj index 6746ce15..65f5e2b4 100644 --- a/plugins/mpcinfo/mpcinfo.vcxproj +++ b/plugins/mpcinfo/mpcinfo.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/perl/perl-512.vcxproj b/plugins/perl/perl-512.vcxproj index 313014b9..8c8cd8f2 100644 --- a/plugins/perl/perl-512.vcxproj +++ b/plugins/perl/perl-512.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/perl/perl-514.vcxproj b/plugins/perl/perl-514.vcxproj index 6e469944..e48df458 100644 --- a/plugins/perl/perl-514.vcxproj +++ b/plugins/perl/perl-514.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/perl/perl-516.vcxproj b/plugins/perl/perl-516.vcxproj index 06bf2fbd..fb62c96a 100644 --- a/plugins/perl/perl-516.vcxproj +++ b/plugins/perl/perl-516.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/python/python.vcxproj b/plugins/python/python.vcxproj index ef50ee42..11267123 100644 --- a/plugins/python/python.vcxproj +++ b/plugins/python/python.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/tcl/tcl.vcxproj b/plugins/tcl/tcl.vcxproj index 8820742d..2f61a946 100644 --- a/plugins/tcl/tcl.vcxproj +++ b/plugins/tcl/tcl.vcxproj @@ -45,11 +45,11 @@ - + - + diff --git a/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj index dc853ff8..4c07326c 100644 --- a/plugins/upd/upd.vcxproj +++ b/plugins/upd/upd.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/winamp/winamp.vcxproj b/plugins/winamp/winamp.vcxproj index 2b5f3633..2458bf9c 100644 --- a/plugins/winamp/winamp.vcxproj +++ b/plugins/winamp/winamp.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/winsys/winsys.vcxproj b/plugins/winsys/winsys.vcxproj index bacb5db4..10413fe1 100644 --- a/plugins/winsys/winsys.vcxproj +++ b/plugins/winsys/winsys.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/wmpa/wmpa.vcxproj b/plugins/wmpa/wmpa.vcxproj index 92364dc4..4ae24598 100644 --- a/plugins/wmpa/wmpa.vcxproj +++ b/plugins/wmpa/wmpa.vcxproj @@ -37,11 +37,11 @@ - + - + diff --git a/plugins/xsasl/xsasl.vcxproj b/plugins/xsasl/xsasl.vcxproj index bec3da94..8b98b0d6 100644 --- a/plugins/xsasl/xsasl.vcxproj +++ b/plugins/xsasl/xsasl.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/plugins/xtray/xtray.vcxproj b/plugins/xtray/xtray.vcxproj index aa455a8f..c766c3c7 100644 --- a/plugins/xtray/xtray.vcxproj +++ b/plugins/xtray/xtray.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 4e95c929..be1d7a99 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -98,11 +98,11 @@ - + - + diff --git a/src/dirent/dirent.vcxproj b/src/dirent/dirent.vcxproj index 5ae75f57..7c41b01e 100644 --- a/src/dirent/dirent.vcxproj +++ b/src/dirent/dirent.vcxproj @@ -41,11 +41,11 @@ - + - + diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index cb102012..b38e132a 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -35,22 +35,22 @@ - + - + false - xchat + hexchat $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xchat + hexchat $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) @@ -163,13 +163,13 @@ - + - + - + diff --git a/src/fe-gtk/fe-gtk.vcxproj.filters b/src/fe-gtk/fe-gtk.vcxproj.filters index 0e2e830b..8a232dae 100644 --- a/src/fe-gtk/fe-gtk.vcxproj.filters +++ b/src/fe-gtk/fe-gtk.vcxproj.filters @@ -199,17 +199,17 @@ - + Resource Files - + Resource Files - + Resource Files diff --git a/src/fe-gtk/xchat.exe.manifest b/src/fe-gtk/hexchat.exe.manifest similarity index 100% rename from src/fe-gtk/xchat.exe.manifest rename to src/fe-gtk/hexchat.exe.manifest diff --git a/src/fe-gtk/xchat.rc b/src/fe-gtk/hexchat.rc similarity index 73% rename from src/fe-gtk/xchat.rc rename to src/fe-gtk/hexchat.rc index f63b70e7..62000013 100644 --- a/src/fe-gtk/xchat.rc +++ b/src/fe-gtk/hexchat.rc @@ -2,7 +2,7 @@ #include "../../config.h" #include "../../resource.h" -XC_ICON ICON "../../xchat.ico" +XC_ICON ICON "../../hexchat.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION COMMA_VERSION @@ -13,8 +13,8 @@ VS_VERSION_INFO VERSIONINFO BLOCK "040904B0" BEGIN - VALUE "FileDescription", "XChat-WDK IRC Client" - VALUE "ProductName", "XChat-WDK" + VALUE "FileDescription", "HexChat IRC Client" + VALUE "ProductName", "HexChat" VALUE "ProductVersion", PACKAGE_VERSION VALUE "FileVersion", PACKAGE_VERSION END diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj index e8ed04b0..dd37f162 100644 --- a/src/fe-text/fe-text.vcxproj +++ b/src/fe-text/fe-text.vcxproj @@ -35,22 +35,22 @@ - + - + false - xchat-text + hexchat-text $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xchat-text + hexchat-text $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj index ec33a49b..a274adeb 100644 --- a/src/pixmaps/pixmaps.vcxproj +++ b/src/pixmaps/pixmaps.vcxproj @@ -35,11 +35,11 @@ - + - + @@ -93,7 +93,7 @@ - + diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters index aca4cd4b..5944362a 100644 --- a/src/pixmaps/pixmaps.vcxproj.filters +++ b/src/pixmaps/pixmaps.vcxproj.filters @@ -34,7 +34,7 @@ Resource Files - + Resource Files diff --git a/src/version/version.c b/src/version/version.c index 53af5675..40b1bc8f 100644 --- a/src/version/version.c +++ b/src/version/version.c @@ -72,32 +72,32 @@ main (int argc, char *argv[]) { if (argc > 1) { - if (!strcmp (argv[1], "-r")) /* xchat.rc/FILEVERSION, PRODUCTVERSION */ + if (!strcmp (argv[1], "-r")) /* hexchat.rc/FILEVERSION, PRODUCTVERSION */ { printf ("#define COMMA_VERSION %s\n", comma ()); } - else if (!strcmp (argv[1], "-a")) /* xchat-wdk.iss/AppVerName */ + else if (!strcmp (argv[1], "-a")) /* hexchat.iss/AppVerName */ { #ifdef _WIN64 - printf ("AppVerName=XChat-WDK %s (x64)\n", PACKAGE_VERSION); + printf ("AppVerName=HexChat %s (x64)\n", PACKAGE_VERSION); #else - printf ("AppVerName=XChat-WDK %s (x86)\n", PACKAGE_VERSION); + printf ("AppVerName=HexChat %s (x86)\n", PACKAGE_VERSION); #endif } - else if (!strcmp (argv[1], "-v")) /* xchat-wdk.iss/AppVersion */ + else if (!strcmp (argv[1], "-v")) /* hexchat.iss/AppVersion */ { printf ("AppVersion=%s\n", point ()); } - else if (!strcmp (argv[1], "-i")) /* xchat-wdk.iss/VersionInfoVersion */ + else if (!strcmp (argv[1], "-i")) /* hexchat.iss/VersionInfoVersion */ { printf ("VersionInfoVersion=%s\n", point ()); } - else if (!strcmp (argv[1], "-o")) /* xchat-wdk.iss/OutputBaseFilename */ + else if (!strcmp (argv[1], "-o")) /* hexchat.iss/OutputBaseFilename */ { #ifdef _WIN64 - printf ("OutputBaseFilename=XChat-WDK %s x64\n", PACKAGE_VERSION); + printf ("OutputBaseFilename=HexChat %s x64\n", PACKAGE_VERSION); #else - printf ("OutputBaseFilename=XChat-WDK %s x86\n", PACKAGE_VERSION); + printf ("OutputBaseFilename=HexChat %s x86\n", PACKAGE_VERSION); #endif } else if (!strcmp (argv[1], "-v")) /* version.txt */ @@ -105,30 +105,30 @@ main (int argc, char *argv[]) printf ("%s", PACKAGE_VERSION); } else { - printf ("usage:\n\t-a\txchat-wdk.iss/AppVerName\n\t-i\txchat-wdk.iss/VersionInfoVersion\n\t-o\txchat-wdk.iss/OutputBaseFilename\n\t-r\txchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\txchat-wdk.iss/AppVersion\n"); + printf ("usage:\n\t-a\thexchat.iss/AppVerName\n\t-i\thexchat.iss/VersionInfoVersion\n\t-o\thexchat.iss/OutputBaseFilename\n\t-r\thexchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\thexchat.iss/AppVersion\n"); } } else { - printf ("usage:\n\t-a\txchat-wdk.iss/AppVerName\n\t-i\txchat-wdk.iss/VersionInfoVersion\n\t-o\txchat-wdk.iss/OutputBaseFilename\n\t-r\txchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\txchat-wdk.iss/AppVersion\n"); + printf ("usage:\n\t-a\thexchat.iss/AppVerName\n\t-i\thexchat.iss/VersionInfoVersion\n\t-o\thexchat.iss/OutputBaseFilename\n\t-r\thexchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\thexchat.iss/AppVersion\n"); } #if 0 /* ugly hack */ switch ((int) argv[1][0]) { - case 'r': /* xchat.rc/FILEVERSION, PRODUCTVERSION*/ + case 'r': /* hexchat.rc/FILEVERSION, PRODUCTVERSION*/ printf ("#define COMMA_VERSION \"%s\"\n", comma ()); break; - case 'a': /* xchat-wdk.iss/AppVerName */ - printf ("AppVerName=XChat-WDK %s\n", PACKAGE_VERSION); + case 'a': /* hexchat.iss/AppVerName */ + printf ("AppVerName=HexChat %s\n", PACKAGE_VERSION); break; - case 'v': /* xchat-wdk.iss/AppVersion */ + case 'v': /* hexchat.iss/AppVersion */ printf ("AppVersion=%s\n", point ()); break; - case 'i': /* xchat-wdk.iss/VersionInfoVersion */ + case 'i': /* hexchat.iss/VersionInfoVersion */ printf ("VersionInfoVersion=%s\n", point ()); break; - case 'o': /* xchat-wdk.iss/OutputBaseFilename */ - printf ("OutputBaseFilename=XChat-WDK %s\n", PACKAGE_VERSION); + case 'o': /* hexchat.iss/OutputBaseFilename */ + printf ("OutputBaseFilename=HexChat %s\n", PACKAGE_VERSION); break; case 'u': /* version.txt */ printf ("%s", PACKAGE_VERSION); diff --git a/src/version/version.vcxproj b/src/version/version.vcxproj index 5a4fe5cc..49b4250f 100644 --- a/src/version/version.vcxproj +++ b/src/version/version.vcxproj @@ -35,11 +35,11 @@ - + - + diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj index 7a3cf9d9..799ee8bf 100644 --- a/win32/copy/copy.vcxproj +++ b/win32/copy/copy.vcxproj @@ -34,11 +34,11 @@ - + - + @@ -62,74 +62,74 @@ true - rmdir /q /s "$(XChatDest)" -mkdir "$(XChatDest)" + rmdir /q /s "$(HexChatDest)" +mkdir "$(HexChatDest)" echo 2> portable-mode -move portable-mode "$(XChatDest)" -copy "$(OutDir)\xchat.exe" "$(XChatDest)" -copy "$(OutDir)\xchat-text.exe" "$(XChatDest)" -copy "$(OutDir)\thememan.exe" "$(XChatDest)" -copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libcairo-2.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libexpat-1.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\freetype6.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(XChatDest) -copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\intl.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpng14-14.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libxml2.dll" "$(XChatDest)" -xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(XChatDest)\lib\gtk-2.0\2.10.0\engines" -xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(XChatDest)\lib\gtk-2.0\modules\" -xcopy /q /s /i etc "$(XChatDest)\etc" -xcopy /q /s /i share "$(XChatDest)\share" -copy "..\..\COPYING" "$(XChatDest)" -copy "$(DepsRoot)\LICENSE.OPENSSL" "$(XChatDest)" -copy "$(DepsRoot)\LICENSE.ZLIB" "$(XChatDest)" -copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(XChatDest)\LICENSE.GTK" -copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(XChatDest)\LICENSE.CAIRO" -copy "$(DepsRoot)\LICENSE.LUA" "$(XChatDest)" -copy "$(DepsRoot)\LICENSE.ENCHANT" "$(XChatDest)" -copy "$(DepsRoot)\LICENSE.LIBXML" "$(XChatDest)" -copy "$(DepsRoot)\bin\libeay32.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\ssleay32.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\zlib1.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\cert.pem" "$(XChatDest)" -copy "$(DepsRoot)\bin\libenchant.dll" "$(XChatDest)" -xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(XChatDest)\lib\enchant\" -xcopy /q /s /i "$(OutDir)xcchecksum.dll" "$(XChatDest)\plugins\" -copy "$(OutDir)\xcdns.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcdoat.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcexec.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcfishlim.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xclua.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcmpcinfo.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcperl-512.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcperl-514.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcperl-516.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcpython.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xctcl.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcupd.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcxsasl.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xtray.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcwinamp.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcwinsys.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcwmpa.dll" "$(XChatDest)\plugins" -copy "$(DepsRoot)\bin\lua51.dll" "$(XChatDest)" -xcopy /q /s /i "$(OutDir)\locale" "$(XChatDest)\locale" -xcopy /q /s /i "$(DepsRoot)\share\locale" "$(XChatDest)\share\locale" -copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(XChatDest)" -copy "..\installer\watercolorlite-green.cjstyles" "$(XChatDest)" +move portable-mode "$(HexChatDest)" +copy "$(OutDir)\hexchat.exe" "$(HexChatDest)" +copy "$(OutDir)\hexchat-text.exe" "$(HexChatDest)" +copy "$(OutDir)\thememan.exe" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libcairo-2.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libexpat-1.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\freetype6.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(HexChatDest) +copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\intl.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpng14-14.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatDest)" +xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatDest)\lib\gtk-2.0\2.10.0\engines" +xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatDest)\lib\gtk-2.0\modules\" +xcopy /q /s /i etc "$(HexChatDest)\etc" +xcopy /q /s /i share "$(HexChatDest)\share" +copy "..\..\COPYING" "$(HexChatDest)" +copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatDest)" +copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatDest)" +copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(HexChatDest)\LICENSE.GTK" +copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(HexChatDest)\LICENSE.CAIRO" +copy "$(DepsRoot)\LICENSE.LUA" "$(HexChatDest)" +copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatDest)" +copy "$(DepsRoot)\LICENSE.LIBXML" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\cert.pem" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatDest)" +xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatDest)\lib\enchant\" +xcopy /q /s /i "$(OutDir)xcchecksum.dll" "$(HexChatDest)\plugins\" +copy "$(OutDir)\xcdns.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcdoat.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcexec.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcfishlim.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xclua.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcmpcinfo.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcperl-512.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcperl-514.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcperl-516.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcpython.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xctcl.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcupd.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcxsasl.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xtray.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcwinamp.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcwinsys.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcwmpa.dll" "$(HexChatDest)\plugins" +copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatDest)" +xcopy /q /s /i "$(OutDir)\locale" "$(HexChatDest)\locale" +xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatDest)\share\locale" +copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatDest)" +copy "..\installer\watercolorlite-green.cjstyles" "$(HexChatDest)" @@ -145,74 +145,74 @@ copy "..\installer\watercolorlite-green.cjstyles" "$(XChatDest)" true - rmdir /q /s "$(XChatDest)" -mkdir "$(XChatDest)" + rmdir /q /s "$(HexChatDest)" +mkdir "$(HexChatDest)" echo 2> portable-mode -move portable-mode "$(XChatDest)" -copy "$(OutDir)\xchat.exe" "$(XChatDest)" -copy "$(OutDir)\xchat-text.exe" "$(XChatDest)" -copy "$(OutDir)\thememan.exe" "$(XChatDest)" -copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libcairo-2.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libexpat-1.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libfreetype-6.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(XChatDest) -copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libintl-8.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libpng14-14.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\libxml2.dll" "$(XChatDest)" -xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(XChatDest)\lib\gtk-2.0\2.10.0\engines" -xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(XChatDest)\lib\gtk-2.0\modules\" -xcopy /q /s /i etc "$(XChatDest)\etc" -xcopy /q /s /i share "$(XChatDest)\share" -copy "..\..\COPYING" "$(XChatDest)" -copy "$(DepsRoot)\LICENSE.OPENSSL" "$(XChatDest)" -copy "$(DepsRoot)\LICENSE.ZLIB" "$(XChatDest)" -copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(XChatDest)\LICENSE.GTK" -copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(XChatDest)\LICENSE.CAIRO" -copy "$(DepsRoot)\LICENSE.LUA" "$(XChatDest)" -copy "$(DepsRoot)\LICENSE.ENCHANT" "$(XChatDest)" -copy "$(DepsRoot)\LICENSE.LIBXML" "$(XChatDest)" -copy "$(DepsRoot)\bin\libeay32.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\ssleay32.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\zlib1.dll" "$(XChatDest)" -copy "$(DepsRoot)\bin\cert.pem" "$(XChatDest)" -copy "$(DepsRoot)\bin\libenchant.dll" "$(XChatDest)" -xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(XChatDest)\lib\enchant\" -xcopy /q /s /i "$(OutDir)xcchecksum.dll" "$(XChatDest)\plugins\" -copy "$(OutDir)\xcdns.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcdoat.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcexec.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcfishlim.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xclua.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcmpcinfo.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcperl-512.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcperl-514.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcperl-516.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcpython.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xctcl.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcupd.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcxsasl.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xtray.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcwinamp.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcwinsys.dll" "$(XChatDest)\plugins" -copy "$(OutDir)\xcwmpa.dll" "$(XChatDest)\plugins" -copy "$(DepsRoot)\bin\lua51.dll" "$(XChatDest)" -xcopy /q /s /i "$(OutDir)\locale" "$(XChatDest)\locale" -xcopy /q /s /i "$(DepsRoot)\share\locale" "$(XChatDest)\share\locale" -copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(XChatDest)" -copy "..\installer\watercolorlite-blue.cjstyles" "$(XChatDest)" +move portable-mode "$(HexChatDest)" +copy "$(OutDir)\hexchat.exe" "$(HexChatDest)" +copy "$(OutDir)\hexchat-text.exe" "$(HexChatDest)" +copy "$(OutDir)\thememan.exe" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libcairo-2.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libexpat-1.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libfreetype-6.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(HexChatDest) +copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libintl-8.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libpng14-14.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatDest)" +xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatDest)\lib\gtk-2.0\2.10.0\engines" +xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatDest)\lib\gtk-2.0\modules\" +xcopy /q /s /i etc "$(HexChatDest)\etc" +xcopy /q /s /i share "$(HexChatDest)\share" +copy "..\..\COPYING" "$(HexChatDest)" +copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatDest)" +copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatDest)" +copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(HexChatDest)\LICENSE.GTK" +copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(HexChatDest)\LICENSE.CAIRO" +copy "$(DepsRoot)\LICENSE.LUA" "$(HexChatDest)" +copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatDest)" +copy "$(DepsRoot)\LICENSE.LIBXML" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatDest)" +copy "$(DepsRoot)\bin\cert.pem" "$(HexChatDest)" +copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatDest)" +xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatDest)\lib\enchant\" +xcopy /q /s /i "$(OutDir)xcchecksum.dll" "$(HexChatDest)\plugins\" +copy "$(OutDir)\xcdns.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcdoat.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcexec.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcfishlim.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xclua.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcmpcinfo.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcperl-512.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcperl-514.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcperl-516.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcpython.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xctcl.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcupd.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcxsasl.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xtray.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcwinamp.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcwinsys.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\xcwmpa.dll" "$(HexChatDest)\plugins" +copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatDest)" +xcopy /q /s /i "$(OutDir)\locale" "$(HexChatDest)\locale" +xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatDest)\share\locale" +copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatDest)" +copy "..\installer\watercolorlite-blue.cjstyles" "$(HexChatDest)" diff --git a/win32/xchat.props b/win32/hexchat.props similarity index 91% rename from win32/xchat.props rename to win32/hexchat.props index 22f0cd5a..448765be 100644 --- a/win32/xchat.props +++ b/win32/hexchat.props @@ -3,7 +3,7 @@ - c:\mozilla build\xchat-deps + c:\mozilla build\hexchat-deps c:\mozilla build\gendef c:\mozilla build\tcl-8.5 c:\mozilla build\perl-5.12 @@ -33,9 +33,9 @@ xcpython $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 $(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0 - bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" xchatpng "$(SolutionDir)\..\xchat.png" + bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" xchatpng "$(SolutionDir)\..\hexchat.png" gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib - $(SolutionDir)build\$(PlatformName)\rel + $(SolutionDir)build\$(PlatformName)\rel diff --git a/win32/xchat.sln b/win32/hexchat.sln similarity index 98% rename from win32/xchat.sln rename to win32/hexchat.sln index 42969f38..30333ab2 100644 --- a/win32/xchat.sln +++ b/win32/hexchat.sln @@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-text", "..\src\fe-text\f {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xchat", "xchat", "{AAACEB12-9475-410E-AF5A-FDFF907E9043}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hexchat", "hexchat", "{AAACEB12-9475-410E-AF5A-FDFF907E9043}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{561126F4-FA18-45FC-A2BF-8F858F161D6D}" EndProject diff --git a/win32/installer/xchat-wdk-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss similarity index 89% rename from win32/installer/xchat-wdk-x64.skel.iss rename to win32/installer/hexchat-x64.skel.iss index a309b1b6..0d3d754d 100644 --- a/win32/installer/xchat-wdk-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -1,14 +1,14 @@ -AppName=XChat-WDK (x64) -AppPublisher=XChat-WDK -AppPublisherURL=http://www.xchat-wdk.org/ +AppName=HexChat (x64) +AppPublisher=HexChat +AppPublisherURL=http://www.hexchat.org/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny -AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list -AppUpdatesURL=http://www.xchat-wdk.org/home/downloads +AppSupportURL=https://github.com/hexchat/hexchat/issues +AppUpdatesURL=http://www.hexchat.org/home/downloads LicenseFile=COPYING -UninstallDisplayIcon={app}\xchat.exe -UninstallDisplayName=XChat-WDK (x64) -DefaultDirName={pf}\XChat-WDK -DefaultGroupName=XChat-WDK +UninstallDisplayIcon={app}\hexchat.exe +UninstallDisplayName=HexChat (x64) +DefaultDirName={pf}\HexChat +DefaultGroupName=HexChat DisableProgramGroupPage=yes SolidCompression=yes SourceDir=..\rel @@ -28,9 +28,9 @@ Name: "minimal"; Description: "Minimal Installation" Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] -Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed -Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning -Name: "xtm"; Description: "XChat Theme Manager (Requires .NET 4.0)"; Types: full custom; Flags: disablenouninstallwarning +Name: "libs"; Description: "HexChat"; Types: normal full minimal custom; Flags: fixed +Name: "xctext"; Description: "HexChat-Text"; Types: full custom; Flags: disablenouninstallwarning +Name: "xtm"; Description: "HexChat Theme Manager (Requires .NET 4.0)"; Types: full custom; Flags: disablenouninstallwarning Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning ;obs Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning @@ -66,19 +66,19 @@ Name: perl516; Description: "5.16"; GroupDescription: "Perl version:"; Flags: ex Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: ""; ValueData: "URL:IRC Protocol"; Flags: uninsdeletevalue; Tasks: not portable Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletevalue; Tasks: not portable -Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable +Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\hexchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable Root: HKCR; Subkey: "irc\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Tasks: not portable -Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable +Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\hexchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable Root: HKCR; Subkey: ".xct"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Components:xtm; Tasks: not portable -Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: ""; ValueData: "XChat Theme File"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable -Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: "XChat Theme File"; ValueData: ""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable +Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: ""; ValueData: "HexChat Theme File"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable +Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: "HexChat Theme File"; ValueData: ""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable Root: HKCR; Subkey: ".xct\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\thememan.exe,0"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable Root: HKCR; Subkey: ".xct\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable Root: HKCR; Subkey: ".xct\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\thememan.exe ""%1"""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable [Run] -Filename: "{app}\xchat.exe"; Description: "Run XChat-WDK after closing the Wizard"; Flags: nowait postinstall skipifsilent +Filename: "{app}\hexchat.exe"; Description: "Run HexChat after closing the Wizard"; Flags: nowait postinstall skipifsilent [Files] ; Add the ISSkin DLL used for skinning Inno Setup installations. @@ -184,18 +184,18 @@ Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dl Source: "plugins\xcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514 Source: "plugins\xcperl-516.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl516 -Source: "xchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "xchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext +Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext Source: "thememan.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xtm [Icons] -Name: "{group}\XChat-WDK (x64)"; Filename: "{app}\xchat.exe"; Tasks: not portable -Name: "{group}\XChat-Text (x64)"; Filename: "{app}\xchat-text.exe"; Components: xctext; Tasks: not portable -Name: "{group}\XChat Theme Manager (x64)"; Filename: "{app}\thememan.exe"; Components: xtm; Tasks: not portable -Name: "{group}\Uninstall XChat-WDK (x64)"; Filename: "{uninstallexe}"; Tasks: not portable +Name: "{group}\HexChat (x64)"; Filename: "{app}\hexchat.exe"; Tasks: not portable +Name: "{group}\HexChat-Text (x64)"; Filename: "{app}\hexchat-text.exe"; Components: xctext; Tasks: not portable +Name: "{group}\HexChat Theme Manager (x64)"; Filename: "{app}\thememan.exe"; Components: xtm; Tasks: not portable +Name: "{group}\Uninstall HexChat (x64)"; Filename: "{uninstallexe}"; Tasks: not portable [Messages] -BeveledLabel= XChat-WDK +BeveledLabel= HexChat [Code] ///////////////////////////////////////////////////////////////////// @@ -206,7 +206,7 @@ var sUnInstPath: String; sUnInstallString: String; begin - sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\XChat-WDK (x64)_is1'); + sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\HexChat (x64)_is1'); sUnInstallString := ''; if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString); diff --git a/win32/installer/xchat-wdk-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss similarity index 89% rename from win32/installer/xchat-wdk-x86.skel.iss rename to win32/installer/hexchat-x86.skel.iss index 5cf32c47..eb6f3e32 100644 --- a/win32/installer/xchat-wdk-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -1,14 +1,14 @@ -AppName=XChat-WDK (x86) -AppPublisher=XChat-WDK -AppPublisherURL=http://www.xchat-wdk.org/ +AppName=HexChat (x86) +AppPublisher=HexChat +AppPublisherURL=http://www.hexchat.org/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny -AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list -AppUpdatesURL=http://www.xchat-wdk.org/home/downloads +AppSupportURL=https://github.com/hexchat/hexchat/issues +AppUpdatesURL=http://www.hexchat.org/home/downloads LicenseFile=COPYING -UninstallDisplayIcon={app}\xchat.exe -UninstallDisplayName=XChat-WDK (x86) -DefaultDirName={pf}\XChat-WDK -DefaultGroupName=XChat-WDK +UninstallDisplayIcon={app}\hexchat.exe +UninstallDisplayName=HexChat (x86) +DefaultDirName={pf}\HexChat +DefaultGroupName=HexChat DisableProgramGroupPage=yes SolidCompression=yes SourceDir=..\rel @@ -27,9 +27,9 @@ Name: "minimal"; Description: "Minimal Installation" Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] -Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed -Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning -Name: "xtm"; Description: "XChat Theme Manager (Requires .NET 4.0)"; Types: full custom; Flags: disablenouninstallwarning +Name: "libs"; Description: "HexChat"; Types: normal full minimal custom; Flags: fixed +Name: "xctext"; Description: "HexChat-Text"; Types: full custom; Flags: disablenouninstallwarning +Name: "xtm"; Description: "HexChat Theme Manager (Requires .NET 4.0)"; Types: full custom; Flags: disablenouninstallwarning Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning ;obs Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning @@ -65,19 +65,19 @@ Name: perl516; Description: "5.16"; GroupDescription: "Perl version:"; Flags: ex Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: ""; ValueData: "URL:IRC Protocol"; Flags: uninsdeletevalue; Tasks: not portable Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletevalue; Tasks: not portable -Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable +Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\hexchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable Root: HKCR; Subkey: "irc\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Tasks: not portable -Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable +Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\hexchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable Root: HKCR; Subkey: ".xct"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Components:xtm; Tasks: not portable -Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: ""; ValueData: "XChat Theme File"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable -Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: "XChat Theme File"; ValueData: ""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable +Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: ""; ValueData: "HexChat Theme File"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable +Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: "HexChat Theme File"; ValueData: ""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable Root: HKCR; Subkey: ".xct\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\thememan.exe,0"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable Root: HKCR; Subkey: ".xct\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable Root: HKCR; Subkey: ".xct\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\thememan.exe ""%1"""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable [Run] -Filename: "{app}\xchat.exe"; Description: "Run XChat-WDK after closing the Wizard"; Flags: nowait postinstall skipifsilent +Filename: "{app}\hexchat.exe"; Description: "Run HexChat after closing the Wizard"; Flags: nowait postinstall skipifsilent [Files] ; Add the ISSkin DLL used for skinning Inno Setup installations. @@ -185,18 +185,18 @@ Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dl Source: "plugins\xcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514 Source: "plugins\xcperl-516.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl516 -Source: "xchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "xchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext +Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext Source: "thememan.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xtm [Icons] -Name: "{group}\XChat-WDK (x86)"; Filename: "{app}\xchat.exe"; Tasks: not portable -Name: "{group}\XChat-Text (x86)"; Filename: "{app}\xchat-text.exe"; Components: xctext; Tasks: not portable -Name: "{group}\XChat Theme Manager (x86)"; Filename: "{app}\thememan.exe"; Components: xtm; Tasks: not portable -Name: "{group}\Uninstall XChat-WDK (x86)"; Filename: "{uninstallexe}"; Tasks: not portable +Name: "{group}\HexChat (x86)"; Filename: "{app}\hexchat.exe"; Tasks: not portable +Name: "{group}\HexChat-Text (x86)"; Filename: "{app}\hexchat-text.exe"; Components: xctext; Tasks: not portable +Name: "{group}\HexChat Theme Manager (x86)"; Filename: "{app}\thememan.exe"; Components: xtm; Tasks: not portable +Name: "{group}\Uninstall HexChat (x86)"; Filename: "{uninstallexe}"; Tasks: not portable [Messages] -BeveledLabel= XChat-WDK +BeveledLabel= HexChat [Code] ///////////////////////////////////////////////////////////////////// @@ -207,7 +207,7 @@ var sUnInstPath: String; sUnInstallString: String; begin - sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\XChat-WDK (x86)_is1'); + sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\HexChat (x86)_is1'); sUnInstallString := ''; if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString); diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index 0fcba484..ed1c4b74 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -34,11 +34,11 @@ - + - + @@ -62,16 +62,16 @@ true - echo [Setup] > "$(OutDir)\xchat-wdk-x86.iss" -echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" >> "$(OutDir)\xchat-wdk-x86.iss" -echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDir)\xchat-wdk-x86.iss" -"$(OutDir)\version" -a >> "$(OutDir)\xchat-wdk-x86.iss" -"$(OutDir)\version" -v >> "$(OutDir)\xchat-wdk-x86.iss" -"$(OutDir)\version" -i >> "$(OutDir)\xchat-wdk-x86.iss" -"$(OutDir)\version" -o >> "$(OutDir)\xchat-wdk-x86.iss" -echo SetupIconFile="$(SolutionDir)\..\xchat.ico" >> "$(OutDir)\xchat-wdk-x86.iss" -type xchat-wdk-x86.skel.iss >> "$(OutDir)\xchat-wdk-x86.iss" -"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\xchat-wdk-x86.iss" + echo [Setup] > "$(OutDir)\hexchat-x86.iss" +echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" >> "$(OutDir)\hexchat-x86.iss" +echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDir)\hexchat-x86.iss" +"$(OutDir)\version" -a >> "$(OutDir)\hexchat-x86.iss" +"$(OutDir)\version" -v >> "$(OutDir)\hexchat-x86.iss" +"$(OutDir)\version" -i >> "$(OutDir)\hexchat-x86.iss" +"$(OutDir)\version" -o >> "$(OutDir)\hexchat-x86.iss" +echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-x86.iss" +type hexchat-x86.skel.iss >> "$(OutDir)\hexchat-x86.iss" +"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss" @@ -87,16 +87,16 @@ type xchat-wdk-x86.skel.iss >> "$(OutDir)\xchat-wdk-x86.iss" true - echo [Setup] > "$(OutDir)\xchat-wdk-x64.iss" -echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" >> "$(OutDir)\xchat-wdk-x64.iss" -echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDir)\xchat-wdk-x64.iss" -"$(OutDir)\version" -a >> "$(OutDir)\xchat-wdk-x64.iss" -"$(OutDir)\version" -v >> "$(OutDir)\xchat-wdk-x64.iss" -"$(OutDir)\version" -i >> "$(OutDir)\xchat-wdk-x64.iss" -"$(OutDir)\version" -o >> "$(OutDir)\xchat-wdk-x64.iss" -echo SetupIconFile="$(SolutionDir)\..\xchat.ico" >> "$(OutDir)\xchat-wdk-x64.iss" -type xchat-wdk-x64.skel.iss >> "$(OutDir)\xchat-wdk-x64.iss" -"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\xchat-wdk-x64.iss" + echo [Setup] > "$(OutDir)\hexchat-x64.iss" +echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" >> "$(OutDir)\hexchat-x64.iss" +echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDir)\hexchat-x64.iss" +"$(OutDir)\version" -a >> "$(OutDir)\hexchat-x64.iss" +"$(OutDir)\version" -v >> "$(OutDir)\hexchat-x64.iss" +"$(OutDir)\version" -i >> "$(OutDir)\hexchat-x64.iss" +"$(OutDir)\version" -o >> "$(OutDir)\hexchat-x64.iss" +echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-x64.iss" +type hexchat-x64.skel.iss >> "$(OutDir)\hexchat-x64.iss" +"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss" @@ -104,8 +104,8 @@ type xchat-wdk-x64.skel.iss >> "$(OutDir)\xchat-wdk-x64.iss" - - + + diff --git a/win32/installer/installer.vcxproj.filters b/win32/installer/installer.vcxproj.filters index b18a6411..ce194a17 100644 --- a/win32/installer/installer.vcxproj.filters +++ b/win32/installer/installer.vcxproj.filters @@ -7,10 +7,10 @@ - + Resource Files - + Resource Files diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj index 9c0ecff4..11b538c5 100644 --- a/win32/nls/nls.vcxproj +++ b/win32/nls/nls.vcxproj @@ -34,11 +34,11 @@ - + - +