Merge vim and vimrc Android.mk in a single filecm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56staging/cm-12.0-cafstable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0

Set a fallback for $VIMRUNTIME env var,
if not set, syntax.vim could be not loaded

Disable automatic backup of files (~ suffix) on save

Add also markdown and syntax.pod, to read manuals.

Use the default colored format in build process
for runtime files :
Install: /cm11/out/target/product/bacon/...

Change-Id: I45f8af834f2bee28962d120f94580fc47193adc4

5 files changed, 196 insertions, 238 deletions

diff --git a/Android.mk b/Android.mk
index 067fad9f3..f2aa4eff6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,11 @@
 
-#========================================================
+vim_src := $(call my-dir)
+
+# ========================================================
 # etc/vimrc
-#========================================================
-LOCAL_PATH := $(call my-dir)
+# ========================================================
 
+LOCAL_PATH := $(vim_src)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := vimrc
@@ -14,5 +16,188 @@ LOCAL_SRC_FILES := vimrc.android
 
 include $(BUILD_PREBUILT)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
+# ========================================================
+# vim
+# ========================================================
+
+LOCAL_PATH := $(vim_src)/src
+include $(CLEAR_VARS)
+
+# vim variants: TINY SMALL CM NORMAL BIG HUGE
+#
+# NORMAL, BIG and HUGE are almost the same (1.1M)
+# TINY and SMALL are similar to busybox vi (460K)
+#
+# CM profile is between SMALL and NORMAL (780K)
+# with syntax and utf8 (mbyte) support
+#
+vim_variant := CM
+
+LOCAL_SRC_FILES := \
+	auto/pathdef.c \
+	blowfish.c \
+	buffer.c \
+	charset.c \
+	diff.c \
+	digraph.c \
+	edit.c \
+	eval.c \
+	ex_cmds.c \
+	ex_cmds2.c \
+	ex_docmd.c \
+	ex_eval.c \
+	ex_getln.c \
+	fileio.c \
+	fold.c \
+	getchar.c \
+	hardcopy.c \
+	hashtab.c \
+	if_cscope.c \
+	if_xcmdsrv.c \
+	main.c \
+	mark.c \
+	mbyte.c \
+	memfile.c \
+	memline.c \
+	menu.c \
+	message.c \
+	misc1.c \
+	misc2.c \
+	move.c \
+	normal.c \
+	ops.c \
+	option.c \
+	os_unix.c \
+	popupmnu.c \
+	quickfix.c \
+	regexp.c \
+	screen.c \
+	search.c \
+	sha256.c \
+	spell.c \
+	syntax.c \
+	tag.c \
+	term.c \
+	ui.c \
+	undo.c \
+	version.c \
+	window.c
+
+# to reduce vim size, manually define wanted features
+ifeq ($(vim_variant),CM)
+    LOCAL_CFLAGS += -DFEAT_SMALL=1 -DFEAT_MBYTE=1 \
+	-DFEAT_SYN_HL=1 -DFEAT_CINDENT=1 -DFEAT_COMMENTS=1 -DFEAT_EVAL=1 -DFEAT_AUTOCMD=1 \
+	-DFEAT_USR_CMDS=1 -DFEAT_EX_EXTRA=1 -DFEAT_CMDL_COMPL=1 \
+	-DFEAT_LISTCMDS=1 -DFEAT_CMDL_INFO=1 -DFEAT_SEARCH_EXTRA=1
+endif
+
+LOCAL_C_INCLUDES += \
+	external/libselinux/include \
+	external/libncurses/include \
+	$(LOCAL_PATH)/proto \
+	$(LOCAL_PATH)/auto
+
+LOCAL_SHARED_LIBRARIES += \
+	libselinux \
+	libncurses \
+	libm \
+	libdl
+
+LOCAL_CFLAGS += \
+	-DFEAT_$(vim_variant)=1 \
+	-DHAVE_CONFIG_H \
+	-DSYS_VIMRC_FILE=\"/system/etc/vimrc\"
+
+LOCAL_MODULE := vim
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_REQUIRED_MODULES := vimrc
+include $(BUILD_EXECUTABLE)
+
+# ========================================================
+# vim runtime files
+# ========================================================
+ifeq (vim,$(filter vim, $(ALL_MODULES)))
+
+vim_runtime_path := $(vim_src)/runtime
+
+vim_runtime_files := \
+	scripts.vim \
+	indent.vim \
+	indoff.vim \
+	filetype.vim \
+	ftoff.vim
+
+vim_doc_files := \
+	help.txt intro.txt tags \
+	motion.txt editing.txt scroll.txt \
+	options.txt term.txt
+
+vim_colors_files := \
+	default.vim \
+	desert.vim
+
+vim_syntax_files := \
+	logcat.vim \
+	awk.vim \
+	config.vim \
+	conf.vim \
+	cpp.vim \
+	c.vim \
+	css.vim \
+	diff.vim \
+	doxygen.vim \
+	html.vim vb.vim \
+	xml.vim dtd.vim \
+	context.vim \
+	gitcommit.vim \
+	help.vim \
+	javascript.vim \
+	java.vim \
+	lua.vim \
+	manual.vim \
+	markdown.vim \
+	pod.vim \
+	sh.vim \
+	syncolor.vim \
+	synload.vim \
+	syntax.vim \
+	vim.vim
+
+vim_plugin_files := \
+	matchparen.vim \
+
+vim_autoload_files := \
+	spacehi.vim
+
+VIM_SHARED := $(TARGET_OUT)/usr/share/vim
+
+vim_runtime_files := \
+  $(vim_runtime_files) \
+  $(addprefix doc/, $(vim_doc_files)) \
+  $(addprefix colors/, $(vim_colors_files)) \
+  $(addprefix syntax/, $(vim_syntax_files)) \
+  $(addprefix plugin/, $(vim_plugin_files)) \
+  $(addprefix autoload/, $(vim_autoload_files)) \
+
+$(vim_runtime_files): $(LOCAL_BUILT_MODULE)
+	@echo -e ${CL_CYN}"Install: $(VIM_SHARED)/$@"${CL_RST}
+	@mkdir -p $(dir $(VIM_SHARED)/$@)
+	$(hide) cp $(vim_runtime_path)/$@ $(VIM_SHARED)/$@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(vim_runtime_files)
+
+ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
+  $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) \
+  $(addprefix $(VIM_SHARED)/, $(vim_runtime_files))
+
+ifneq ($(filter B wB,$(MAKEFLAGS)),)
+# Allow to push runtime files with 'mmp -B'
+vim: $(vim_runtime_files)
+	@echo -e ${CL_YLW}"Forced install of runtime files..."${CL_RST}
+endif
+
+endif
+
+include $(call all-makefiles-under,$(vim_src))
 
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 50a4876b6..e48c133c6 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -332,9 +332,13 @@ else
     set ft=git
 
   " Logcat
