1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 07:16:37 +02:00

core: rename binary and man page from "weechat-curses" to "weechat" (task #11027)

A symbolic link weechat-curses -> weechat is now created (by both cmake and
configure), so that the /upgrade will work from an old version.

However, if you upgrade from an old version, it is recommended to force the use
of the new binary name with the command: `/upgrade /path/to/weechat` (replace
the path accordingly).
This commit is contained in:
Sebastien Helleu
2013-08-02 08:54:16 +02:00
parent f9d57a3099
commit 996da2f662
76 changed files with 441 additions and 418 deletions
+1 -1
View File
@@ -6708,7 +6708,7 @@ command_init ()
" 4. save WeeChat configuration\n"
" 5. quit WeeChat\n"
"Then later you can restore session with command: "
"weechat-curses --upgrade\n"
"weechat --upgrade\n"
"IMPORTANT: you must restore the session with exactly "
"same configuration (files *.conf).\n"
"It is possible to restore WeeChat session on another "
+1 -1
View File
@@ -156,7 +156,7 @@ debug_sigsegv ()
weechat_home);
string_iconv_fprintf (stderr, "***\n");
string_iconv_fprintf (stderr, "*** Please help WeeChat developers to fix this bug:\n");
string_iconv_fprintf (stderr, "*** 1. If you have a core file, please run: gdb weechat-curses core\n");
string_iconv_fprintf (stderr, "*** 1. If you have a core file, please run: gdb /path/to/weechat core\n");
string_iconv_fprintf (stderr, "*** then issue \"bt\" command and send result to developers\n");
string_iconv_fprintf (stderr, "*** To enable core files with bash shell: ulimit -c 10000\n");
string_iconv_fprintf (stderr, "*** 2. Otherwise send backtrace (below) and weechat.log\n");
+1 -1
View File
@@ -143,7 +143,7 @@ weechat_display_usage (char *exec_name)
" -s, --no-script don't load any script at startup\n"
" --upgrade upgrade WeeChat using session files (see /help upgrade in WeeChat)\n"
" -v, --version display WeeChat version\n"
" plugin:option option for plugin (see man weechat-curses)\n"));
" plugin:option option for plugin (see man weechat)\n"));
string_iconv_fprintf(stdout, "\n");
}
+7 -1
View File
@@ -30,7 +30,7 @@ gui-curses-mouse.c
gui-curses-term.c
gui-curses-window.c)
SET(EXECUTABLE weechat-curses)
SET(EXECUTABLE weechat)
FIND_PACKAGE(Ncurses)
IF(NCURSES_FOUND)
@@ -77,3 +77,9 @@ INCLUDE_DIRECTORIES(.. ../../core ../../plugins)
TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS} ${STATIC_LIBS})
INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
# Create a symbolic link weechat -> weechat-curses
# This link is created for compatibility with old versions on /upgrade.
# It may be removed in future.
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove -f \"${CMAKE_INSTALL_PREFIX}/bin/weechat-curses\")")
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink weechat \"${CMAKE_INSTALL_PREFIX}/bin/weechat-curses\")")
+26 -20
View File
@@ -19,29 +19,35 @@
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" $(NCURSES_CFLAGS)
bin_PROGRAMS = weechat-curses
bin_PROGRAMS = weechat
# Because of a linker bug, we have to link 2 times with lib_weechat_core.a
# (and it must be 2 different path/names to be kept by linker)
weechat_curses_LDADD = ./../../core/lib_weechat_core.a \
../../plugins/lib_weechat_plugins.a \
../lib_weechat_gui_common.a \
../../core/lib_weechat_core.a \
$(PLUGINS_LFLAGS) \
$(NCURSES_LFLAGS) \
$(GCRYPT_LFLAGS) \
$(GNUTLS_LFLAGS) \
$(CURL_LFLAGS) \
-lm
weechat_LDADD = ./../../core/lib_weechat_core.a \
../../plugins/lib_weechat_plugins.a \
../lib_weechat_gui_common.a \
../../core/lib_weechat_core.a \
$(PLUGINS_LFLAGS) \
$(NCURSES_LFLAGS) \
$(GCRYPT_LFLAGS) \
$(GNUTLS_LFLAGS) \
$(CURL_LFLAGS) \
-lm
weechat_curses_SOURCES = gui-curses-bar-window.c \
gui-curses-chat.c \
gui-curses-color.c \
gui-curses-key.c \
gui-curses-main.c \
gui-curses-mouse.c \
gui-curses-term.c \
gui-curses-window.c \
gui-curses.h
weechat_SOURCES = gui-curses-bar-window.c \
gui-curses-chat.c \
gui-curses-color.c \
gui-curses-key.c \
gui-curses-main.c \
gui-curses-mouse.c \
gui-curses-term.c \
gui-curses-window.c \
gui-curses.h
EXTRA_DIST = CMakeLists.txt
# Create a symbolic link weechat -> weechat-curses
# This link is created for compatibility with old versions on /upgrade.
# It may be removed in future.
install-exec-hook:
(cd $(DESTDIR)$(bindir) && rm -f weechat-curses && $(LN_S) weechat weechat-curses)