From 1f17f468eb022c407b2593e4559e6704e0d64f72 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sat, 1 Oct 2022 12:03:23 +0900 Subject: [PATCH 01/40] update vim@v9.0.0631 --- VERSION | 4 ++-- vim | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 1a908bf..d7ba176 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VIM_VER = 8.2.1287 +VIM_VER = 9.0.0631 PATCHSET_VER = 20200724 -VIM_VER_SHORT = 82 +VIM_VER_SHORT = 90 # vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make: diff --git a/vim b/vim index 40f4f7a..145d1fd 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 40f4f7a48cae491f83bd3cdbf7e9b5a23ed870ef +Subproject commit 145d1fd91041bd2a22a11eef0357702e420796e2 From 30b141c1f915728083556e8d14c3bf79797815ff Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sat, 1 Oct 2022 17:11:17 +0900 Subject: [PATCH 02/40] update patches --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index bfdd5cb..bb60783 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit bfdd5cb01600bac9cd92b6f2d114993c71b1136e +Subproject commit bb6078344740d9d2407f7aa41d70a66e377f48d3 From b10ea35cb89fd95a3437a58efcb4e35f14e07cb4 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sat, 1 Oct 2022 17:15:37 +0900 Subject: [PATCH 03/40] update contrib --- contrib/autofmt | 2 +- contrib/lang-ja | 2 +- contrib/luajit-2.0 | 2 +- contrib/vimdoc-ja | 2 +- contrib/vimproc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/autofmt b/contrib/autofmt index 641529c..c559597 160000 --- a/contrib/autofmt +++ b/contrib/autofmt @@ -1 +1 @@ -Subproject commit 641529c17265bc5b17db595b17b42401b9daa742 +Subproject commit c5595976b8b6eedf8d260aa925b9ec9c5fc79971 diff --git a/contrib/lang-ja b/contrib/lang-ja index d262bed..347b092 160000 --- a/contrib/lang-ja +++ b/contrib/lang-ja @@ -1 +1 @@ -Subproject commit d262bedc7f4c022554ba3ceb325778de1496b54d +Subproject commit 347b092f88f0d03ece229fbffe326d2f877fb1d4 diff --git a/contrib/luajit-2.0 b/contrib/luajit-2.0 index 570e758..dad04f1 160000 --- a/contrib/luajit-2.0 +++ b/contrib/luajit-2.0 @@ -1 +1 @@ -Subproject commit 570e758ca7dd14f93efdd43d68cf8979c1d7f984 +Subproject commit dad04f1754723e76ba9dcf9f401f3134a0cd3972 diff --git a/contrib/vimdoc-ja b/contrib/vimdoc-ja index 4a765dc..511ad5e 160000 --- a/contrib/vimdoc-ja +++ b/contrib/vimdoc-ja @@ -1 +1 @@ -Subproject commit 4a765dca36738a609446425a86e6cdce20f9b8dd +Subproject commit 511ad5e4c049f3898d5236b694bfbe7242a690ca diff --git a/contrib/vimproc b/contrib/vimproc index 8f40d86..3ba46c0 160000 --- a/contrib/vimproc +++ b/contrib/vimproc @@ -1 +1 @@ -Subproject commit 8f40d86ab938d5df8c1c9824320621ae9f0d5609 +Subproject commit 3ba46c01109bc590c6740c1133f53584751924b2 From 4ba2a09f1821f7742a97dd9ef7cfc2eabd4fa1d1 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sat, 1 Oct 2022 23:03:14 +0900 Subject: [PATCH 04/40] support VS2022 --- contrib/gettext | 2 +- contrib/libXpm-win32 | 2 +- contrib/libiconv2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/gettext b/contrib/gettext index b7af860..6a9e146 160000 --- a/contrib/gettext +++ b/contrib/gettext @@ -1 +1 @@ -Subproject commit b7af8608008eb893d72eb703c42e7fd9bc52e331 +Subproject commit 6a9e14647f3109c461dbf88136b7f8238f7b60d7 diff --git a/contrib/libXpm-win32 b/contrib/libXpm-win32 index 0a88ac3..2fd6b2f 160000 --- a/contrib/libXpm-win32 +++ b/contrib/libXpm-win32 @@ -1 +1 @@ -Subproject commit 0a88ac3b522b8de477ae61583e3e4bd8603e0ffd +Subproject commit 2fd6b2f88c4ce49e6f264469e447dd2dc41c576a diff --git a/contrib/libiconv2 b/contrib/libiconv2 index 75b9036..6da8207 160000 --- a/contrib/libiconv2 +++ b/contrib/libiconv2 @@ -1 +1 @@ -Subproject commit 75b9036207274e0ece31b298503f63749a25debc +Subproject commit 6da820721ca62d671013df188b99f77e6bf839f9 From 10bfa34b5e9c53562ecc6fea950bc9df14956ebe Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 2 Oct 2022 03:07:52 +0900 Subject: [PATCH 05/40] update patches --- build/msvc/Makefile | 10 +++++----- build/msvc/vim.mak | 5 +++++ patches | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/build/msvc/Makefile b/build/msvc/Makefile index 43d79a5..cef6e91 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -308,23 +308,23 @@ vim-build: vim-test: vim-build cd "$(VIM_DIR)\src\testdir" - nmake /NOLOGO /F Make_dos.mak clean - -nmake /NOLOGO /F Make_dos.mak VIMPROG=..\vim + nmake /NOLOGO /F Make_mvc.mak clean + -nmake /NOLOGO /F Make_mvc.mak VIMPROG=..\vim cd "$(BUILD_DIR)" IF NOT EXIST "$(TESTRES_DIR)" MD "$(TESTRES_DIR)" -COPY "$(VIM_DIR)\src\testdir\test_result.log" "$(TESTRES_DIR)\$(DATE_VER)_$(TIME_VER)-cui.log" vim-test-gui: vim-build cd "$(VIM_DIR)\src\testdir" - nmake /NOLOGO /F Make_dos.mak clean - -nmake /NOLOGO /F Make_dos.mak VIMPROG=..\gvim + nmake /NOLOGO /F Make_mvc.mak clean + -nmake /NOLOGO /F Make_mvc.mak VIMPROG=..\gvim cd "$(BUILD_DIR)" IF NOT EXIST "$(TESTRES_DIR)" MD "$(TESTRES_DIR)" -COPY "$(VIM_DIR)\src\testdir\test_result.log" "$(TESTRES_DIR)\$(DATE_VER)_$(TIME_VER)-gui.log" vim-test-clean: cd "$(VIM_DIR)\src\testdir" - nmake /NOLOGO /F Make_dos.mak clean + nmake /NOLOGO /F Make_mvc.mak clean cd "$(BUILD_DIR)" vim-clean: diff --git a/build/msvc/vim.mak b/build/msvc/vim.mak index d7039a8..66ffa64 100644 --- a/build/msvc/vim.mak +++ b/build/msvc/vim.mak @@ -15,6 +15,11 @@ DIRECTX=yes # Terminal support. TERMINAL=yes +# Disable language interfaces +DISABLE_PERL=yes +DISABLE_PYTHON=yes +DISABLE_RUBY=yes + # Perl settings !if !defined(DISABLE_IF) && !defined(DISABLE_PERL) DYNAMIC_PERL=yes diff --git a/patches b/patches index bb60783..2e3aee1 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit bb6078344740d9d2407f7aa41d70a66e377f48d3 +Subproject commit 2e3aee1b26c4cbb8022239307e5e527d074650fd From 8f333153c716a6ddb7d374ea504ca2837a49899b Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 2 Oct 2022 11:14:12 +0900 Subject: [PATCH 06/40] suppress vcruntiime copy --- build/msvc/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build/msvc/Makefile b/build/msvc/Makefile index cef6e91..f27e23e 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -58,22 +58,27 @@ VIMDLL=$(VIMDLL_BASE).dll MSVC_VERSION=msvc9 MSVCRT_SUBDIR=Microsoft.VC90.CRT MSVCRT_FILES=msvcr90.dll +MSVCRT_COPY=1 !ELSEIF "$(_NMAKE_VER)" >= "10." && "$(_NMAKE_VER)" < "11." MSVC_VERSION=msvc10 MSVCRT_SUBDIR=Microsoft.VC100.CRT MSVCRT_FILES=msvcr100.dll +MSVCRT_COPY=1 !ELSEIF "$(_NMAKE_VER)" >= "11." && "$(_NMAKE_VER)" < "12." MSVC_VERSION=msvc11 MSVCRT_SUBDIR=Microsoft.VC110.CRT MSVCRT_FILES=msvcr110.dll +MSVCRT_COPY=1 !ELSEIF "$(_NMAKE_VER)" >= "12." && "$(_NMAKE_VER)" < "13." MSVC_VERSION=msvc12 MSVCRT_SUBDIR=Microsoft.VC120.CRT MSVCRT_FILES=msvcr120.dll +MSVCRT_COPY=1 !ELSEIF "$(_NMAKE_VER)" >= "14." && "$(_NMAKE_VER)" < "15." MSVC_VERSION=msvc14 MSVCRT_SUBDIR=Microsoft.VC140.CRT MSVCRT_FILES=vcruntime140.dll +MSVCRT_COPY=0 !ELSE !ERROR Unknown MSVC version: $(_NMAKE_VER) !ENDIF @@ -465,12 +470,15 @@ build-dist: -"$(INSTALL_DIR)\bin\vim.exe" -nes -u NONE -U NONE --noplugin \ -c "helptags $(VIM_DIST_DIR)\$(RTDIR_NAME)\doc" -c quit # Copy MSVC runtime files. - -$(COPY) "$(MSVCRT_DIR)" "$(VIM_DIST_DIR)" $(MSVCRT_FILES) + -IF $(MSVCRT_COPY) NEQ 0 $(COPY) "$(MSVCRT_DIR)" "$(VIM_DIST_DIR)" $(MSVCRT_FILES) # Copy patch (diff) files. -$(COPY) /E "$(VIM_PATCH_DIR)" "$(VIM_DIST_DIR)\patch" # Copy lua related files -$(COPY) /E "$(INSTALL_DIR)\bin\lua" "$(VIM_DIST_DIR)\lua" +test1: + @IF $(MSVCRT_COPY) NEQ 0 ECHO should copy + archive-dist: build-dist $(MAKE) zip-dist From fae65e90530f66a6c0028f1f32c3a05c2ad0011d Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 3 Oct 2022 10:11:33 +0900 Subject: [PATCH 07/40] catch up Vim 9.0.0639 --- VERSION | 4 ++-- build/msvc/Makefile | 12 +++++++++--- contrib/gettext | 2 +- contrib/libiconv2 | 2 +- contrib/vimdoc-ja | 2 +- vim | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index d7ba176..5898f6f 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 9.0.0631 -PATCHSET_VER = 20200724 +VIM_VER = 9.0.0639 +PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/build/msvc/Makefile b/build/msvc/Makefile index f27e23e..c4e81a9 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -490,7 +490,13 @@ zip-dist: clean-dist: -RD /S /Q "$(VIM_DIST_DIR)" -build-release-pre: +build-release-pre: build-release + +build-release-core: build-release-archive + +build-release-post: build-release-clean + +build-release: $(MAKE) "$(INSTALL_DIR)\bin\iconv.dll" $(MAKE) "$(INSTALL_DIR)\bin\intl.dll" $(MAKE) "$(INSTALL_DIR)\lib\libXpm.lib" @@ -503,11 +509,11 @@ build-release-pre: $(MAKE) build-dist $(MAKE) pdb-distdir -build-release-core: +build-release-archive: $(MAKE) zip-dist $(MAKE) pdb-archive -build-release-post: +build-release-clean: $(MAKE) vim-clean snapshot: snapshot-build snapshot-install snapshot-archive diff --git a/contrib/gettext b/contrib/gettext index 6a9e146..0529ffa 160000 --- a/contrib/gettext +++ b/contrib/gettext @@ -1 +1 @@ -Subproject commit 6a9e14647f3109c461dbf88136b7f8238f7b60d7 +Subproject commit 0529ffaec7e0e123576ea04cc93ba0ab9e6d04b1 diff --git a/contrib/libiconv2 b/contrib/libiconv2 index 6da8207..39de215 160000 --- a/contrib/libiconv2 +++ b/contrib/libiconv2 @@ -1 +1 @@ -Subproject commit 6da820721ca62d671013df188b99f77e6bf839f9 +Subproject commit 39de215514be7c2ab3a7988d2a2052bcb0c04b25 diff --git a/contrib/vimdoc-ja b/contrib/vimdoc-ja index 511ad5e..2c503e5 160000 --- a/contrib/vimdoc-ja +++ b/contrib/vimdoc-ja @@ -1 +1 @@ -Subproject commit 511ad5e4c049f3898d5236b694bfbe7242a690ca +Subproject commit 2c503e554284fef5bdcd24a5e76acf4fc45717b7 diff --git a/vim b/vim index 145d1fd..ff85d4a 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 145d1fd91041bd2a22a11eef0357702e420796e2 +Subproject commit ff85d4a1076dc7d6fc3102f6560df3ad1af696ae From a1b78e26c053dcf3c0f89555190b5ef9e706974a Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 4 Oct 2022 02:42:10 +0900 Subject: [PATCH 08/40] fix saving Scrtach buffer with name fixed https://github.com/koron/vim-kaoriya/issues/30 --- kaoriya/vim/plugins/kaoriya/plugin/cmdex.vim | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kaoriya/vim/plugins/kaoriya/plugin/cmdex.vim b/kaoriya/vim/plugins/kaoriya/plugin/cmdex.vim index a4b64dc..766b216 100644 --- a/kaoriya/vim/plugins/kaoriya/plugin/cmdex.vim +++ b/kaoriya/vim/plugins/kaoriya/plugin/cmdex.vim @@ -3,7 +3,7 @@ " cmdex.vim - Extra commands " " Maintainer: Muraoka Taro -" Last Change: 19-Mar-2013. +" Last Change: 04-Oct-2022. " Commands: " :MenuLang {language} " (language: none/ja/zh...etc.) @@ -85,9 +85,10 @@ command! -nargs=0 IminsertOn iunmap " Open a scratch (no file) buffer. command! -nargs=0 Scratch new | setlocal bt=nofile noswf | let b:cmdex_scratch = 1 function! s:CheckScratchWritten() - if &buftype ==# 'nofile' && expand('%').'x' !=# 'x' && exists('b:cmdex_scratch') && b:cmdex_scratch == 1 - setlocal buftype= swapfile + if &buftype ==# 'nofile' && get(b:, 'cmdex_scratch', 0) == 1 && expand('') !=# '' unlet b:cmdex_scratch + setlocal buftype= swapfile + execute "edit!" expand('') endif endfunction augroup CmdexScratch From 3360be6e86b5a1cb37abff0f0154571373632d11 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 4 Oct 2022 11:26:52 +0900 Subject: [PATCH 09/40] catcn up Vim 9.0.654 --- VERSION | 2 +- build/msvc/Makefile | 76 +++++++++++++++++++++--------------------- kaoriya/doc/CHANGES.md | 15 +++++++++ vim | 2 +- 4 files changed, 55 insertions(+), 40 deletions(-) diff --git a/VERSION b/VERSION index 5898f6f..0a25017 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0639 +VIM_VER = 9.0.0654 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/build/msvc/Makefile b/build/msvc/Makefile index c4e81a9..9ff979c 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -84,18 +84,18 @@ MSVCRT_COPY=0 !ENDIF archive: - $(MAKE) archive-pre - $(MAKE) archive-dist + $(MAKE) /$(MAKEFLAGS) archive-pre + $(MAKE) /$(MAKEFLAGS) archive-dist archive-pre: - $(MAKE) "$(INSTALL_DIR)\bin\iconv.dll" - $(MAKE) "$(INSTALL_DIR)\bin\intl.dll" - $(MAKE) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)" - $(MAKE) "$(INSTALL_DIR)\bin\lua51.dll" - $(MAKE) "$(INSTALL_DIR)\bin\winpty-agent.exe" - $(MAKE) vim-clean vim-install - $(MAKE) vim-mo-install vim-patch-install - $(MAKE) langja-install + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\iconv.dll" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\intl.dll" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\lua51.dll" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\winpty-agent.exe" + $(MAKE) /$(MAKEFLAGS) vim-clean vim-install + $(MAKE) /$(MAKEFLAGS) vim-mo-install vim-patch-install + $(MAKE) /$(MAKEFLAGS) langja-install contrib: $(INSTALL_DIR)\bin\iconv.dll $(INSTALL_DIR)\bin\intl.dll \ $(INSTALL_DIR)\lib\libXpm.lib \ @@ -384,10 +384,10 @@ pdb-distdir: $(PDB_DIST_DIR)\$(VIMDLL_BASE).pdb pdb-archive: $(OUTPUT_DIR)\$(PDB_DIST_ZIP) $(VIM_DIR)\src\vim.pdb $(VIM_DIR)\src\gvim.pdb: - $(MAKE) vim-build + $(MAKE) /$(MAKEFLAGS) vim-build $(VIM_DIR)\src\$(VIMDLL_BASE).pdb: - $(MAKE) vim-build + $(MAKE) /$(MAKEFLAGS) vim-build $(PDB_DIST_DIR): IF NOT EXIST "$(PDB_DIST_DIR)" MKDIR "$(PDB_DIST_DIR)" @@ -399,18 +399,18 @@ $(INSTALL_DIR)\bin\gvim.pdb: $(VIM_DIR)\src\gvim.pdb -$(COPY) "$(VIM_DIR)\src" "$(INSTALL_DIR)\bin" gvim.pdb $(PDB_DIST_DIR)\vim.pdb: $(INSTALL_DIR)\bin\vim.pdb - $(MAKE) $(PDB_DIST_DIR) + $(MAKE) /$(MAKEFLAGS) $(PDB_DIST_DIR) -$(COPY) "$(INSTALL_DIR)\bin" "$(PDB_DIST_DIR)" vim.pdb $(PDB_DIST_DIR)\gvim.pdb: $(INSTALL_DIR)\bin\gvim.pdb - $(MAKE) $(PDB_DIST_DIR) + $(MAKE) /$(MAKEFLAGS) $(PDB_DIST_DIR) -$(COPY) "$(INSTALL_DIR)\bin" "$(PDB_DIST_DIR)" gvim.pdb $(INSTALL_DIR)\bin\$(VIMDLL_BASE).pdb: $(VIM_DIR)\src\$(VIMDLL_BASE).pdb -$(COPY) "$(VIM_DIR)\src" "$(INSTALL_DIR)\bin" $(VIMDLL_BASE).pdb $(PDB_DIST_DIR)\$(VIMDLL_BASE).pdb: $(INSTALL_DIR)\bin\$(VIMDLL_BASE).pdb - $(MAKE) $(PDB_DIST_DIR) + $(MAKE) /$(MAKEFLAGS) $(PDB_DIST_DIR) -$(COPY) "$(INSTALL_DIR)\bin" "$(PDB_DIST_DIR)" $(VIMDLL_BASE).pdb $(OUTPUT_DIR)\$(PDB_DIST_ZIP): $(PDB_DIST_DIR)\$(VIMDLL_BASE).pdb @@ -480,7 +480,7 @@ test1: @IF $(MSVCRT_COPY) NEQ 0 ECHO should copy archive-dist: build-dist - $(MAKE) zip-dist + $(MAKE) /$(MAKEFLAGS) zip-dist zip-dist: cd "$(OUTPUT_DIR)" @@ -497,31 +497,31 @@ build-release-core: build-release-archive build-release-post: build-release-clean build-release: - $(MAKE) "$(INSTALL_DIR)\bin\iconv.dll" - $(MAKE) "$(INSTALL_DIR)\bin\intl.dll" - $(MAKE) "$(INSTALL_DIR)\lib\libXpm.lib" - $(MAKE) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)" - $(MAKE) "$(INSTALL_DIR)\bin\lua51.dll" - $(MAKE) "$(INSTALL_DIR)\bin\winpty-agent.exe" - $(MAKE) vim-clean - $(MAKE) vim-install vim-mo-install vim-patch-install - $(MAKE) langja-install - $(MAKE) build-dist - $(MAKE) pdb-distdir + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\iconv.dll" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\intl.dll" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\lib\libXpm.lib" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\lua51.dll" + $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\winpty-agent.exe" + $(MAKE) /$(MAKEFLAGS) vim-clean + $(MAKE) /$(MAKEFLAGS) vim-install vim-mo-install vim-patch-install + $(MAKE) /$(MAKEFLAGS) langja-install + $(MAKE) /$(MAKEFLAGS) build-dist + $(MAKE) /$(MAKEFLAGS) pdb-distdir build-release-archive: - $(MAKE) zip-dist - $(MAKE) pdb-archive + $(MAKE) /$(MAKEFLAGS) zip-dist + $(MAKE) /$(MAKEFLAGS) pdb-archive build-release-clean: - $(MAKE) vim-clean + $(MAKE) /$(MAKEFLAGS) vim-clean snapshot: snapshot-build snapshot-install snapshot-archive snapshot-pre: snapshot-install snapshot-archive snapshot-build: - $(MAKE) vim-clean vim-build + $(MAKE) /$(MAKEFLAGS) vim-clean vim-build snapshot-install: IF NOT EXIST "$(SNAPSHOT_DIR)" MD "$(SNAPSHOT_DIR)" @@ -549,22 +549,22 @@ snapshot-archive: snapshot "$(INSTALL_DIR)\bin\iconv.dll": - $(MAKE) iconv-clean iconv-install iconv-distclean + $(MAKE) /$(MAKEFLAGS) iconv-clean iconv-install iconv-distclean "$(INSTALL_DIR)\bin\intl.dll": - $(MAKE) gettext-clean gettext-install gettext-distclean + $(MAKE) /$(MAKEFLAGS) gettext-clean gettext-install gettext-distclean "$(INSTALL_DIR)\lib\libXpm.lib": - $(MAKE) xpm-clean xpm-install xpm-distclean + $(MAKE) /$(MAKEFLAGS) xpm-clean xpm-install xpm-distclean "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)": - $(MAKE) vimproc-clean vimproc-install vimproc-distclean + $(MAKE) /$(MAKEFLAGS) vimproc-clean vimproc-install vimproc-distclean "$(INSTALL_DIR)\bin\lua51.dll": - $(MAKE) luajit-install + $(MAKE) /$(MAKEFLAGS) luajit-install "$(INSTALL_DIR)\bin\winpty-agent.exe": - $(MAKE) winpty-install + $(MAKE) /$(MAKEFLAGS) winpty-install "$(INSTALL_DIR)\bin\vim.exe": - $(MAKE) vim-clean vim-install vim-mo-install vim-clean + $(MAKE) /$(MAKEFLAGS) vim-clean vim-install vim-mo-install vim-clean diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 13b1d37..ec5ca1f 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,3 +1,18 @@ +## 2022/10/XX の変更点 + +* ベースコードを9.0.XXXXに更新しました +* コンパイラを Visual Studio 2022 (Visual C 17.X) に変更しました +* 外部言語インターフェースの変更 + + LuaJITを除く外部言語インターフェース(Perl, Python, Ruby)を廃止しました + それらが必要な型は vim-win32-installer をご利用ください + + + +* `:Scratch` バッファを `:w foo.txt` で保存した際の挙動を修正しました + + + ## 2020/07/24 の変更点 * ベースコードを8.2.1287に更新しました diff --git a/vim b/vim index ff85d4a..ec32c78 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit ff85d4a1076dc7d6fc3102f6560df3ad1af696ae +Subproject commit ec32c781a282398e3da27f4aec4b03fcd20f8b0d From 6d44f7bd342fed9e9e7e700452164f09d87ad0b0 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 4 Oct 2022 11:30:42 +0900 Subject: [PATCH 10/40] remove an unused debug target --- build/msvc/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/msvc/Makefile b/build/msvc/Makefile index 9ff979c..77f1abf 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -476,9 +476,6 @@ build-dist: # Copy lua related files -$(COPY) /E "$(INSTALL_DIR)\bin\lua" "$(VIM_DIST_DIR)\lua" -test1: - @IF $(MSVCRT_COPY) NEQ 0 ECHO should copy - archive-dist: build-dist $(MAKE) /$(MAKEFLAGS) zip-dist From e8e17818659c6c388e79cd07d1ac3fcd2be52c1c Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 5 Oct 2022 10:35:01 +0900 Subject: [PATCH 11/40] Update kaoriya/doc/CHANGES.md Co-authored-by: K.Takata --- kaoriya/doc/CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index ec5ca1f..6bfeedb 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -5,7 +5,7 @@ * 外部言語インターフェースの変更 LuaJITを除く外部言語インターフェース(Perl, Python, Ruby)を廃止しました - それらが必要な型は vim-win32-installer をご利用ください + それらが必要な方は vim-win32-installer をご利用ください From e9b6f03cdbe5530c1d3684e2965612d76beb2d9a Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 5 Oct 2022 10:36:48 +0900 Subject: [PATCH 12/40] catch up Vim 9.0.0662 --- VERSION | 2 +- build/msvc/9A-daily-build.bat | 40 +++++++++++++++++++++++++++++++++++ vim | 2 +- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 build/msvc/9A-daily-build.bat diff --git a/VERSION b/VERSION index 0a25017..2a3a33e 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0654 +VIM_VER = 9.0.0662 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/build/msvc/9A-daily-build.bat b/build/msvc/9A-daily-build.bat new file mode 100644 index 0000000..e70a2a6 --- /dev/null +++ b/build/msvc/9A-daily-build.bat @@ -0,0 +1,40 @@ +@ECHO OFF + +SET INSTALL_DIR=D:\Vim\daily + +CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 +CALL tools\command-common.bat + +CD "%VIMDIR%" + +REM Catcn up Vim's update +%GUILTCMD% pop -a +git fetch -p +git merge --ff-only @{u} + +REM Apply patches with guilt +%GUILTCMD% push -a + +CD "%CURDIR%" + +REM Build Vim +nmake /NOLOGO build-release + +REM Test +nmake /NOLOGO vim-test + +REM Create archives +nmake /NOLOGO build-release-archive +nmake /NOLOGO build-release-clean + +REM Install x64 binary to local +7za x -o"%INSTALL_DIR%" -y "target\%RELZIP_W64%" + +REM Clean patches with guilt +CD "%VIMDIR%" +%GUILTCMD% pop -a +CD "%CURDIR%" + +REM END +PAUSE +EXIT /B 0 diff --git a/vim b/vim index ec32c78..7500866 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit ec32c781a282398e3da27f4aec4b03fcd20f8b0d +Subproject commit 75008661821eee6989476908feaf64a9dea03e05 From a4fffba535d4b82c05fc4ff012929b4c996ea97e Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 5 Oct 2022 22:17:58 +0900 Subject: [PATCH 13/40] WIP: update build batch --- build/msvc/9A-daily-build.bat | 2 ++ build/msvc/9B-daily-install.bat | 10 ++++++++++ build/msvc/tools/msvc-nmake.bat | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 build/msvc/9B-daily-install.bat diff --git a/build/msvc/9A-daily-build.bat b/build/msvc/9A-daily-build.bat index e70a2a6..a8f49a7 100644 --- a/build/msvc/9A-daily-build.bat +++ b/build/msvc/9A-daily-build.bat @@ -12,6 +12,8 @@ REM Catcn up Vim's update git fetch -p git merge --ff-only @{u} +REM TODO: update VIM_VER in ..\..\VERSION + REM Apply patches with guilt %GUILTCMD% push -a diff --git a/build/msvc/9B-daily-install.bat b/build/msvc/9B-daily-install.bat new file mode 100644 index 0000000..e11f6b2 --- /dev/null +++ b/build/msvc/9B-daily-install.bat @@ -0,0 +1,10 @@ +@ECHO OFF + +CD +SET INSTALL_DIR=D:\Vim + +CALL tools\command-common.bat +7za x -o"%INSTALL_DIR%" -y "target\%RELZIP_W64%" + +PAUSE +EXIT /B 0 diff --git a/build/msvc/tools/msvc-nmake.bat b/build/msvc/tools/msvc-nmake.bat index ff7d037..ee927be 100644 --- a/build/msvc/tools/msvc-nmake.bat +++ b/build/msvc/tools/msvc-nmake.bat @@ -1,7 +1,8 @@ @ECHO OFF REM Use SDK 8.1 for missing headers. -SET "INCLUDE=C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt" +REM SET "INCLUDE=C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;C:\Program Files (x86)\Windows Kits\8.1\include\winrt" -CALL "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %1 +REM CALL "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %1 +CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %1 nmake %2 %3 %4 %5 %6 %7 %8 %9 From 5ad6957de2161a89b03506db2d5367eaabee7fd9 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 6 Oct 2022 12:26:58 +0900 Subject: [PATCH 14/40] catch up Vim 9.9.669 --- VERSION | 2 +- build/msvc/9A-daily-build.bat | 10 +++++++++- vim | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 2a3a33e..c33f9bb 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0662 +VIM_VER = 9.0.669 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/build/msvc/9A-daily-build.bat b/build/msvc/9A-daily-build.bat index a8f49a7..affdffd 100644 --- a/build/msvc/9A-daily-build.bat +++ b/build/msvc/9A-daily-build.bat @@ -12,12 +12,20 @@ REM Catcn up Vim's update git fetch -p git merge --ff-only @{u} -REM TODO: update VIM_VER in ..\..\VERSION +REM Update VIM_VER in ..\..\VERSION + +SET TEMP_PATCH_NUM=%TEMP%\%RANDOM%_vim_patch_num.txt +sed -ne '/^static int included_patches/,/^\s*[0-9]\+,$/p' src/version.c | tail -1 | tr -cd 0123456789 > %TEMP_PATCH_NUM% +SET /P PATCH_NUM=<%TEMP_PATCH_NUM% +DEL /F %TEMP_PATCH_NUM% +sed -i -e 's/^\(VIM_VER\s*=\s*[0-9]\+\.[0-9]\+\.\)[0-9]\+/\1%PATCH_NUM%/' ..\VERSION REM Apply patches with guilt %GUILTCMD% push -a CD "%CURDIR%" +REM update VIM_VER +CALL tools\command-common.bat REM Build Vim nmake /NOLOGO build-release diff --git a/vim b/vim index 7500866..db77cb3 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 75008661821eee6989476908feaf64a9dea03e05 +Subproject commit db77cb3c08784e6038dd029271b2080c1b2d9acb From 1fe72f2da9bd152a0604194e5b434d11e60fb265 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 7 Oct 2022 11:43:17 +0900 Subject: [PATCH 15/40] catch up Vim 9.0.0681 --- VERSION | 2 +- build/msvc/9A-daily-build.bat | 2 +- vim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index c33f9bb..66c385c 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.669 +VIM_VER = 9.0.0681 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/build/msvc/9A-daily-build.bat b/build/msvc/9A-daily-build.bat index affdffd..1e8ff62 100644 --- a/build/msvc/9A-daily-build.bat +++ b/build/msvc/9A-daily-build.bat @@ -15,7 +15,7 @@ git merge --ff-only @{u} REM Update VIM_VER in ..\..\VERSION SET TEMP_PATCH_NUM=%TEMP%\%RANDOM%_vim_patch_num.txt -sed -ne '/^static int included_patches/,/^\s*[0-9]\+,$/p' src/version.c | tail -1 | tr -cd 0123456789 > %TEMP_PATCH_NUM% +sed -ne '/^static int included_patches/,/^\s*[0-9]\+,$/p' src/version.c | tail -1 | tr -cd 0123456789 | xargs printf '%%04d' > %TEMP_PATCH_NUM% SET /P PATCH_NUM=<%TEMP_PATCH_NUM% DEL /F %TEMP_PATCH_NUM% sed -i -e 's/^\(VIM_VER\s*=\s*[0-9]\+\.[0-9]\+\.\)[0-9]\+/\1%PATCH_NUM%/' ..\VERSION diff --git a/vim b/vim index db77cb3..0937b9f 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit db77cb3c08784e6038dd029271b2080c1b2d9acb +Subproject commit 0937b9fb244949b7ce9bfcf8398d7495b9b6aa85 From 52ec3901365060606b11ddbfbf2dcc9862626df3 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sat, 8 Oct 2022 10:46:34 +0900 Subject: [PATCH 16/40] catch up Vim 9.0.0689 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 66c385c..e50272e 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0681 +VIM_VER = 9.0.0689 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index 0937b9f..fcb86b0 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 0937b9fb244949b7ce9bfcf8398d7495b9b6aa85 +Subproject commit fcb86b0a99a9abedc408c99dae7591b6da832be8 From 48034ed31d739ac48f46e5cb586f2e0841b75ebd Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 9 Oct 2022 11:57:25 +0900 Subject: [PATCH 17/40] catch up Vim 9.0.0701 fix to load iconv.dll and vcruntime140.dll --- VERSION | 2 +- build/msvc/.gitignore | 1 + build/msvc/vim.mak | 5 ++--- vim | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index e50272e..571c7fc 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0689 +VIM_VER = 9.0.0701 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/build/msvc/.gitignore b/build/msvc/.gitignore index a143ac6..a7a91c9 100644 --- a/build/msvc/.gitignore +++ b/build/msvc/.gitignore @@ -1,4 +1,5 @@ /*.out /*.sln /*.suo +/.vs/ /target/ diff --git a/build/msvc/vim.mak b/build/msvc/vim.mak index 66ffa64..b693833 100644 --- a/build/msvc/vim.mak +++ b/build/msvc/vim.mak @@ -103,12 +103,11 @@ MSCVER=12.0 MSVCRT_DLL=msvcr120.dll !ELSEIF "$(_NMAKE_VER)" >= "14." && "$(_NMAKE_VER)" < "15." MSCVER=14.0 -MSVCRT_FILES=vcruntime140.dll +MSVCRT_DLL=vcruntime140.dll !ELSE !ERROR Unknown MSVC version: $(_NMAKE_VER) !ENDIF - !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" DEFINES_ARCH = !ELSE @@ -118,7 +117,7 @@ DEFINES_ARCH = /D_USE_32BIT_TIME_T=1 DEFINES= /DMODIFIED_BY=\"$(USERNAME)@$(USERDOMAIN)\" \ /DDYNAMIC_MSVCRT_DLL=\"$(MSVCRT_DLL)\" \ /DGETTEXT_DLL=\"intl.dll\" \ - /DGETTEXT_DLL_ALT=\"intl.dll\" \ + /DDYNAMIC_ICONV_DLL=\"iconv.dll\" \ /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 \ $(DEFINES_ARCH) diff --git a/vim b/vim index fcb86b0..8cf3459 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit fcb86b0a99a9abedc408c99dae7591b6da832be8 +Subproject commit 8cf3459878198c5bb4a96f3c63214b2beccce341 From 9db1c96840db4c4b3451aa1f639f9cb6eaa45e7f Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 10 Oct 2022 11:59:43 +0900 Subject: [PATCH 18/40] catch up Vim 9.0.0709 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 571c7fc..d720fa5 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0701 +VIM_VER = 9.0.0709 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index 8cf3459..f167c7b 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 8cf3459878198c5bb4a96f3c63214b2beccce341 +Subproject commit f167c7b42476f8ab5b32c3c5ccbdca914316e96b From 903fb3e6083efa5f1d6ff439a6ff6aa8fb9c047f Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 11 Oct 2022 10:30:54 +0900 Subject: [PATCH 19/40] catch up Vim 9.0.0719 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index d720fa5..2950b32 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0709 +VIM_VER = 9.0.0719 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index f167c7b..5656496 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit f167c7b42476f8ab5b32c3c5ccbdca914316e96b +Subproject commit 56564964e6d0956c29687e8a10cb94fe42f5c097 From 15b5300c8200354e7c314493805a7a8924ed35ae Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 12 Oct 2022 10:35:54 +0900 Subject: [PATCH 20/40] catch up Vim 9.0.0728 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2950b32..fe25aed 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0719 +VIM_VER = 9.0.0728 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index 5656496..a4962cd 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 56564964e6d0956c29687e8a10cb94fe42f5c097 +Subproject commit a4962cd7bac8464d9f8d95d37614ecf595c5487e From 8c5827b922ba7396f4dec9a064811af6c58fab2a Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 13 Oct 2022 11:39:13 +0900 Subject: [PATCH 21/40] catch up Vim 9.0.0735 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index fe25aed..4250984 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0728 +VIM_VER = 9.0.0735 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index a4962cd..e42033e 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit a4962cd7bac8464d9f8d95d37614ecf595c5487e +Subproject commit e42033e735febb163fdc57aadbc11787ca611ba9 From 7d22fa0a5cfff89e62d9d4bc96a8a8dde2b5e7b8 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sat, 15 Oct 2022 09:31:40 +0900 Subject: [PATCH 22/40] catch up Vim 9.0.0747 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 4250984..44f5a64 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0735 +VIM_VER = 9.0.0747 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index e42033e..ba43e76 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit e42033e735febb163fdc57aadbc11787ca611ba9 +Subproject commit ba43e76fcd5b2da57dbaa4d9a555793fe8ac344e From a8f881fc02854842bbcfe3b218f73fbecbe27aa2 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sat, 15 Oct 2022 11:20:39 +0900 Subject: [PATCH 23/40] catch up Vim 9.0.0752 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 44f5a64..078c532 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0747 +VIM_VER = 9.0.0752 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index ba43e76..7e120ff 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit ba43e76fcd5b2da57dbaa4d9a555793fe8ac344e +Subproject commit 7e120ffccbf81ae8acac28f11fbd5eab79a1630d From 22091f3938296cd15f73b1351c39ba0d46ff6de6 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 16 Oct 2022 10:01:29 +0900 Subject: [PATCH 24/40] catch up Vim 9.0.0769 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 078c532..bbb4909 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0752 +VIM_VER = 9.0.0769 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index 7e120ff..db4c947 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 7e120ffccbf81ae8acac28f11fbd5eab79a1630d +Subproject commit db4c94788ad70118fa1ccc5fbc821757350ac771 From ae8c9fddece577b1486ae4aff9c81cea44e6425b Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 17 Oct 2022 10:25:34 +0900 Subject: [PATCH 25/40] catch up Vim 9.0.0777 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index bbb4909..8ac75a1 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0769 +VIM_VER = 9.0.0777 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index db4c947..3f0092c 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit db4c94788ad70118fa1ccc5fbc821757350ac771 +Subproject commit 3f0092c141824356b55b11cd3985baaf4df65334 From 48a522e1c3eb53caf1984dc92c054b100901b2a3 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 18 Oct 2022 10:47:24 +0900 Subject: [PATCH 26/40] catch up Vim 9.0.0785 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 8ac75a1..4b27d87 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0777 +VIM_VER = 9.0.0785 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index 3f0092c..9652249 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 3f0092c141824356b55b11cd3985baaf4df65334 +Subproject commit 9652249a2d02318a28a63a7b5711f25652e8f969 From 03dec38a430fd46a20fb9744dbb5da58c23cc74d Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 19 Oct 2022 10:04:27 +0900 Subject: [PATCH 27/40] catch up Vim 9.0.0792 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 4b27d87..9d4242e 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0785 +VIM_VER = 9.0.0792 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index 9652249..bf72e0c 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 9652249a2d02318a28a63a7b5711f25652e8f969 +Subproject commit bf72e0c67f26ea7c8fd941fdd1533c24c7b6cb43 From 4ed9c91a2ecc8a776a9563bd6702d51bff85eacb Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 20 Oct 2022 10:06:25 +0900 Subject: [PATCH 28/40] catch up Vim 9.0.0801 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 9d4242e..c868b7e 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0792 +VIM_VER = 9.0.0801 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index bf72e0c..7609c88 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit bf72e0c67f26ea7c8fd941fdd1533c24c7b6cb43 +Subproject commit 7609c88eedc113bc80ccf74050b03a2e0c1a3c5e From aac45a8521248641bb9119ae48edea2ce24ec505 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 21 Oct 2022 09:40:46 +0900 Subject: [PATCH 29/40] catch up Vim 9.0.0809 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index c868b7e..d71557f 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0801 +VIM_VER = 9.0.0809 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index 7609c88..63c8473 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 7609c88eedc113bc80ccf74050b03a2e0c1a3c5e +Subproject commit 63c84731c1802bac36c1d1a82b3ef5960b35b089 From e2781ce03e112d549a98b800a0e2223f963a3fcd Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 23 Oct 2022 10:26:01 +0900 Subject: [PATCH 30/40] catch up Vim 9.0.0814? --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index d71557f..c45f161 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 9.0.0809 +VIM_VER = 9.0.0814 PATCHSET_VER = 20221002 VIM_VER_SHORT = 90 diff --git a/vim b/vim index 63c8473..436e5d3 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 63c84731c1802bac36c1d1a82b3ef5960b35b089 +Subproject commit 436e5d395fd629c8d33b5cf7b373aad007f16851 From b74f1d6f9aac4e03a514d48a7905a20ce693c763 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 1 Oct 2023 12:23:39 +0900 Subject: [PATCH 31/40] freebsd: create tarball as a package --- .gitignore | 3 ++ build/freebsd/Makefile | 64 ++++++++++++++++++++++++-------- build/freebsd/Makefile1.mk | 76 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 build/freebsd/Makefile1.mk diff --git a/.gitignore b/.gitignore index 4e248b1..6357090 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ *.sw? tmp/ + +work/ +vim*-kaoriya-*.tar.bz2 diff --git a/build/freebsd/Makefile b/build/freebsd/Makefile index 8819225..adc0852 100644 --- a/build/freebsd/Makefile +++ b/build/freebsd/Makefile @@ -1,6 +1,8 @@ -ROOT_DIR = ../.. +DESTDIR = $(.CURDIR)/work +ROOT_DIR = $(.CURDIR)/../.. -include $(ROOT_DIR)/VERSION +.include "$(ROOT_DIR)/VERSION" +VERSION = $(VIM_VER)-$(PATCHSET_VER) VIM_SRCDIR = $(ROOT_DIR)/vim/src @@ -8,21 +10,46 @@ VIM_CONFIG = --with-features=huge \ --enable-gui=no \ --enable-fail-if-missing -VIM_DIR = /usr/local/share/vim -VIMRUNTIME_DIR = $(VIM_DIR)/vim$(VIM_VER_SHORT) +VIM_DIR = $(DESTDIR)/usr/local/share/vim +VIMRUNTIME_DIR = $(DESTDIR)$(VIM_DIR)/vim$(VIM_VER_SHORT) -default: vim-build +OS_TARGET = freebsd13 +VIM_PKGFILE = vim$(VIM_VER_SHORT)-kaoriya-$(OS_TARGET)-$(VERSION).tar.bz2 -install: vim-install kaoriya-install autofmt-install govim-install +############################################################################## + +version: + @echo ROOT_DIR=$(ROOT_DIR) + @echo DESTDIR =$(DESTDIR) + @echo VERSION =$(VERSION) + +package: + rm -f $(VIM_PKGFILE) + tar caf $(VIM_PKGFILE) --uname root --gname wheel --strip-components 1 -C $(DESTDIR) . + +package-clean: + rm -rf $(DESTDIR) + +package-install-all: vim-install-auto kaoriya-install autofmt-install govim-install + +package-auto: package-clean package-install-all package + +############################################################################## + +vim-patch: + cd $(VIM_SRCDIR) && guilt pop -a && guilt push -a + +vim-patch-reverse: + cd $(VIM_SRCDIR) && guilt pop -a vim-configure: cd $(VIM_SRCDIR) && ./configure $(VIM_CONFIG) vim-build: - cd $(VIM_SRCDIR) && make + cd $(VIM_SRCDIR) && make -j4 vim-install: - cd $(VIM_SRCDIR) && make install + cd $(VIM_SRCDIR) && make DESTDIR=$(DESTDIR) install vim-clean: cd $(VIM_SRCDIR) && make clean @@ -30,8 +57,9 @@ vim-clean: vim-distclean: cd $(VIM_SRCDIR) && make distclean -vim-install-auto: vim-distclean vim-configure vim-build - cd $(VIM_SRCDIR) && sudo $(MAKE) install +vim-install-auto: vim-patch vim-configure vim-build vim-install vim-distclean vim-patch-reverse + +############################################################################## KAORIYA_SRCDIR = $(ROOT_DIR)/kaoriya KAORIYA_INSTDIR = $(VIM_DIR) @@ -40,13 +68,15 @@ kaoriya-install: @cd $(KAORIYA_SRCDIR)/vim && \ for d in `find . -type d -not -name '.*'`; do \ echo mkdir: $$d ; \ - install -d -o root -g wheel -m 0755 $(KAORIYA_INSTDIR)/$$d || exit 1 ; \ + install -d -m 0755 $(KAORIYA_INSTDIR)/$$d || exit 1 ; \ done ; \ for f in `find . -type f -not -name '.*'`; do \ echo install: $$f ; \ - install -o root -g wheel -m 0666 $$f $(KAORIYA_INSTDIR)/$$f || exit 1 ; \ + install -m 0666 $$f $(KAORIYA_INSTDIR)/$$f || exit 1 ; \ done +############################################################################## + AUTOFMT_SRCDIR = $(ROOT_DIR)/contrib/autofmt AUTOFMT_INSTDIR = $(VIM_DIR)/plugins/autofmt @@ -54,13 +84,15 @@ autofmt-install: @cd $(AUTOFMT_SRCDIR) && \ for d in `find . -type d -not -name '.*'`; do \ echo mkdir: $$d ; \ - install -d -o root -g wheel -m 0755 $(AUTOFMT_INSTDIR)/$$d || exit 1 ; \ + install -d -m 0755 $(AUTOFMT_INSTDIR)/$$d || exit 1 ; \ done ; \ for f in `find . -type f -not -name '.*' `; do \ echo install: $$f ; \ - install -o root -g wheel -m 0666 $$f $(AUTOFMT_INSTDIR)/$$f || exit 1 ; \ + install -m 0666 $$f $(AUTOFMT_INSTDIR)/$$f || exit 1 ; \ done +############################################################################## + GOVIM_SRCDIR = $(ROOT_DIR)/contrib/go-vim GOVIM_INSTDIR = $(VIM_DIR)/plugins/golang @@ -68,9 +100,9 @@ govim-install: @cd $(GOVIM_SRCDIR) && \ for d in `find . -type d -not -name '.*'`; do \ echo mkdir: $$d ; \ - install -d -o root -g wheel -m 0755 $(GOVIM_INSTDIR)/$$d || exit 1 ; \ + install -d -m 0755 $(GOVIM_INSTDIR)/$$d || exit 1 ; \ done ; \ for f in `find . -type f -not -name '.*' `; do \ echo install: $$f ; \ - install -o root -g wheel -m 0666 $$f $(GOVIM_INSTDIR)/$$f || exit 1 ; \ + install -m 0666 $$f $(GOVIM_INSTDIR)/$$f || exit 1 ; \ done diff --git a/build/freebsd/Makefile1.mk b/build/freebsd/Makefile1.mk new file mode 100644 index 0000000..8819225 --- /dev/null +++ b/build/freebsd/Makefile1.mk @@ -0,0 +1,76 @@ +ROOT_DIR = ../.. + +include $(ROOT_DIR)/VERSION + +VIM_SRCDIR = $(ROOT_DIR)/vim/src + +VIM_CONFIG = --with-features=huge \ + --enable-gui=no \ + --enable-fail-if-missing + +VIM_DIR = /usr/local/share/vim +VIMRUNTIME_DIR = $(VIM_DIR)/vim$(VIM_VER_SHORT) + +default: vim-build + +install: vim-install kaoriya-install autofmt-install govim-install + +vim-configure: + cd $(VIM_SRCDIR) && ./configure $(VIM_CONFIG) + +vim-build: + cd $(VIM_SRCDIR) && make + +vim-install: + cd $(VIM_SRCDIR) && make install + +vim-clean: + cd $(VIM_SRCDIR) && make clean + +vim-distclean: + cd $(VIM_SRCDIR) && make distclean + +vim-install-auto: vim-distclean vim-configure vim-build + cd $(VIM_SRCDIR) && sudo $(MAKE) install + +KAORIYA_SRCDIR = $(ROOT_DIR)/kaoriya +KAORIYA_INSTDIR = $(VIM_DIR) + +kaoriya-install: + @cd $(KAORIYA_SRCDIR)/vim && \ + for d in `find . -type d -not -name '.*'`; do \ + echo mkdir: $$d ; \ + install -d -o root -g wheel -m 0755 $(KAORIYA_INSTDIR)/$$d || exit 1 ; \ + done ; \ + for f in `find . -type f -not -name '.*'`; do \ + echo install: $$f ; \ + install -o root -g wheel -m 0666 $$f $(KAORIYA_INSTDIR)/$$f || exit 1 ; \ + done + +AUTOFMT_SRCDIR = $(ROOT_DIR)/contrib/autofmt +AUTOFMT_INSTDIR = $(VIM_DIR)/plugins/autofmt + +autofmt-install: + @cd $(AUTOFMT_SRCDIR) && \ + for d in `find . -type d -not -name '.*'`; do \ + echo mkdir: $$d ; \ + install -d -o root -g wheel -m 0755 $(AUTOFMT_INSTDIR)/$$d || exit 1 ; \ + done ; \ + for f in `find . -type f -not -name '.*' `; do \ + echo install: $$f ; \ + install -o root -g wheel -m 0666 $$f $(AUTOFMT_INSTDIR)/$$f || exit 1 ; \ + done + +GOVIM_SRCDIR = $(ROOT_DIR)/contrib/go-vim +GOVIM_INSTDIR = $(VIM_DIR)/plugins/golang + +govim-install: + @cd $(GOVIM_SRCDIR) && \ + for d in `find . -type d -not -name '.*'`; do \ + echo mkdir: $$d ; \ + install -d -o root -g wheel -m 0755 $(GOVIM_INSTDIR)/$$d || exit 1 ; \ + done ; \ + for f in `find . -type f -not -name '.*' `; do \ + echo install: $$f ; \ + install -o root -g wheel -m 0666 $$f $(GOVIM_INSTDIR)/$$f || exit 1 ; \ + done From 46cf923233d17bf44b18c4202f2d47c049594830 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 1 Oct 2023 23:42:59 +0900 Subject: [PATCH 32/40] doc for FreeBSD --- build/freebsd/README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 build/freebsd/README.md diff --git a/build/freebsd/README.md b/build/freebsd/README.md new file mode 100644 index 0000000..b5ee43c --- /dev/null +++ b/build/freebsd/README.md @@ -0,0 +1,19 @@ +# for FreeBSD + +1. Create a package + + ```console + $ make package-auto + ``` + +2. Copy to a target machine (OPTIONAL) + + ```console + $ scp vim90-kaoriya-freebsd13-9.0.0814-20221002.tar.bz2 foobar@machine:tmp + ``` + +3. Install as root + + ```console + $ sudo tar xvf vim90-kaoriya-freebsd13-9.0.0814-20221002.tar.bz2 -C / + ``` From dd18225cf304f88804096e5f41177e6ecaba68bd Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 2 Oct 2023 21:37:24 +0900 Subject: [PATCH 33/40] use uid and gid --- build/freebsd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/freebsd/Makefile b/build/freebsd/Makefile index adc0852..112addc 100644 --- a/build/freebsd/Makefile +++ b/build/freebsd/Makefile @@ -25,7 +25,7 @@ version: package: rm -f $(VIM_PKGFILE) - tar caf $(VIM_PKGFILE) --uname root --gname wheel --strip-components 1 -C $(DESTDIR) . + tar caf $(VIM_PKGFILE) --uid 0 --gid 0 --strip-components 1 -C $(DESTDIR) . package-clean: rm -rf $(DESTDIR) From 8af07a2db2e629047eaaa5dd7ed4cf69eb72c646 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 6 Oct 2023 22:01:39 +0900 Subject: [PATCH 34/40] fix default term for FreeBSD --- kaoriya/vim/vimrc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kaoriya/vim/vimrc b/kaoriya/vim/vimrc index 55553e1..a3824e1 100644 --- a/kaoriya/vim/vimrc +++ b/kaoriya/vim/vimrc @@ -4,7 +4,7 @@ scriptencoding utf-8 " An example for a Japanese version vimrc file. " 日本語版のデフォルト設定ファイル(vimrc) - Vim 8.1 " -" Last Change: 23-Mar-2019. +" Last Change: 06-Oct-2023. " Maintainer: MURAOKA Taro " " 解説: @@ -195,7 +195,11 @@ if has('unix') && !has('gui_running') if s:uname =~? "linux" " no need to use builtin_term for Linux elseif s:uname =~? "freebsd" - set term=builtin_cons25 + if exists("$TERM") + set term=$TERM + else + set term=builtin_cons25 + endif elseif s:uname =~? "Darwin" set term=builtin_beos-ansi else From 799a27f0116251e71f5752a33f7bbb0b08002dfa Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 25 Jan 2024 22:52:07 +0900 Subject: [PATCH 35/40] update for FreeBSD 14 --- build/freebsd/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/freebsd/Makefile b/build/freebsd/Makefile index 112addc..de8ba86 100644 --- a/build/freebsd/Makefile +++ b/build/freebsd/Makefile @@ -13,15 +13,16 @@ VIM_CONFIG = --with-features=huge \ VIM_DIR = $(DESTDIR)/usr/local/share/vim VIMRUNTIME_DIR = $(DESTDIR)$(VIM_DIR)/vim$(VIM_VER_SHORT) -OS_TARGET = freebsd13 +OS_TARGET = freebsd14 VIM_PKGFILE = vim$(VIM_VER_SHORT)-kaoriya-$(OS_TARGET)-$(VERSION).tar.bz2 ############################################################################## version: - @echo ROOT_DIR=$(ROOT_DIR) - @echo DESTDIR =$(DESTDIR) - @echo VERSION =$(VERSION) + @echo ROOT_DIR = $(ROOT_DIR) + @echo DESTDIR = $(DESTDIR) + @echo VERSION = $(VERSION) + @echo OS_TARGET = $(OS_TARGET) package: rm -f $(VIM_PKGFILE) From 465cf6952c2e10ab6042f5f29a00197c1a218387 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 25 Jan 2024 23:04:42 +0900 Subject: [PATCH 36/40] backup old Makefile --- build/xubuntu/{Makefile => Makefile.old} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build/xubuntu/{Makefile => Makefile.old} (100%) diff --git a/build/xubuntu/Makefile b/build/xubuntu/Makefile.old similarity index 100% rename from build/xubuntu/Makefile rename to build/xubuntu/Makefile.old From 90bdba472cfb659adc785ed4acbc4ea6d18724e2 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 26 Jan 2024 00:07:14 +0900 Subject: [PATCH 37/40] work on linux --- build/xubuntu/Makefile | 113 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 build/xubuntu/Makefile diff --git a/build/xubuntu/Makefile b/build/xubuntu/Makefile new file mode 100644 index 0000000..83856a8 --- /dev/null +++ b/build/xubuntu/Makefile @@ -0,0 +1,113 @@ +CURDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +DESTDIR = $(abspath $(CURDIR)work) +ROOT_DIR = $(abspath $(CURDIR)../..) + +include $(ROOT_DIR)/VERSION +VERSION = $(VIM_VER)-$(PATCHSET_VER) + +VIM_SRCDIR = $(ROOT_DIR)/vim/src + +VIM_CONFIG = --with-features=huge \ + --enable-gui=gtk2 \ + --enable-luainterp=dynamic \ + --with-luajit \ + --enable-fail-if-missing + +VIM_DIR = $(DESTDIR)/usr/local/share/vim +VIMRUNTIME_DIR = $(DESTDIR)$(VIM_DIR)/vim$(VIM_VER_SHORT) + +OS_TARGET = ubuntu23.10 +VIM_PKGFILE = vim$(VIM_VER_SHORT)-kaoriya-$(OS_TARGET)-$(VERSION).tar.bz2 + +############################################################################## + +version: + @echo ROOT_DIR = $(ROOT_DIR) + @echo DESTDIR = $(DESTDIR) + @echo VERSION = $(VERSION) + @echo OS_TARGET = $(OS_TARGET) + +package: + rm -f $(VIM_PKGFILE) + tar caf $(VIM_PKGFILE) --owner=root:0 --group=root:0 --strip-components 1 -C $(DESTDIR) . + +package-clean: + rm -rf $(DESTDIR) + +package-install-all: vim-install-auto kaoriya-install autofmt-install govim-install + +package-auto: package-clean package-install-all package + +############################################################################## + +vim-patch: + cd $(VIM_SRCDIR) && guilt pop -a && guilt push -a + +vim-patch-reverse: + cd $(VIM_SRCDIR) && guilt pop -a + +vim-configure: + cd $(VIM_SRCDIR) && ./configure $(VIM_CONFIG) + +vim-build: + cd $(VIM_SRCDIR) && make -j4 + +vim-install: + cd $(VIM_SRCDIR) && make DESTDIR=$(DESTDIR) install + +vim-clean: + cd $(VIM_SRCDIR) && make clean + +vim-distclean: + cd $(VIM_SRCDIR) && make distclean + +vim-install-auto: vim-patch vim-configure vim-build vim-install vim-distclean vim-patch-reverse + +############################################################################## + +KAORIYA_SRCDIR = $(ROOT_DIR)/kaoriya +KAORIYA_INSTDIR = $(VIM_DIR) + +kaoriya-install: + @cd $(KAORIYA_SRCDIR)/vim && \ + for d in `find . -type d -not -name '.*'`; do \ + echo mkdir: $$d ; \ + install -d -m 0755 $(KAORIYA_INSTDIR)/$$d || exit 1 ; \ + done ; \ + for f in `find . -type f -not -name '.*'`; do \ + echo install: $$f ; \ + install -m 0666 $$f $(KAORIYA_INSTDIR)/$$f || exit 1 ; \ + done + +############################################################################## + +AUTOFMT_SRCDIR = $(ROOT_DIR)/contrib/autofmt +AUTOFMT_INSTDIR = $(VIM_DIR)/plugins/autofmt + +autofmt-install: + @cd $(AUTOFMT_SRCDIR) && \ + for d in `find . -type d -not -name '.*'`; do \ + echo mkdir: $$d ; \ + install -d -m 0755 $(AUTOFMT_INSTDIR)/$$d || exit 1 ; \ + done ; \ + for f in `find . -type f -not -name '.*' `; do \ + echo install: $$f ; \ + install -m 0666 $$f $(AUTOFMT_INSTDIR)/$$f || exit 1 ; \ + done + +############################################################################## + +GOVIM_SRCDIR = $(ROOT_DIR)/contrib/go-vim +GOVIM_INSTDIR = $(VIM_DIR)/plugins/golang + +govim-install: + @cd $(GOVIM_SRCDIR) && \ + for d in `find . -type d -not -name '.*'`; do \ + echo mkdir: $$d ; \ + install -d -m 0755 $(GOVIM_INSTDIR)/$$d || exit 1 ; \ + done ; \ + for f in `find . -type f -not -name '.*' `; do \ + echo install: $$f ; \ + install -m 0666 $$f $(GOVIM_INSTDIR)/$$f || exit 1 ; \ + done From 982aa1af8e488928afde6dc681dc33a98a75e68e Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 7 Feb 2024 11:56:29 +0900 Subject: [PATCH 38/40] update patches --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index 2e3aee1..c8e1d38 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit 2e3aee1b26c4cbb8022239307e5e527d074650fd +Subproject commit c8e1d384348860fa0a17a9cf6dffd6f0ede067c5 From d55be8a6672f9dc4605f69813d04949f61398648 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 7 Feb 2024 12:01:24 +0900 Subject: [PATCH 39/40] update VERSION. remove olds --- VERSION | 2 +- build/xubuntu/Makefile.old | 68 -------------------------------------- 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 build/xubuntu/Makefile.old diff --git a/VERSION b/VERSION index c45f161..3c4501b 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ VIM_VER = 9.0.0814 -PATCHSET_VER = 20221002 +PATCHSET_VER = 20240207 VIM_VER_SHORT = 90 diff --git a/build/xubuntu/Makefile.old b/build/xubuntu/Makefile.old deleted file mode 100644 index bb32726..0000000 --- a/build/xubuntu/Makefile.old +++ /dev/null @@ -1,68 +0,0 @@ -ROOT_DIR = ../.. - -include $(ROOT_DIR)/VERSION - -VIM_SRCDIR = $(ROOT_DIR)/vim/src - -VIM_CONFIG = --with-features=huge \ - --enable-gui=gtk2 \ - --enable-luainterp=dynamic \ - --with-luajit \ - --enable-python3interp=dynamic \ - --enable-rubyinterp=dynamic \ - --enable-fail-if-missing - -VIM_DIR = /usr/local/share/vim -VIMRUNTIME_DIR = $(VIM_DIR)/vim$(VIM_VER_SHORT) - -default: vim-build - -install: kaoriya-install autofmt-install govim-install - -vim-configure: - cd $(VIM_SRCDIR) && ./configure $(VIM_CONFIG) - -vim-build: - cd $(VIM_SRCDIR) && make - -vim-install: - cd $(VIM_SRCDIR) && make install - -vim-clean: - cd $(VIM_SRCDIR) && make clean - -vim-distclean: - cd $(VIM_SRCDIR) && make distclean - -vim-install-auto: vim-distclean vim-configure vim-build - cd $(VIM_SRCDIR) && sudo $(MAKE) install - -KAORIYA_SRCDIR = $(ROOT_DIR)/kaoriya -KAORIYA_INSTDIR = $(VIM_DIR) - -kaoriya-install: - @cd $(KAORIYA_SRCDIR)/vim && \ - for f in `find . -type f -not -name '.*'`; do \ - echo install: $$f ; \ - install -o root -g root -m 0666 -D $$f $(KAORIYA_INSTDIR)/$$f || exit 1 ; \ - done - -AUTOFMT_SRCDIR = $(ROOT_DIR)/contrib/autofmt -AUTOFMT_INSTDIR = $(VIM_DIR)/plugins/autofmt - -autofmt-install: - @cd $(AUTOFMT_SRCDIR) && \ - for f in `find . -type f -not -name '.*' `; do \ - echo install: $$f ; \ - install -o root -g root -m 0666 -D $$f $(AUTOFMT_INSTDIR)/$$f || exit 1 ; \ - done - -GOVIM_SRCDIR = $(ROOT_DIR)/contrib/go-vim -GOVIM_INSTDIR = $(VIM_DIR)/plugins/golang - -govim-install: - @cd $(GOVIM_SRCDIR) && \ - for f in `find . -type f -not -name '.*' `; do \ - echo install: $$f ; \ - install -o root -g root -m 0666 -D $$f $(GOVIM_INSTDIR)/$$f || exit 1 ; \ - done From d58d12977be77fe27bd4fc5eddb70531081d4997 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 7 Feb 2024 22:59:40 +0900 Subject: [PATCH 40/40] doc for Xubuntu --- build/xubuntu/README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 build/xubuntu/README.md diff --git a/build/xubuntu/README.md b/build/xubuntu/README.md new file mode 100644 index 0000000..e0595cc --- /dev/null +++ b/build/xubuntu/README.md @@ -0,0 +1,19 @@ +# for Xubuntu (may for Ubuntu also) + +1. Create a package + + ```console + $ make package-auto + ``` + +2. Copy to a target machine (OPTIONAL) + + ```console + $ scp vim90-kaoriya-ubuntu23.10-9.0.0814-20240207.tar.bz2 foobar@machine:tmp + ``` + +3. Install as root + + ```console + $ sudo tar xvf vim90-kaoriya-ubuntu23.10-9.0.0814-20221002.tar.bz2 -C / + ```