use Visual Stdio 2022, catch up Vim 9

.gitignore

@@ -1,2 +1,5 @@
 *.sw?
 tmp/
+
+work/
+vim*-kaoriya-*.tar.bz2

VERSION

@@ -1,6 +1,6 @@
-VIM_VER = 8.2.1287
-PATCHSET_VER = 20200724
+VIM_VER = 9.0.0814
+PATCHSET_VER = 20240207
 
-VIM_VER_SHORT = 82
+VIM_VER_SHORT = 90
 
 # vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make:

build/freebsd/Makefile

@@ -1,37 +1,66 @@
-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
 
 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 = freebsd14
+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)
+ @echo OS_TARGET = $(OS_TARGET)
+
+package:
+ rm -f $(VIM_PKGFILE)
+ tar caf $(VIM_PKGFILE) --uid 0 --gid 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
+ 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
 
 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,37 +69,41 @@ 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
 
 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
 
 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

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

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 /
+ ```

build/msvc/.gitignore

@@ -1,4 +1,5 @@
 /*.out
 /*.sln
 /*.suo
+/.vs/
 /target/

build/msvc/9A-daily-build.bat

@@ -0,0 +1,50 @@
+@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 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 | 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
+
+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
+
+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

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