Get rid of the buggy, unmaintained and unused Lua and Tcl interfaces

6 files changed, 50 insertions, 56 deletions

diff --git a/configure.ac b/configure.ac
index 94270e2d..0d7534c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,9 +126,9 @@ AC_ARG_ENABLE(perl_old,
 	[AS_HELP_STRING([--disable-perl_old],[no backwards compatibility for perl plugin])],
         perl_old=$enableval, perl_old=yes)
 
-AC_ARG_ENABLE(tcl,
-	[AS_HELP_STRING([--enable-tcl[=PATH]],[directory with Tcl config file: tclConfig.sh])],
-        tcl=$enableval, tcl=yes)
+dnl AC_ARG_ENABLE(tcl,
+dnl 	[AS_HELP_STRING([--enable-tcl[=PATH]],[directory with Tcl config file: tclConfig.sh])],
+dnl         tcl=$enableval, tcl=yes)
 
 AC_ARG_ENABLE(plugin,
 	[AS_HELP_STRING([--disable-plugin],[disable plugin support])],
@@ -368,26 +368,26 @@ dnl *********************************************************************
 dnl ** TCL **************************************************************
 dnl *********************************************************************
 
-AC_MSG_CHECKING(for location of tclConfig.sh)
-dirs="$tcl /lib /usr/lib /usr/tcl/lib /usr/lib/tcl8.4 /usr/local/lib /usr/local/tcl-8.4/lib /usr/local/tcl/lib /opt/lib /usr/lib/tcl8.3"
-found=0
-if test "$tcl" != "no"; then
-	tcl=no
-	for try in $dirs; do
-		if test -f $try/tclConfig.sh; then
-			found=1
-			. $try/tclConfig.sh
-			TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
-			TCL_CFLAGS="-I${TCL_PREFIX}/include $TCL_INCLUDE_SPEC"
-			tcl=yes
-			AC_MSG_RESULT($try/tclConfig.sh)
-			break
-		fi
-	done
-	if test "$found" -eq 0 ; then
-		AC_MSG_RESULT([tclConfig.sh not found - use the --enable-tcl option])
-	fi
-fi
+dnl AC_MSG_CHECKING(for location of tclConfig.sh)
+dnl dirs="$tcl /lib /usr/lib /usr/tcl/lib /usr/lib/tcl8.4 /usr/local/lib /usr/local/tcl-8.4/lib /usr/local/tcl/lib /opt/lib /usr/lib/tcl8.3"
+dnl found=0
+dnl if test "$tcl" != "no"; then
+dnl 	tcl=no
+dnl 	for try in $dirs; do
+dnl 		if test -f $try/tclConfig.sh; then
+dnl 			found=1
+dnl 			. $try/tclConfig.sh
+dnl 			TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
+dnl 			TCL_CFLAGS="-I${TCL_PREFIX}/include $TCL_INCLUDE_SPEC"
+dnl 			tcl=yes
+dnl 			AC_MSG_RESULT($try/tclConfig.sh)
+dnl 			break
+dnl 		fi
+dnl 	done
+dnl 	if test "$found" -eq 0 ; then
+dnl 		AC_MSG_RESULT([tclConfig.sh not found - use the --enable-tcl option])
+dnl 	fi
+dnl fi
 
 dnl *********************************************************************
 dnl ** IPv6 *************************************************************
@@ -692,7 +692,7 @@ AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
 AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
 AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
 AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
-AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
+dnl AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
 AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
 AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes")
 AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes")
@@ -923,8 +923,8 @@ AC_SUBST(PERL_CFLAGS)
 AC_SUBST(PERL_LDFLAGS)
 AC_SUBST(PY_CFLAGS)
 AC_SUBST(PY_LIBS)
-AC_SUBST(TCL_LIBS)
-AC_SUBST(TCL_CFLAGS)
+dnl AC_SUBST(TCL_LIBS)
+dnl AC_SUBST(TCL_CFLAGS)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
@@ -959,7 +959,6 @@ src/pixmaps/Makefile
 plugins/Makefile
 plugins/python/Makefile
 plugins/perl/Makefile
-plugins/tcl/Makefile
 plugins/checksum/Makefile
 plugins/doat/Makefile
 plugins/fishlim/Makefile
@@ -968,6 +967,7 @@ intl/Makefile
 po/Makefile.in
 man/Makefile
 ])
