diff --git a/plugins/checksum/checksum.vcxproj b/plugins/checksum/checksum.vcxproj index 194526d5..693cf96e 100644 --- a/plugins/checksum/checksum.vcxproj +++ b/plugins/checksum/checksum.vcxproj @@ -44,13 +44,13 @@ false - xcchecksum + hcchecksum $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcchecksum + hcchecksum $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/dns/dns.vcxproj b/plugins/dns/dns.vcxproj index d264548f..50ed19b8 100644 --- a/plugins/dns/dns.vcxproj +++ b/plugins/dns/dns.vcxproj @@ -44,13 +44,13 @@ false - xcdns + hcdns $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcdns + hcdns $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/doat/doat.vcxproj b/plugins/doat/doat.vcxproj index f6e22a3f..20c753df 100644 --- a/plugins/doat/doat.vcxproj +++ b/plugins/doat/doat.vcxproj @@ -44,13 +44,13 @@ false - xcdoat + hcdoat $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcdoat + hcdoat $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/exec/exec.vcxproj b/plugins/exec/exec.vcxproj index c68a3a65..002459b1 100644 --- a/plugins/exec/exec.vcxproj +++ b/plugins/exec/exec.vcxproj @@ -44,13 +44,13 @@ false - xcexec + hcexec $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcexec + hcexec $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/fishlim/fishlim.vcxproj b/plugins/fishlim/fishlim.vcxproj index 68a240d7..4216f953 100644 --- a/plugins/fishlim/fishlim.vcxproj +++ b/plugins/fishlim/fishlim.vcxproj @@ -44,13 +44,13 @@ false - xcfishlim + hcfishlim $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcfishlim + hcfishlim $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/mpcinfo/mpcinfo.vcxproj b/plugins/mpcinfo/mpcinfo.vcxproj index 65f5e2b4..049e136c 100644 --- a/plugins/mpcinfo/mpcinfo.vcxproj +++ b/plugins/mpcinfo/mpcinfo.vcxproj @@ -44,13 +44,13 @@ false - xcmpcinfo + hcmpcinfo $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcmpcinfo + hcmpcinfo $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/xsasl/xsasl.c b/plugins/sasl/sasl.c similarity index 93% rename from plugins/xsasl/xsasl.c rename to plugins/sasl/sasl.c index a4d619c6..30af0e42 100644 --- a/plugins/xsasl/xsasl.c +++ b/plugins/sasl/sasl.c @@ -40,10 +40,10 @@ #include "xchat-plugin.h" static xchat_plugin *ph; /* plugin handle */ -static const char name[] = "X-SASL"; +static const char name[] = "SASL"; static const char desc[] = "SASL authentication plugin for HexChat"; static const char version[] = "1.1"; -static const char xsasl_help[] = "X-SASL Usage:\n /XSASL ADD , enable/update SASL authentication for given network\n /XSASL DEL , disable SASL authentication for given network\n /XSASL LIST, get the list of SASL-enabled networks\n"; +static const char sasl_help[] = "SASL Usage:\n /SASL ADD , enable/update SASL authentication for given network\n /SASL DEL , disable SASL authentication for given network\n /SASL LIST, get the list of SASL-enabled networks\n"; struct sasl_info { @@ -219,7 +219,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata) if (!network || !*network) /* only check for the last word, if it's there, the previous ones will be there, too */ { - xchat_printf (ph, "%s", xsasl_help); + xchat_printf (ph, "%s", sasl_help); return XCHAT_EAT_ALL; } @@ -240,7 +240,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata) if (!network || !*network) { - xchat_printf (ph, "%s", xsasl_help); + xchat_printf (ph, "%s", sasl_help); return XCHAT_EAT_ALL; } @@ -262,7 +262,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata) } else { - xchat_printf (ph, "%s", xsasl_help); + xchat_printf (ph, "%s", sasl_help); return XCHAT_EAT_ALL; } } @@ -290,7 +290,7 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi *plugin_desc = desc; *plugin_version = version; - xchat_hook_command (ph, "XSASL", XCHAT_PRI_NORM, sasl_cmd_cb, xsasl_help, 0); + xchat_hook_command (ph, "SASL", XCHAT_PRI_NORM, sasl_cmd_cb, sasl_help, 0); xchat_hook_print (ph, "Connected", XCHAT_PRI_NORM, connect_cb, NULL); /* xchat_hook_print (ph, "Disconnected", XCHAT_PRI_NORM, disconnect_cb, NULL); */ xchat_hook_server (ph, "CAP", XCHAT_PRI_NORM, cap_cb, NULL); diff --git a/plugins/xsasl/xsasl.def b/plugins/sasl/sasl.def similarity index 100% rename from plugins/xsasl/xsasl.def rename to plugins/sasl/sasl.def diff --git a/plugins/xsasl/xsasl.vcxproj b/plugins/sasl/sasl.vcxproj similarity index 89% rename from plugins/xsasl/xsasl.vcxproj rename to plugins/sasl/sasl.vcxproj index 8b98b0d6..0261fb60 100644 --- a/plugins/xsasl/xsasl.vcxproj +++ b/plugins/sasl/sasl.vcxproj @@ -13,7 +13,7 @@ {18871EBA-AC85-4652-8919-EB8064B9A714} Win32Proj - xsasl + sasl @@ -44,13 +44,13 @@ false - xcxsasl + hcsasl $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcxsasl + hcsasl $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) @@ -62,7 +62,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;XSASL_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SASL_EXPORTS;%(PreprocessorDefinitions) $(Glib);..;%(AdditionalIncludeDirectories) true @@ -71,7 +71,7 @@ true true true - xsasl.def + sasl.def $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) @@ -84,7 +84,7 @@ MaxSpeed true true - WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;XSASL_EXPORTS;%(PreprocessorDefinitions) + WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;SASL_EXPORTS;%(PreprocessorDefinitions) $(Glib);..;%(AdditionalIncludeDirectories) true @@ -93,16 +93,16 @@ true true true - xsasl.def + sasl.def $(DepsRoot)\lib;%(AdditionalLibraryDirectories) $(DepLibs);%(AdditionalDependencies) - + - + diff --git a/plugins/xsasl/xsasl.vcxproj.filters b/plugins/sasl/sasl.vcxproj.filters similarity index 88% rename from plugins/xsasl/xsasl.vcxproj.filters rename to plugins/sasl/sasl.vcxproj.filters index b01aa8eb..51596443 100644 --- a/plugins/xsasl/xsasl.vcxproj.filters +++ b/plugins/sasl/sasl.vcxproj.filters @@ -11,12 +11,12 @@ - + Resource Files - + Source Files diff --git a/plugins/xsasl/xsasl.vcxproj.user b/plugins/sasl/sasl.vcxproj.user similarity index 100% rename from plugins/xsasl/xsasl.vcxproj.user rename to plugins/sasl/sasl.vcxproj.user diff --git a/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj index 4c07326c..6a69b626 100644 --- a/plugins/upd/upd.vcxproj +++ b/plugins/upd/upd.vcxproj @@ -44,13 +44,13 @@ false - xcupd + hcupd $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcupd + hcupd $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/winamp/winamp.vcxproj b/plugins/winamp/winamp.vcxproj index 2458bf9c..06be9992 100644 --- a/plugins/winamp/winamp.vcxproj +++ b/plugins/winamp/winamp.vcxproj @@ -44,13 +44,13 @@ false - xcwinamp + hcwinamp $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcwinamp + hcwinamp $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/winsys/winsys.vcxproj b/plugins/winsys/winsys.vcxproj index 10413fe1..2491bd14 100644 --- a/plugins/winsys/winsys.vcxproj +++ b/plugins/winsys/winsys.vcxproj @@ -44,13 +44,13 @@ false - xcwinsys + hcwinsys $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcwinsys + hcwinsys $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/plugins/wmpa/wmpa.vcxproj b/plugins/wmpa/wmpa.vcxproj index 4ae24598..792ae0ad 100644 --- a/plugins/wmpa/wmpa.vcxproj +++ b/plugins/wmpa/wmpa.vcxproj @@ -46,13 +46,13 @@ false - xcwmpa + hcwmpa $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) false - xcwmpa + hcwmpa $(SolutionDir)build\$(PlatformName)\bin $(SolutionDir)build\$(PlatformName)\obj\$(ProjectName) diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj index a9db3e24..1e3a72fe 100644 --- a/win32/copy/copy.vcxproj +++ b/win32/copy/copy.vcxproj @@ -107,24 +107,24 @@ 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" +xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatDest)\plugins\" +copy "$(OutDir)\hcdns.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcdoat.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcexec.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcfishlim.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hclua.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcmpcinfo.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcperl-512.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcperl-514.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcperl-516.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcpython.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hctcl.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcupd.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcsasl.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\hextray.dll" "$(HexChatDest)\plugins" -copy "$(OutDir)\xcwinamp.dll" "$(HexChatDest)\plugins" -copy "$(OutDir)\xcwinsys.dll" "$(HexChatDest)\plugins" -copy "$(OutDir)\xcwmpa.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcwinamp.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcwinsys.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcwmpa.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" @@ -190,24 +190,24 @@ 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" +xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatDest)\plugins\" +copy "$(OutDir)\hcdns.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcdoat.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcexec.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcfishlim.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hclua.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcmpcinfo.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcperl-512.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcperl-514.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcperl-516.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcpython.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hctcl.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcupd.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcsasl.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\hextray.dll" "$(HexChatDest)\plugins" -copy "$(OutDir)\xcwinamp.dll" "$(HexChatDest)\plugins" -copy "$(OutDir)\xcwinsys.dll" "$(HexChatDest)\plugins" -copy "$(OutDir)\xcwmpa.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcwinamp.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcwinsys.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hcwmpa.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" diff --git a/win32/hexchat.props b/win32/hexchat.props index 97e512b0..0f2a0df7 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -15,22 +15,22 @@ $(YourDepsPath)\$(PlatformName) $(YourGendefPath) lua51 - xclua + hclua $(YourTclPath)\$(PlatformName) tcl85 - xctcl + hctcl $(YourPerl512Path)\$(PlatformName) perl512 - xcperl-512 + hcperl-512 $(YourPerl514Path)\$(PlatformName) perl514 - xcperl-514 + hcperl-514 $(YourPerl516Path)\$(PlatformName) perl516 - xcperl-516 + hcperl-516 $(YourPythonPath)\$(PlatformName) python27 - xcpython + hcpython $(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" hexchatpng "$(SolutionDir)\..\hexchat.png" diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 13e10d3b..cb869353 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -78,7 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp", "..\plugins\winamp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsys", "..\plugins\winsys\winsys.vcxproj", "{6C0CA980-97C5-427A-BE61-5BCECAFABBDA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xsasl", "..\plugins\xsasl\xsasl.vcxproj", "{18871EBA-AC85-4652-8919-EB8064B9A714}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sasl", "..\plugins\sasl\sasl.vcxproj", "{18871EBA-AC85-4652-8919-EB8064B9A714}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hextray", "..\plugins\hextray\hextray.vcxproj", "{3024CF36-85E5-4E00-9608-7002E2C7EF14}" EndProject diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index 3d94ccb3..799f224f 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -40,14 +40,14 @@ Name: "plugins\dns"; Description: "DNS"; Types: full custom; Flags: disablenouni Name: "plugins\doat"; Description: "Do At"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\exec"; Description: "Exec"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: full custom; Flags: disablenouninstallwarning +Name: "plugins\hextray"; Description: "HexTray"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal full custom; Flags: disablenouninstallwarning +Name: "plugins\sasl"; Description: "SASL"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning -Name: "plugins\xsasl"; Description: "X-SASL"; Types: full custom; Flags: disablenouninstallwarning -Name: "plugins\hextray"; Description: "HexTray"; Types: full custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom; Flags: disablenouninstallwarning @@ -155,34 +155,34 @@ Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; ;obs Source: "lib\gtk-2.0\2.10.0\engines\libmurrine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: gtkengines ;obs Source: "lib\gtk-2.0\2.10.0\engines\libredmond95.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: gtkengines ;obs Source: "lib\gtk-2.0\2.10.0\engines\libthinice.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: gtkengines -;obs Source: "plugins\xcgtkpref.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: gtkengines +;obs Source: "plugins\hcgtkpref.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: gtkengines ;obs Source: "share\themes\*"; DestDir: "{app}\share\themes"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: gtkengines ;obs Source: "gtk2-prefs.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: gtkengines -Source: "plugins\xcchecksum.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\checksum -Source: "plugins\xcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\dns -Source: "plugins\xcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat -Source: "plugins\xcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec -Source: "plugins\xcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim +Source: "plugins\hcchecksum.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\checksum +Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\dns +Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat +Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec +Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo -Source: "plugins\xcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo -;Source: "plugins\xcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp +Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo +;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd -Source: "plugins\xcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd -Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp +Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd +Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winsys -Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys -Source: "plugins\xcxsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\xsasl +Source: "plugins\hcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys +Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray -Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa +Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa -Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua -Source: "plugins\xcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python -Source: "plugins\xctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl +Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua +Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python +Source: "plugins\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl -Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512 -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: "plugins\hcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512 +Source: "plugins\hcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514 +Source: "plugins\hcperl-516.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl516 Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index c16ea7e0..21b5efda 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -39,14 +39,14 @@ Name: "plugins\dns"; Description: "DNS"; Types: full custom; Flags: disablenouni Name: "plugins\doat"; Description: "Do At"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\exec"; Description: "Exec"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: full custom; Flags: disablenouninstallwarning +Name: "plugins\hextray"; Description: "HexTray"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal full custom; Flags: disablenouninstallwarning +Name: "plugins\sasl"; Description: "SASL"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning -Name: "plugins\xsasl"; Description: "X-SASL"; Types: full custom; Flags: disablenouninstallwarning -Name: "plugins\hextray"; Description: "HexTray"; Types: full custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom; Flags: disablenouninstallwarning @@ -156,34 +156,34 @@ Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; ;obs Source: "lib\gtk-2.0\2.10.0\engines\libmurrine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: gtkengines ;obs Source: "lib\gtk-2.0\2.10.0\engines\libredmond95.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: gtkengines ;obs Source: "lib\gtk-2.0\2.10.0\engines\libthinice.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: gtkengines -;obs Source: "plugins\xcgtkpref.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: gtkengines +;obs Source: "plugins\hcgtkpref.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: gtkengines ;obs Source: "share\themes\*"; DestDir: "{app}\share\themes"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: gtkengines ;obs Source: "gtk2-prefs.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: gtkengines -Source: "plugins\xcchecksum.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\checksum -Source: "plugins\xcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\dns -Source: "plugins\xcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat -Source: "plugins\xcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec -Source: "plugins\xcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim +Source: "plugins\hcchecksum.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\checksum +Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\dns +Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat +Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec +Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo -Source: "plugins\xcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo -;Source: "plugins\xcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp +Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo +;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd -Source: "plugins\xcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd -Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp +Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd +Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winsys -Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys -Source: "plugins\xcxsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\xsasl +Source: "plugins\hcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys +Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray -Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa +Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa -Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua -Source: "plugins\xcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python -Source: "plugins\xctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl +Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua +Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python +Source: "plugins\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl -Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512 -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: "plugins\hcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512 +Source: "plugins\hcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514 +Source: "plugins\hcperl-516.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl516 Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext