Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed name of binary (vim -> nvim). #113

Closed
wants to merge 1 commit into from
Closed

Changed name of binary (vim -> nvim). #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug

build/bin/vim: deps
build/bin/nvim: deps
cd build && make

test: build/bin/vim
test: build/bin/nvim
cd src/testdir && make

deps: .deps/usr/lib/libuv.a
Expand All @@ -23,4 +23,4 @@ clean:

.PHONY: test deps cmake

.DEFAULT: build/bin/vim
.DEFAULT: build/bin/nvim
8 changes: 4 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ list(APPEND NEOVIM_SOURCES "${PROJECT_BINARY_DIR}/config/auto/pathdef.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)
check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP)

if (HAVE_LIBTERMCAP)
target_link_libraries(vim termcap)
target_link_libraries(nvim termcap)
else()
check_library_exists(curses tgetent "" HAVE_LIBCURSES)
if (HAVE_LIBCURSES)
target_link_libraries(vim curses)
target_link_libraries(nvim curses)
else()
message(FATAL_ERROR "can't find something resembling -ltermcap")
endif()
Expand Down
4 changes: 2 additions & 2 deletions src/po/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ CHECKFILES = \
uk.cp1251.ck \
zh_CN.cp936.ck

PACKAGE = vim
PACKAGE = nvim
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
# tools 0.10.37, which use a slightly different .po file format that is not
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 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.
# The output goes into a file "valgrind.testN"
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/test49.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ function! ExtraVim(...)
" messing up the user's viminfo file.
let redirect = a:0 ?
\ " -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 'let ExtraVimBegin = " . extra_begin . "'" .
\ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .
Expand Down