Skip to content

Commit

Permalink
javascript: disable build by default and remove Debian packaging of J…
Browse files Browse the repository at this point in the history
…avaScript plugin (issue #360)
  • Loading branch information
flashcode committed Jun 13, 2020
1 parent 99a324b commit 340d664
Show file tree
Hide file tree
Showing 30 changed files with 125 additions and 342 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -110,7 +110,7 @@ option(ENABLE_RUBY "Enable Ruby scripting language" ON)
option(ENABLE_LUA "Enable Lua scripting language" ON)
option(ENABLE_TCL "Enable Tcl scripting language" ON)
option(ENABLE_GUILE "Enable Scheme (guile) scripting language" ON)
option(ENABLE_JAVASCRIPT "Enable JavaScript scripting language" ON)
option(ENABLE_JAVASCRIPT "Enable JavaScript scripting language" OFF)
option(ENABLE_PHP "Enable PHP scripting language" ON)
option(ENABLE_SPELL "Enable Spell checker plugin" ON)
option(ENABLE_ENCHANT "Enable Enchant lib for Spell checker plugin" OFF)
Expand Down
1 change: 1 addition & 0 deletions ChangeLog.adoc
Expand Up @@ -89,6 +89,7 @@ Tests::

Build::

* javascript: disable build by default and remove Debian packaging of JavaScript plugin (issue #360)
* core: make GnuTLS a required dependency
* core: fix build with CMake 3.17.0
* core: fix build with cygport on Cygwin
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -159,7 +159,7 @@ AC_ARG_ENABLE(ruby, [ --disable-ruby turn off Ruby script plug
AC_ARG_ENABLE(lua, [ --disable-lua turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
AC_ARG_ENABLE(tcl, [ --disable-tcl turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
AC_ARG_ENABLE(guile, [ --disable-guile turn off Guile (scheme) script plugin (default=compiled if found)],enable_guile=$enableval,enable_guile=yes)
AC_ARG_ENABLE(javascript, [ --disable-javascript turn off JavaScript script plugin (default=compiled if found)],enable_javascript=$enableval,enable_javascript=yes)
AC_ARG_ENABLE(javascript, [ --enable-javascript turn on JavaScript script plugin (default=off)],enable_javascript=$enableval,enable_javascript=no)
AC_ARG_ENABLE(php, [ --disable-php turn off PHP script plugin (default=compiled if found)],enable_php=$enableval,enable_php=yes)
AC_ARG_ENABLE(spell, [ --disable-spell turn off Spell checker plugin (default=compiled)],enable_spell=$enableval,enable_spell=yes)
AC_ARG_ENABLE(enchant, [ --enable-enchant turn on Enchant lib for Spell checker plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)
Expand Down
20 changes: 3 additions & 17 deletions debian-devel/control
Expand Up @@ -14,7 +14,6 @@ Build-Depends:
liblua5.3-dev,
tcl8.6-dev,
guile-2.2-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
libxml2-dev,
libcurl4-gnutls-dev,
Expand Down Expand Up @@ -47,7 +46,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
Expand Down Expand Up @@ -77,7 +76,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
Expand Down Expand Up @@ -108,7 +107,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
Expand Down Expand Up @@ -233,19 +232,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the Guile scripting API plugin.

Package: weechat-devel-javascript
Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
Depends:
${misc:Depends},
${shlibs:Depends},
weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
Conflicts: weechat-javascript
Description: Fast, light and extensible chat client - JavaScript plugin
WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
for many operating systems. Everything can be done with a keyboard.
.
This package provides the JavaScript scripting API plugin.

Package: weechat-devel-php
Architecture: any
Depends:
Expand Down
1 change: 0 additions & 1 deletion debian-devel/weechat-devel-javascript.dirs

This file was deleted.

1 change: 0 additions & 1 deletion debian-devel/weechat-devel-javascript.install

This file was deleted.

19 changes: 3 additions & 16 deletions debian-stable/control
Expand Up @@ -14,7 +14,6 @@ Build-Depends:
liblua5.3-dev,
tcl8.6-dev,
guile-2.2-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
libxml2-dev,
libcurl4-gnutls-dev,
Expand Down Expand Up @@ -46,7 +45,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
Expand Down Expand Up @@ -75,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
Expand Down Expand Up @@ -105,7 +104,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
Expand Down Expand Up @@ -222,18 +221,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the Guile scripting API plugin.

Package: weechat-javascript
Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
Depends:
${misc:Depends},
${shlibs:Depends},
weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
Description: Fast, light and extensible chat client - JavaScript plugin
WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
for many operating systems. Everything can be done with a keyboard.
.
This package provides the JavaScript scripting API plugin.

Package: weechat-php
Architecture: any
Depends:
Expand Down
9 changes: 0 additions & 9 deletions debian-stable/copyright
Expand Up @@ -78,15 +78,6 @@ Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org>
2012, Simon Arlott
License: GPL-3+

Files: src/plugins/javascript/weechat-js-api.cpp
src/plugins/javascript/weechat-js-api.h
src/plugins/javascript/weechat-js-v8.cpp
src/plugins/javascript/weechat-js-v8.h
src/plugins/javascript/weechat-js.cpp
src/plugins/javascript/weechat-js.h
Copyright: 2013, Koka El Kiwi <kokakiwi@kokakiwi.net>
License: GPL-3+

Files: src/plugins/lua/weechat-lua-api.c
Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org>
2012, Simon Arlott
Expand Down
1 change: 0 additions & 1 deletion debian-stable/weechat-javascript.dirs

This file was deleted.

1 change: 0 additions & 1 deletion debian-stable/weechat-javascript.install

This file was deleted.

2 changes: 1 addition & 1 deletion doc/de/weechat_user.de.adoc
Expand Up @@ -231,7 +231,7 @@ Liste von häufig verwendeten Optionen:
| ENABLE_IRC | `ON`, `OFF` | ON |
kompiliert <<irc_plugin,IRC Erweiterung>>.

| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
kompiliert <<scripts_plugins,JavaScript Erweiterung>>.

| ENABLE_LARGEFILE | `ON`, `OFF` | ON |
Expand Down
2 changes: 1 addition & 1 deletion doc/en/weechat_user.en.adoc
Expand Up @@ -222,7 +222,7 @@ List of commonly used options:
| ENABLE_IRC | `ON`, `OFF` | ON |
Compile <<irc_plugin,IRC plugin>>.

| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
Compile <<scripts_plugins,JavaScript plugin>>.

| ENABLE_LARGEFILE | `ON`, `OFF` | ON |
Expand Down
2 changes: 1 addition & 1 deletion doc/fr/weechat_user.fr.adoc
Expand Up @@ -228,7 +228,7 @@ Liste des options couramment utilisées :
| ENABLE_IRC | `ON`, `OFF` | ON |
Compiler <<irc_plugin,l'extension IRC>>.

| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
Compiler <<scripts_plugins,l'extension JavaScript>>.

| ENABLE_LARGEFILE | `ON`, `OFF` | ON |
Expand Down
2 changes: 1 addition & 1 deletion doc/it/weechat_user.it.adoc
Expand Up @@ -258,7 +258,7 @@ List of commonly used options:
| ENABLE_IRC | `ON`, `OFF` | ON |
Compile <<irc_plugin,IRC plugin>>.

| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
Compile <<scripts_plugins,JavaScript plugin>>.

| ENABLE_LARGEFILE | `ON`, `OFF` | ON |
Expand Down
2 changes: 1 addition & 1 deletion doc/ja/weechat_user.ja.adoc
Expand Up @@ -229,7 +229,7 @@ CMake に対するオプションを指定するには、以下の書式を使
| ENABLE_IRC | `ON`, `OFF` | ON |
<<irc_plugin,IRC プラグイン>>のコンパイル

| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
<<scripts_plugins,JavaScript プラグイン>>のコンパイル。

| ENABLE_LARGEFILE | `ON`, `OFF` | ON |
Expand Down
2 changes: 1 addition & 1 deletion doc/pl/weechat_user.pl.adoc
Expand Up @@ -229,7 +229,7 @@ Lista popularnych opcji:
| ENABLE_IRC | `ON`, `OFF` | ON |
Kompilacja <<irc_plugin,wtyczki IRC>>.

| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
Kompilacja <<scripts_plugins,wtyczki javascript>>.

| ENABLE_LARGEFILE | `ON`, `OFF` | ON |
Expand Down
4 changes: 2 additions & 2 deletions tools/build-test.sh
Expand Up @@ -67,7 +67,7 @@ run "cd $BUILDDIR"

if [ "$BUILDTOOL" = "cmake" ]; then
# build with CMake
run "cmake .. -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON ${BUILDARGS}"
run "cmake .. -DENABLE_JAVASCRIPT=ON -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON ${BUILDARGS}"
run "make VERBOSE=1 -j$(nproc)"
run "sudo make install"
run "ctest -V"
Expand All @@ -76,7 +76,7 @@ fi
if [ "$BUILDTOOL" = "autotools" ]; then
# build with autotools
run "../autogen.sh"
run "../configure --enable-man --enable-doc --enable-tests ${BUILDARGS}"
run "../configure --enable-javascript --enable-man --enable-doc --enable-tests ${BUILDARGS}"
run "make -j$(nproc)"
run "sudo make install"
run "./tests/tests -v"
Expand Down
1 change: 0 additions & 1 deletion tools/debian/patches/weechat_debian_bullseye.patch

This file was deleted.

1 change: 0 additions & 1 deletion tools/debian/patches/weechat_debian_buster.patch

This file was deleted.

58 changes: 28 additions & 30 deletions tools/debian/patches/weechat_debian_jessie.patch
Expand Up @@ -6,10 +6,10 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
index a862fdd6c..574235330 100644
index bf94a36f1..7e7c82a21 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -3,20 +3,17 @@ Section: net
@@ -3,19 +3,16 @@ Section: net
Priority: optional
Maintainer: Sébastien Helleu <flashcode@flashtux.org>
Build-Depends:
Expand All @@ -26,43 +26,42 @@ index a862fdd6c..574235330 100644
+ liblua5.1-0-dev,
tcl8.6-dev,
- guile-2.2-dev,
+ guile-2.0-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
- libxml2-dev,
+ guile-2.0-dev,
libcurl4-gnutls-dev,
libgcrypt20-dev,
libgnutls28-dev,
@@ -47,7 +44,7 @@ Description: Fast, light and extensible chat client (metapackage)
@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
@@ -76,7 +73,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
@@ -107,7 +104,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
@@ -232,20 +229,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the JavaScript scripting API plugin.
This package provides the Guile scripting API plugin.

-Package: weechat-devel-php
-Architecture: any
Expand Down Expand Up @@ -117,10 +116,10 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
index c0326b3f5..c3e7ed681 100644
index ccf81cac8..d753f6856 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -3,20 +3,17 @@ Section: net
@@ -3,19 +3,16 @@ Section: net
Priority: optional
Maintainer: Emmanuel Bouthenot <kolter@debian.org>
Build-Depends:
Expand All @@ -137,43 +136,42 @@ index c0326b3f5..c3e7ed681 100644
+ liblua5.1-0-dev,
tcl8.6-dev,
- guile-2.2-dev,
+ guile-2.0-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
- libxml2-dev,
+ guile-2.0-dev,
libcurl4-gnutls-dev,
libgcrypt20-dev,
libgnutls28-dev,
@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
@@ -45,7 +42,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
@@ -74,7 +71,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
@@ -104,7 +101,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
@@ -221,19 +218,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the JavaScript scripting API plugin.
This package provides the Guile scripting API plugin.

-Package: weechat-php
-Architecture: any
Expand Down

0 comments on commit 340d664

Please sign in to comment.