From c33f0e60eab79e82c54778a32c23836c1a4a7fd9 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 9 Apr 2010 15:39:52 +0200 Subject: [PATCH] Define WeeChat license as macro for C compiler, used in plugins to set license --- CMakeLists.txt | 1 + configure.in | 3 ++- src/CMakeLists.txt | 4 ++-- src/core/weechat.c | 2 +- src/core/weechat.h | 2 +- src/plugins/alias/alias.c | 2 +- src/plugins/aspell/weechat-aspell.c | 2 +- src/plugins/charset/charset.c | 2 +- src/plugins/demo/demo.c | 2 +- src/plugins/fifo/fifo.c | 2 +- src/plugins/irc/irc.c | 2 +- src/plugins/logger/logger.c | 2 +- src/plugins/relay/relay.c | 2 +- src/plugins/scripts/lua/weechat-lua.c | 2 +- src/plugins/scripts/perl/weechat-perl.c | 2 +- src/plugins/scripts/python/weechat-python.c | 2 +- src/plugins/scripts/ruby/weechat-ruby.c | 2 +- src/plugins/scripts/tcl/weechat-tcl.c | 2 +- src/plugins/xfer/xfer.c | 2 +- 19 files changed, 21 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 900d5d912..a9935273b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,7 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "3") SET(VERSION_PATCH "2-dev") SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +SET(LICENSE "GPL3") SET(PKG_STRING "${PROJECT_NAME} ${VERSION}") STRING(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING}) diff --git a/configure.in b/configure.in index d78b0727b..d28ba84ce 100644 --- a/configure.in +++ b/configure.in @@ -22,6 +22,7 @@ AC_INIT(WeeChat, 0.3.2-dev, flashcode@flashtux.org) AC_CONFIG_SRCDIR([src/core/weechat.c]) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([weechat], [0.3.2-dev]) +LICENSE="GPL3" # Checks for programs AC_PROG_CC @@ -958,7 +959,7 @@ gnu*) ;; esac -CFLAGS="$CFLAGS -DWEECHAT_VERSION=\\\"$VERSION\\\"" +CFLAGS="$CFLAGS -DWEECHAT_VERSION=\\\"$VERSION\\\" -DWEECHAT_LICENSE=\\\"$LICENSE\\\"" # ------------------------------------------------------------------------------ # output Makefiles diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index da437f2fa..977f23b70 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -117,9 +117,9 @@ ENDIF(DL_LIBRARY) IF(COMMAND cmake_policy) cmake_policy(SET CMP0005 NEW) - ADD_DEFINITIONS(-DWEECHAT_VERSION="${VERSION}") + ADD_DEFINITIONS(-DWEECHAT_VERSION="${VERSION}" -DWEECHAT_LICENSE="${LICENSE}") ELSE(COMMAND cmake_policy) - ADD_DEFINITIONS(-DWEECHAT_VERSION='"${VERSION}"') + ADD_DEFINITIONS(-DWEECHAT_VERSION='"${VERSION}"' -DWEECHAT_LICENSE='"${LICENSE}"') ENDIF(COMMAND cmake_policy) ADD_SUBDIRECTORY( core ) diff --git a/src/core/weechat.c b/src/core/weechat.c index c3451e1b6..9d14f8f08 100644 --- a/src/core/weechat.c +++ b/src/core/weechat.c @@ -200,7 +200,7 @@ weechat_parse_args (int argc, char *argv[]) else if ((strcmp (argv[i], "-l") == 0) || (strcmp (argv[i], "--license") == 0)) { - string_iconv_fprintf (stdout, "\n%s%s", WEECHAT_LICENSE); + string_iconv_fprintf (stdout, "\n%s%s", WEECHAT_LICENSE_TEXT); weechat_shutdown (EXIT_SUCCESS, 0); } else if (strcmp (argv[i], "--no-dlclose") == 0) diff --git a/src/core/weechat.h b/src/core/weechat.h index 540b1d724..26ab9d851 100644 --- a/src/core/weechat.h +++ b/src/core/weechat.h @@ -60,7 +60,7 @@ /* license */ -#define WEECHAT_LICENSE \ +#define WEECHAT_LICENSE_TEXT \ PACKAGE_STRING " (c) Copyright 2003-2010, compiled on " __DATE__ " " __TIME__ \ "\nDeveloped by FlashCode - " WEECHAT_WEBSITE "\n\n" \ "This program is free software; you can redistribute it and/or modify\n" \ diff --git a/src/plugins/alias/alias.c b/src/plugins/alias/alias.c index aa7d52b4d..8aa846531 100644 --- a/src/plugins/alias/alias.c +++ b/src/plugins/alias/alias.c @@ -36,7 +36,7 @@ WEECHAT_PLUGIN_NAME(ALIAS_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Alias plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); #define ALIAS_IS_ARG_NUMBER(number) ((number >= '1') && (number <= '9')) diff --git a/src/plugins/aspell/weechat-aspell.c b/src/plugins/aspell/weechat-aspell.c index 317f9656e..e62c141ac 100644 --- a/src/plugins/aspell/weechat-aspell.c +++ b/src/plugins/aspell/weechat-aspell.c @@ -38,7 +38,7 @@ WEECHAT_PLUGIN_NAME(ASPELL_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Aspell plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_aspell_plugin = NULL; diff --git a/src/plugins/charset/charset.c b/src/plugins/charset/charset.c index 2eefd18d5..c4f0a38b0 100644 --- a/src/plugins/charset/charset.c +++ b/src/plugins/charset/charset.c @@ -39,7 +39,7 @@ WEECHAT_PLUGIN_NAME(CHARSET_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Charset plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); #define CHARSET_CONFIG_NAME "charset" diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c index 57e063f30..8c61905b6 100644 --- a/src/plugins/demo/demo.c +++ b/src/plugins/demo/demo.c @@ -39,7 +39,7 @@ WEECHAT_PLUGIN_NAME(DEMO_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Demo plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_demo_plugin = NULL; #define weechat_plugin weechat_demo_plugin diff --git a/src/plugins/fifo/fifo.c b/src/plugins/fifo/fifo.c index 0cb87e38a..6b3890305 100644 --- a/src/plugins/fifo/fifo.c +++ b/src/plugins/fifo/fifo.c @@ -40,7 +40,7 @@ WEECHAT_PLUGIN_NAME(FIFO_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Fifo plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); #ifndef PATH_MAX #define PATH_MAX 4096 diff --git a/src/plugins/irc/irc.c b/src/plugins/irc/irc.c index c8dabbfa9..f180f56ed 100644 --- a/src/plugins/irc/irc.c +++ b/src/plugins/irc/irc.c @@ -46,7 +46,7 @@ WEECHAT_PLUGIN_NAME(IRC_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("IRC (Internet Relay Chat) plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_irc_plugin = NULL; diff --git a/src/plugins/logger/logger.c b/src/plugins/logger/logger.c index b2595b963..29abe2f1a 100644 --- a/src/plugins/logger/logger.c +++ b/src/plugins/logger/logger.c @@ -49,7 +49,7 @@ WEECHAT_PLUGIN_NAME(LOGGER_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Logger plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_logger_plugin = NULL; diff --git a/src/plugins/relay/relay.c b/src/plugins/relay/relay.c index c4274c568..667404904 100644 --- a/src/plugins/relay/relay.c +++ b/src/plugins/relay/relay.c @@ -40,7 +40,7 @@ WEECHAT_PLUGIN_DESCRIPTION("Network communication between WeeChat and " "remote application"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_relay_plugin = NULL; diff --git a/src/plugins/scripts/lua/weechat-lua.c b/src/plugins/scripts/lua/weechat-lua.c index eec780442..06209cfcf 100644 --- a/src/plugins/scripts/lua/weechat-lua.c +++ b/src/plugins/scripts/lua/weechat-lua.c @@ -39,7 +39,7 @@ WEECHAT_PLUGIN_NAME(LUA_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Lua plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_lua_plugin; diff --git a/src/plugins/scripts/perl/weechat-perl.c b/src/plugins/scripts/perl/weechat-perl.c index b78af3308..01210bd26 100644 --- a/src/plugins/scripts/perl/weechat-perl.c +++ b/src/plugins/scripts/perl/weechat-perl.c @@ -37,7 +37,7 @@ WEECHAT_PLUGIN_NAME(PERL_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Perl plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_perl_plugin = NULL; diff --git a/src/plugins/scripts/python/weechat-python.c b/src/plugins/scripts/python/weechat-python.c index 9129abb14..d30096473 100644 --- a/src/plugins/scripts/python/weechat-python.c +++ b/src/plugins/scripts/python/weechat-python.c @@ -35,7 +35,7 @@ WEECHAT_PLUGIN_NAME(PYTHON_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Python plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_python_plugin = NULL; diff --git a/src/plugins/scripts/ruby/weechat-ruby.c b/src/plugins/scripts/ruby/weechat-ruby.c index 0319fd279..40f3a69ed 100644 --- a/src/plugins/scripts/ruby/weechat-ruby.c +++ b/src/plugins/scripts/ruby/weechat-ruby.c @@ -58,7 +58,7 @@ WEECHAT_PLUGIN_NAME(RUBY_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Ruby plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_ruby_plugin = NULL; diff --git a/src/plugins/scripts/tcl/weechat-tcl.c b/src/plugins/scripts/tcl/weechat-tcl.c index fed137248..b6aa6e5e6 100644 --- a/src/plugins/scripts/tcl/weechat-tcl.c +++ b/src/plugins/scripts/tcl/weechat-tcl.c @@ -40,7 +40,7 @@ WEECHAT_PLUGIN_NAME(TCL_PLUGIN_NAME); WEECHAT_PLUGIN_DESCRIPTION("Tcl plugin for WeeChat"); WEECHAT_PLUGIN_AUTHOR("Dmitry Kobylin "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_tcl_plugin = NULL; diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c index fbef2107a..87870ce37 100644 --- a/src/plugins/xfer/xfer.c +++ b/src/plugins/xfer/xfer.c @@ -49,7 +49,7 @@ WEECHAT_PLUGIN_DESCRIPTION("Xfer (file transfer and direct chat) plugin for " "WeeChat"); WEECHAT_PLUGIN_AUTHOR("FlashCode "); WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION); -WEECHAT_PLUGIN_LICENSE("GPL3"); +WEECHAT_PLUGIN_LICENSE(WEECHAT_LICENSE); struct t_weechat_plugin *weechat_xfer_plugin = NULL;