mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-10 20:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed name of binary (vim -> nvim).

Browse Source 
Also updated affected config files and test49.vim
This commit is contained in:
scott-linder
2014-02-24 14:57:47 -05:00
committed by Thiago de Arruda
parent d29ab233a6
commit 9db0fc3582
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -1,9 +1,9 @@
CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug
build/bin/vim: deps build/bin/nvim: deps
cd build && make cd build && make
test: build/bin/vim test: build/bin/nvim
cd src/testdir && make cd src/testdir && make
deps: .deps/usr/lib/libuv.a deps: .deps/usr/lib/libuv.a
@@ -23,4 +23,4 @@ clean:
.PHONY: test deps cmake .PHONY: test deps cmake
.DEFAULT: build/bin/vim .DEFAULT: build/bin/nvim

8
src/CMakeLists.txt
View File

@@ -12,19 +12,19 @@ list(APPEND NEOVIM_SOURCES "${PROJECT_BINARY_DIR}/config/auto/pathdef.c")
file( GLOB IO_SOURCES io/*.c ) file( GLOB IO_SOURCES io/*.c )
add_executable (vim ${NEOVIM_SOURCES} ${IO_SOURCES}) add_executable (nvim ${NEOVIM_SOURCES} ${IO_SOURCES})
target_link_libraries (vim m uv ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (nvim m uv ${CMAKE_THREAD_LIBS_INIT})
include(CheckLibraryExists) include(CheckLibraryExists)
check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP) check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP)
if (HAVE_LIBTERMCAP) if (HAVE_LIBTERMCAP)
target_link_libraries(vim termcap) target_link_libraries(nvim termcap)
else() else()
check_library_exists(curses tgetent "" HAVE_LIBCURSES) check_library_exists(curses tgetent "" HAVE_LIBCURSES)
if (HAVE_LIBCURSES) if (HAVE_LIBCURSES)
target_link_libraries(vim curses) target_link_libraries(nvim curses)
else() else()
message(FATAL_ERROR "can't find something resembling -ltermcap") message(FATAL_ERROR "can't find something resembling -ltermcap")
endif() endif()

4
src/po/Makefile
View File

@@ -125,9 +125,9 @@ CHECKFILES = \
uk.cp1251.ck \ uk.cp1251.ck \
zh_CN.cp936.ck zh_CN.cp936.ck
PACKAGE = vim PACKAGE = nvim
SHELL = /bin/sh SHELL = /bin/sh
VIM = ../../build/bin/vim VIM = ../../build/bin/nvim
# The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext
# tools 0.10.37, which use a slightly different .po file format that is not # tools 0.10.37, which use a slightly different .po file format that is not

2
src/testdir/Makefile
View File

@@ -2,7 +2,7 @@
# Makefile to run all tests for Vim # Makefile to run all tests for Vim
# #
VIMPROG = ../../build/bin/vim VIMPROG = ../../build/bin/nvim
# Uncomment this line to use valgrind for memory leaks and extra warnings. # Uncomment this line to use valgrind for memory leaks and extra warnings.
# The output goes into a file "valgrind.testN" # The output goes into a file "valgrind.testN"

2
src/testdir/test49.vim
View File

@@ -456,7 +456,7 @@ function! ExtraVim(...)
" messing up the user's viminfo file. " messing up the user's viminfo file.
let redirect = a:0 ? let redirect = a:0 ?
\ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : "" \ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
exec "!echo '" . debug_quits . "q' | ../../build/bin/vim -u NONE -N -Xes" . redirect . exec "!echo '" . debug_quits . "q' | ../../build/bin/nvim -u NONE -N -Xes" . redirect .
\ " -c 'debuggreedy|set viminfo+=nviminfo'" . \ " -c 'debuggreedy|set viminfo+=nviminfo'" .
\ " -c 'let ExtraVimBegin = " . extra_begin . "'" . \ " -c 'let ExtraVimBegin = " . extra_begin . "'" .
\ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints . \ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .