diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | contrib/local.mk.example | 15 | ||||
| -rw-r--r-- | runtime/doc/Makefile | 238 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 5 |
4 files changed, 16 insertions, 246 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ab7062019..2879b57061 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -290,9 +290,7 @@ install_helper( file(GLOB_RECURSE RUNTIME_PROGRAMS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - runtime/*.pl runtime/*.awk runtime/*.sh - runtime/tools/ref - runtime/tools/vimm) + runtime/*.awk runtime/*.sh) foreach(PROG ${RUNTIME_PROGRAMS}) get_filename_component(BASEDIR ${PROG} PATH) diff --git a/contrib/local.mk.example b/contrib/local.mk.example index c8ccf8c03f..12297eceba 100644 --- a/contrib/local.mk.example +++ b/contrib/local.mk.example @@ -4,16 +4,25 @@ # By default, the installation prefix is '/usr/local'. # CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=/usr/local/neovim-latest +# These CFLAGS can be used in addition to those specified in CMakeLists.txt: +# CMAKE_EXTRA_FLAGS="-DCMAKE_C_FLAGS=-ftrapv -Wlogical-op" + +# By default, the jemalloc family of memory allocation functions are used. +# Uncomment the following to instead use libc memory allocation functions: +# CMAKE_EXTRA_FLAGS="-DUSE_JEMALLOC=OFF" + # Sets the build type; defaults to Debug. Valid values: # # - Debug: Disables optimizations (-O0), enables debug information. # -# - RelWithDebInfo: Enables optimizations that do not interfere with debugging -# (-O2) which do, enables debug information. +# - RelWithDebInfo: Enables all optimizations that do not interfere with +# debugging (-Og if available, -O2 and -g if not). +# Enables debug information. # # - MinSizeRel: Enables all -O2 optimization that do not typically # increase code size, and performs further optimizations -# designed to reduce code size. Disables debug information. +# designed to reduce code size (-Os). +# Disables debug information. # # - Release: Same as RelWithDebInfo, but disables debug information. # diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index e0d6e48cb9..36ea60860f 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -9,242 +9,8 @@ AWK = awk # Set to $(VIMTARGET) when executed from src/Makefile. VIMEXE = vim -DOCS = \ - arabic.txt \ - autocmd.txt \ - change.txt \ - cmdline.txt \ - debug.txt \ - debugger.txt \ - develop.txt \ - diff.txt \ - digraph.txt \ - editing.txt \ - eval.txt \ - farsi.txt \ - filetype.txt \ - fold.txt \ - ft_ada.txt \ - ft_sql.txt \ - gui.txt \ - gui_w32.txt \ - gui_x11.txt \ - hebrew.txt \ - help.txt \ - helphelp.txt \ - howto.txt \ - if_cscop.txt \ - if_pyth.txt \ - indent.txt \ - index.txt \ - insert.txt \ - intro.txt \ - job_control.txt \ - map.txt \ - mbyte.txt \ - message.txt \ - mlang.txt \ - motion.txt \ - msgpack_rpc.txt \ - nvim_clipboard.txt \ - nvim_intro.txt \ - nvim_provider.txt \ - nvim_python.txt \ - nvim_terminal_emulator.txt \ - options.txt \ - os_dos.txt \ - os_mac.txt \ - os_unix.txt \ - os_win32.txt \ - pattern.txt \ - pi_getscript.txt \ - pi_gzip.txt \ - pi_netrw.txt \ - pi_paren.txt \ - pi_spec.txt \ - pi_tar.txt \ - pi_vimball.txt \ - pi_zip.txt \ - print.txt \ - quickfix.txt \ - quickref.txt \ - quotes.txt \ - recover.txt \ - remote.txt \ - remote_plugin.txt \ - repeat.txt \ - rileft.txt \ - russian.txt \ - scroll.txt \ - sign.txt \ - spell.txt \ - sponsor.txt \ - starting.txt \ - syntax.txt \ - tabpage.txt \ - tagsrch.txt \ - term.txt \ - tips.txt \ - todo.txt \ - uganda.txt \ - undo.txt \ - usr_01.txt \ - usr_02.txt \ - usr_03.txt \ - usr_04.txt \ - usr_05.txt \ - usr_06.txt \ - usr_07.txt \ - usr_08.txt \ - usr_09.txt \ - usr_10.txt \ - usr_11.txt \ - usr_12.txt \ - usr_20.txt \ - usr_21.txt \ - usr_22.txt \ - usr_23.txt \ - usr_24.txt \ - usr_25.txt \ - usr_26.txt \ - usr_27.txt \ - usr_28.txt \ - usr_29.txt \ - usr_30.txt \ - usr_31.txt \ - usr_32.txt \ - usr_40.txt \ - usr_41.txt \ - usr_42.txt \ - usr_43.txt \ - usr_44.txt \ - usr_45.txt \ - usr_90.txt \ - usr_toc.txt \ - various.txt \ - vi_diff.txt \ - vim_diff.txt \ - visual.txt \ - windows.txt - -HTMLS = \ - arabic.html \ - autocmd.html \ - change.html \ - cmdline.html \ - debug.html \ - debugger.html \ - develop.html \ - diff.html \ - digraph.html \ - editing.html \ - eval.html \ - farsi.html \ - filetype.html \ - fold.html \ - ft_ada.html \ - ft_sql.html \ - gui.html \ - gui_w32.html \ - gui_x11.html \ - hebrew.html \ - helphelp.html \ - howto.html \ - if_cscop.html \ - if_pyth.html \ - indent.html \ - index.html \ - insert.html \ - intro.html \ - job_control.html \ - map.html \ - mbyte.html \ - message.html \ - mlang.html \ - motion.html \ - msgpack_rpc.html \ - nvim_clipboard.html \ - nvim_intro.html \ - nvim_provider.html \ - nvim_python.html \ - nvim_terminal_emulator.html \ - options.html \ - os_dos.html \ - os_mac.html \ - os_unix.html \ - os_win32.html \ - pattern.html \ - pi_getscript.html \ - pi_gzip.html \ - pi_netrw.html \ - pi_paren.html \ - pi_spec.html \ - pi_tar.html \ - pi_vimball.html \ - pi_zip.html \ - print.html \ - quickfix.html \ - quickref.html \ - quotes.html \ - recover.html \ - remote.html \ - remote_plugin.html \ - repeat.html \ - rileft.html \ - russian.html \ - scroll.html \ - sign.html \ - spell.html \ - sponsor.html \ - starting.html \ - syntax.html \ - tabpage.html \ - tags.html \ - tagsrch.html \ - term.html \ - tips.html \ - todo.html \ - uganda.html \ - undo.html \ - usr_01.html \ - usr_02.html \ - usr_03.html \ - usr_04.html \ - usr_05.html \ - usr_06.html \ - usr_07.html \ - usr_08.html \ - usr_09.html \ - usr_10.html \ - usr_11.html \ - usr_12.html \ - usr_20.html \ - usr_21.html \ - usr_22.html \ - usr_23.html \ - usr_24.html \ - usr_25.html \ - usr_26.html \ - usr_27.html \ - usr_28.html \ - usr_29.html \ - usr_30.html \ - usr_31.html \ - usr_32.html \ - usr_40.html \ - usr_41.html \ - usr_42.html \ - usr_43.html \ - usr_44.html \ - usr_45.html \ - usr_90.html \ - usr_toc.html \ - various.html \ - vi_diff.html \ - vim_diff.html \ - vimindex.html \ - visual.html \ - windows.html +DOCS = $(wildcard *.txt) +HTMLS = $(DOCS:.txt=.html) MANPAGES = \ manpages/vim.man \ diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index fabceac3d8..590c41c5d5 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -56,10 +56,7 @@ add_custom_target(stable-busted-deps add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted COMMAND ${DEPS_BIN_DIR}/luarocks - ## Drop back to: - ## https://raw.githubusercontent.com/Olivine-Labs/busted/master/busted-scm-0.rockspec - ## once the spec file is fixed in busted. - ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/f803173cc136f7370f7416254eaf3bada01b04a9/busted-scm-0.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} + ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/master/busted-scm-0.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} DEPENDS stable-busted-deps) add_custom_target(busted DEPENDS ${DEPS_BIN_DIR}/busted) |