-  elseif s:line1 == '--------- beginning of /dev/log/system'
+  elseif s:line1 =~ '^--------- beginning of /dev/log/.*'
     set ft=logcat
 
+  " Markdown
+  elseif s:line2 =~ '^[\=-]\+$'
+    set ft=markdown
+
    " Gprof (gnu profiler)
    elseif s:line1 == 'Flat profile:'
      \ && s:line2 == ''
diff --git a/src/Android.mk b/src/Android.mk
deleted file mode 100644
index b582d33d8..000000000
--- a/src/Android.mk
+++ /dev/null
@@ -1,231 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# ========================================================
-# vim
-# ========================================================
-include $(CLEAR_VARS)
-
-# vim variants: TINY SMALL CM NORMAL BIG HUGE
-#
-# NORMAL, BIG and HUGE are almost the same (1.1M)
-# TINY and SMALL are similar to busybox vi (460K)
-#
-# CM profile is between SMALL and NORMAL (780K)
-# with syntax and utf8 (mbyte) support
-#
-vim_variant := CM
-
-LOCAL_SRC_FILES := \
-	blowfish.c \
-	buffer.c \
-	charset.c \
-	diff.c \
-	digraph.c \
-	edit.c \
-	eval.c \
-	ex_cmds.c \
-	ex_cmds2.c \
-	ex_docmd.c \
-	ex_eval.c \
-	ex_getln.c \
-	fileio.c \
-	fold.c \
-	getchar.c \
-	hardcopy.c \
-	hashtab.c \
-	if_cscope.c \
-	if_xcmdsrv.c \
-	main.c \
-	mark.c \
-	mbyte.c \
-	memfile.c \
-	memline.c \
-	menu.c \
-	message.c \
-	misc1.c \
-	misc2.c \
-	move.c \
-	normal.c \
-	ops.c \
-	option.c \
-	os_unix.c \
-	auto/pathdef.c \
-	popupmnu.c \
-	quickfix.c \
-	regexp.c \
-	screen.c \
-	search.c \
-	sha256.c \
-	spell.c \
-	syntax.c \
-	tag.c \
-	term.c \
-	ui.c \
-	undo.c \
-	version.c \
-	window.c
-
-# to reduce vim size, manually define wanted features
-ifeq ($(vim_variant),CM)
-    LOCAL_SRC_FILES := $(filter-out blowfish.c sha256.c, $(LOCAL_SRC_FILES))
-    LOCAL_CFLAGS += -DFEAT_SMALL=1 -DFEAT_MBYTE=1 \
-	-DFEAT_SYN_HL=1 -DFEAT_CINDENT=1 -DFEAT_COMMENTS=1 -DFEAT_EVAL=1 -DFEAT_AUTOCMD=1 \
-	-DFEAT_USR_CMDS=1 -DFEAT_EX_EXTRA=1 -DFEAT_CMDL_COMPL=1 \
-	-DFEAT_LISTCMDS=1 -DFEAT_CMDL_INFO=1 -DFEAT_SEARCH_EXTRA=1
-endif
-
-# Unused in our config
-#LOCAL_SRC_FILES += \
-#	netbeans.c pty.c
-
-LOCAL_C_INCLUDES += \
-	external/libselinux/include \
-	external/libncurses/include \
-	$(LOCAL_PATH) \
-	$(LOCAL_PATH)/proto \
-	$(LOCAL_PATH)/auto
-
-LOCAL_SHARED_LIBRARIES += \
-	libselinux \
-	libncurses \
-	libm \
-	libdl
-
-LOCAL_CFLAGS += \
-	-DFEAT_$(vim_variant)=1 \
-	-DHAVE_CONFIG_H \
-	-DSYS_VIMRC_FILE=\"/system/etc/vimrc\"
-
-LOCAL_MODULE := vim
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_REQUIRED_MODULES := vimrc
-include $(BUILD_EXECUTABLE)
-
-# ========================================================
-# vim runtime files
-# ========================================================
-vim_runtime_path := $(LOCAL_PATH)/../runtime
-
-vim_runtime_files := \
-	scripts.vim \
-	indent.vim \
-	indoff.vim \
-	filetype.vim \
-	ftoff.vim
-
-vim_colors_files := \
-	default.vim \
-	desert.vim
-
-vim_doc_files := \
-	help.txt intro.txt tags \
-	motion.txt editing.txt scroll.txt \
-	options.txt term.txt
-
-vim_syntax_files := \
-	logcat.vim \
-	awk.vim \
-	config.vim \
-	conf.vim \
-	cpp.vim \
-	c.vim \
-	css.vim \
-	diff.vim \
-	doxygen.vim \
-	html.vim vb.vim \
-	xml.vim dtd.vim \
-	context.vim \
-	gitcommit.vim \
-	help.vim \
-	javascript.vim \
-	java.vim \
-	manual.vim \
-	sh.vim \
-	syncolor.vim \
-	synload.vim \
-	syntax.vim \
-	vim.vim
-
-vim_plugin_files := \
-	matchparen.vim \
-
-vim_autoload_files :=
-ifneq ($(vim_variant),SMALL)
-  vim_autoload_files += spacehi.vim
-endif
-
-VIM_SHARED := $(TARGET_OUT)/usr/share/$(LOCAL_MODULE)
-
-VIM_RUNTIME_R := \
-	$(addprefix $(vim_runtime_path)/,$(vim_runtime_files))
-$(VIM_RUNTIME_R): VIM_BINARY := $(LOCAL_MODULE)
-$(VIM_RUNTIME_R): $(LOCAL_INSTALLED_MODULE)
-	@echo "Install: $@ -> $(VIM_SHARED)/"
-	@mkdir -p $(VIM_SHARED)
-	$(hide) cp $@ $(VIM_SHARED)/
-
-ALL_DEFAULT_INSTALLED_MODULES += $(VIM_RUNTIME_R)
-
-
-VIM_RUNTIME_C := \
-	$(addprefix $(vim_runtime_path)/colors/,$(vim_colors_files))
-$(VIM_RUNTIME_C): VIM_BINARY := $(LOCAL_MODULE)
-$(VIM_RUNTIME_C): $(LOCAL_INSTALLED_MODULE)
-	@echo "Install: $@ -> $(VIM_SHARED)/colors/"
-	@mkdir -p $(VIM_SHARED)/colors
-	$(hide) cp $@ $(VIM_SHARED)/colors/
-
-ALL_DEFAULT_INSTALLED_MODULES += $(VIM_RUNTIME_C)
-
-
-VIM_RUNTIME_D := \
-	$(addprefix $(vim_runtime_path)/doc/,$(vim_doc_files))
-$(VIM_RUNTIME_D): VIM_BINARY := $(LOCAL_MODULE)
-$(VIM_RUNTIME_D): $(LOCAL_INSTALLED_MODULE)
-	@echo "Install: $@ -> $(VIM_SHARED)/doc/"
-	@mkdir -p $(VIM_SHARED)/doc
-	$(hide) cp $@ $(VIM_SHARED)/doc/
-
-ALL_DEFAULT_INSTALLED_MODULES += $(VIM_RUNTIME_D)
-
-
-VIM_RUNTIME_S := \
-	$(addprefix $(vim_runtime_path)/syntax/,$(vim_syntax_files))
-$(VIM_RUNTIME_S): VIM_BINARY := $(LOCAL_MODULE)
-$(VIM_RUNTIME_S): $(LOCAL_INSTALLED_MODULE)
-	@echo "Install: $@ -> $(VIM_SHARED)/syntax/"
-	@mkdir -p $(VIM_SHARED)/syntax
-	$(hide) cp $@ $(VIM_SHARED)/syntax/
-
-ALL_DEFAULT_INSTALLED_MODULES += $(VIM_RUNTIME_S)
-
-
-VIM_RUNTIME_P := \
-	$(addprefix $(vim_runtime_path)/plugin/,$(vim_plugin_files))
-$(VIM_RUNTIME_P): VIM_BINARY := $(LOCAL_MODULE)
-$(VIM_RUNTIME_P): $(LOCAL_INSTALLED_MODULE)
-	@echo "Install: $@ -> $(VIM_SHARED)/plugin/"
-	@mkdir -p $(VIM_SHARED)/plugin
-	$(hide) cp $@ $(VIM_SHARED)/plugin/
-
-ALL_DEFAULT_INSTALLED_MODULES += $(VIM_RUNTIME_P)
-
-
-VIM_RUNTIME_A := \
-	$(addprefix $(vim_runtime_path)/autoload/,$(vim_autoload_files))
-$(VIM_RUNTIME_A): VIM_BINARY := $(LOCAL_MODULE)
-$(VIM_RUNTIME_A): $(LOCAL_INSTALLED_MODULE)
-	@echo "Install: $@ -> $(VIM_SHARED)/autoload/"
-	@mkdir -p $(VIM_SHARED)/autoload
-	$(hide) cp $@ $(VIM_SHARED)/autoload/
-
-ALL_DEFAULT_INSTALLED_MODULES += $(VIM_RUNTIME_A)
-
-
-ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
-	$(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) \
-	$(VIM_RUNTIME_R) $(VIM_RUNTIME_C) $(VIM_RUNTIME_D) \
-	$(VIM_RUNTIME_S) $(VIM_RUNTIME_P) $(VIM_RUNTIME_A)
-
-
diff --git a/src/auto/pathdef.c b/src/auto/pathdef.c
index 1e399caee..6503bc46f 100644
--- a/src/auto/pathdef.c
+++ b/src/auto/pathdef.c
@@ -3,7 +3,7 @@
  * DO NOT EDIT!  Change Makefile only. */
 #include "vim.h"
 char_u *default_vim_dir = (char_u *)"/system/usr/share/vim";
-char_u *default_vimruntime_dir = (char_u *)"";
+char_u *default_vimruntime_dir = (char_u *)"/system/usr/share/vim";
 char_u *all_cflags = (char_u *)"gcc -c -I. -Iproto -DHAVE_CONFIG_H -g -O2        ";
 char_u *all_lflags = (char_u *)"gcc -L/system/lib -o vim -lm -lselinux           ";
 char_u *compiled_user = (char_u *)"tpruvot";
diff --git a/vimrc.android b/vimrc.android
index 0e60ad3d2..3c95fdb4b 100644
--- a/vimrc.android
+++ b/vimrc.android
@@ -21,7 +21,7 @@ set directory=.,/data/local/tmp,/tmp
 if has("vms")
   set nobackup		" do not keep a backup file, use versions instead
 else
-  set backup		" keep a backup file (restore to previous version)
+" set backup		" keep a backup file (restore to previous version)
   set undofile		" keep an undo file (undo changes after closing)
 endif
 set history=50		" keep 50 lines of command line history