+dnl plugins/tcl/Makefile
 dnl plugins/sasl/Makefile
 
 echo
@@ -995,7 +995,7 @@ echo libproxy support ...... : $libproxy
 echo
 echo Perl .................. : $perl
 echo Python ................ : $python
-echo Tcl ................... : $tcl
+dnl echo Tcl ................... : $tcl
 echo
 echo Checksum .............. : $checksum
 echo Do At ................. : $doat
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 73a91bce..493c5760 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -11,9 +11,9 @@ if DO_PERL
 perldir = perl
 endif
 
-if DO_TCL
-tcldir = tcl
-endif
+#if DO_TCL
+#tcldir = tcl
+#endif
 
 #if DO_SASL
 #sasldir = sasl
@@ -35,5 +35,5 @@ if DO_SYSINFO
 sysinfodir = sysinfo
 endif
 
-#SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc
-SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(doatdir) $(fishlimdir) $(checksumdir) $(sysinfodir)
+#SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc $(tcldir) $(sasldir)
+SUBDIRS = . $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir)
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 9104b1af..bda8d926 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -17,7 +17,7 @@
     <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>

     <GendefPath>$(YourGendefPath)</GendefPath>

     <MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>

-    <LuaLib>lua51</LuaLib>

+    <!--LuaLib>lua51</LuaLib>

     <LuaOutput>hclua</LuaOutput>

     <TclPath>$(YourTclPath)\$(PlatformName)</TclPath>

     <TclLib>tcl85</TclLib>

@@ -27,7 +27,7 @@
     <Perl512Output>hcperl-512</Perl512Output>

     <Perl514Path>$(YourPerl514Path)\$(PlatformName)</Perl514Path>

     <Perl514Lib>perl514</Perl514Lib>

-    <Perl514Output>hcperl-514</Perl514Output>

+    <Perl514Output>hcperl-514</Perl514Output-->

     <Perl516Path>$(YourPerl516Path)\$(PlatformName)</Perl516Path>

     <Perl516Lib>perl516</Perl516Lib>

     <Perl516Output>hcperl-516</Perl516Output>

@@ -70,7 +70,7 @@ copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\libintl.dll" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\libpng15.dll" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatRel)"

-copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)"

+::copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\pango-1.0.dll" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\pangocairo-1.0.dll" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\pangoft2-1.0.dll" "$(HexChatRel)"

@@ -90,13 +90,13 @@ copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hchextray.dll" "$(HexChatRel)\plugins"

-copy "$(HexChatBin)hclua.dll" "$(HexChatRel)\plugins"

+::copy "$(HexChatBin)hclua.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcmpcinfo.dll" "$(HexChatRel)\plugins"

 ::copy "$(HexChatBin)hcperl-512.dll" "$(HexChatRel)\plugins"

 ::copy "$(HexChatBin)hcperl-514.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcpython.dll" "$(HexChatRel)\plugins"

-copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins"

+::copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins"

diff --git a/win32/hexchat.sln b/win32/hexchat.sln
index 49688791..35e3070d 100644
--- a/win32/hexchat.sln
+++ b/win32/hexchat.sln
@@ -77,7 +77,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj",
 	ProjectSection(ProjectDependencies) = postProject

 		{19C52A0A-A790-409E-A28A-9745FF990F5C} = {19C52A0A-A790-409E-A28A-9745FF990F5C}

 		{E7F4DB0A-510D-41EF-B284-6E1DE1CC450D} = {E7F4DB0A-510D-41EF-B284-6E1DE1CC450D}

-		{646B4316-C8B8-4DB6-B6AE-E586929E5729} = {646B4316-C8B8-4DB6-B6AE-E586929E5729}

 		{4980AF24-9D42-427D-A8E6-0DF3B97C455D} = {4980AF24-9D42-427D-A8E6-0DF3B97C455D}

 		{3024CF36-85E5-4E00-9608-7002E2C7EF14} = {3024CF36-85E5-4E00-9608-7002E2C7EF14}

 		{58654438-F674-42F7-88FA-73EF90AD80B1} = {58654438-F674-42F7-88FA-73EF90AD80B1}

@@ -85,7 +84,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj",
 		{B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B}

 		{461DC24A-A410-4171-8C02-CCDBF3702C2A} = {461DC24A-A410-4171-8C02-CCDBF3702C2A}

 		{E93E1255-95D1-4B08-8FDF-B53CC6A21280} = {E93E1255-95D1-4B08-8FDF-B53CC6A21280}

-		{2773666A-8CFC-4533-A043-EAD59F16A1C7} = {2773666A-8CFC-4533-A043-EAD59F16A1C7}

 		{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} = {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}

 		{987E9374-98A1-44BA-946F-D3472D7A7055} = {987E9374-98A1-44BA-946F-D3472D7A7055}

 		{5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91}

@@ -135,9 +133,7 @@ Global
 		{E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|x64.ActiveCfg = Release|x64

 		{E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|x64.Build.0 = Release|x64

 		{2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|Win32.ActiveCfg = Release|Win32

-		{2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|Win32.Build.0 = Release|Win32

 		{2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|x64.ActiveCfg = Release|x64

-		{2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|x64.Build.0 = Release|x64

 		{987E9374-98A1-44BA-946F-D3472D7A7055}.Release|Win32.ActiveCfg = Release|Win32

 		{987E9374-98A1-44BA-946F-D3472D7A7055}.Release|x64.ActiveCfg = Release|x64

 		{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}.Release|Win32.ActiveCfg = Release|Win32

@@ -151,9 +147,7 @@ Global
 		{19C52A0A-A790-409E-A28A-9745FF990F5C}.Release|x64.ActiveCfg = Release|x64

 		{19C52A0A-A790-409E-A28A-9745FF990F5C}.Release|x64.Build.0 = Release|x64

 		{646B4316-C8B8-4DB6-B6AE-E586929E5729}.Release|Win32.ActiveCfg = Release|Win32

-		{646B4316-C8B8-4DB6-B6AE-E586929E5729}.Release|Win32.Build.0 = Release|Win32

 		{646B4316-C8B8-4DB6-B6AE-E586929E5729}.Release|x64.ActiveCfg = Release|x64

-		{646B4316-C8B8-4DB6-B6AE-E586929E5729}.Release|x64.Build.0 = Release|x64

 		{4980AF24-9D42-427D-A8E6-0DF3B97C455D}.Release|Win32.ActiveCfg = Release|Win32

 		{4980AF24-9D42-427D-A8E6-0DF3B97C455D}.Release|Win32.Build.0 = Release|Win32

 		{4980AF24-9D42-427D-A8E6-0DF3B97C455D}.Release|x64.ActiveCfg = Release|x64

diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 1e04c82c..7f0a55bc 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -48,11 +48,11 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags:
 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: custom; Flags: disablenouninstallwarning

 Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning

-Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning

-Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: custom; Flags: disablenouninstallwarning

+;Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning

+;Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: custom; Flags: disablenouninstallwarning

 Name: "langs\perl"; Description: "Perl"; Types: custom; Flags: disablenouninstallwarning

 Name: "langs\python"; Description: "Python"; Types: custom; Flags: disablenouninstallwarning

-Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallwarning

+;Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallwarning

 

 [Tasks]

 Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked

@@ -115,7 +115,7 @@ Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: li
 Source: "libintl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "libpng15.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

-Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

+;Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "pango-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "pangocairo-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "pangoft2-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

@@ -157,9 +157,9 @@ Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion;
 Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray

 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa

 

-Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua

+;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\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl

 

 ;Source: "plugins\hcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512

 ;Source: "plugins\hcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514

diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index 8c18ac2f..48d02c42 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -47,11 +47,11 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags:
 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: custom; Flags: disablenouninstallwarning

 Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning

-Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning

-Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: custom; Flags: disablenouninstallwarning

+;Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning

+;Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: custom; Flags: disablenouninstallwarning

 Name: "langs\perl"; Description: "Perl"; Types: custom; Flags: disablenouninstallwarning

 Name: "langs\python"; Description: "Python"; Types: custom; Flags: disablenouninstallwarning

-Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallwarning

+;Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallwarning

 

 [Tasks]

 Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked

@@ -114,7 +114,7 @@ Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: li
 Source: "libintl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "libpng15.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

-Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

+;Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "pango-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "pangocairo-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

 Source: "pangoft2-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

@@ -156,9 +156,9 @@ Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion;
 Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray

 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa

 

-Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua

+;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\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl

 

 ;Source: "plugins\hcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512

 ;Source: "plugins\hcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514