Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@koron
koron committed Dec 22, 2019
2 parents 6543646 + f6e9954 commit ef53257
Show file tree
Hide file tree
Showing 17 changed files with 106 additions and 625 deletions.
6 changes: 3 additions & 3 deletions VERSION
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VIM_VER = 8.1.1048
PATCHSET_VER = 20190325
VIM_VER = 8.2.0029
PATCHSET_VER = 20191222

VIM_VER_SHORT = 81
VIM_VER_SHORT = 82

# vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make:
16 changes: 16 additions & 0 deletions build/msvc/20-upload-all.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@ECHO OFF
SETLOCAL

CALL tools\command-common.bat

REM Uplaod release files to publishing server.
ECHO Uploading...
rsync -v target/%RELZIP_W32% target/%RELZIP_W64% target/%PDBZIP_W32% target/%PDBZIP_W64% "[email protected]:htdocs/files.kaoriya.net/vim"

REM Pool release files to pooling server.
ECHO Pooling...
SET YEAR=%date:~-10,4%
rsync -v target/%RELZIP_W32% target/%RELZIP_W64% target/%PDBZIP_W32% target/%PDBZIP_W64% "[email protected]:pool/vim-jp/released/%YEAR%"

PAUSE
EXIT /B 0
10 changes: 0 additions & 10 deletions build/msvc/20a-upload-all.bat
View file

This file was deleted.

11 changes: 0 additions & 11 deletions build/msvc/20b-pool-all.bat
View file

This file was deleted.

102 changes: 44 additions & 58 deletions build/msvc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

DIST_VER = $(VIM_VER_SHORT)-kaoriya-$(WINDOWS_CPUTYPE)
DATE_VER = %%date:~-10,4%%%%date:~-5,2%%%%date:~-2,2%%
TIME_VER = %%time:~-11,2%%%%time:~-8,2%%%%time:~-5,2%%

RTDIR_NAME = vim$(VIM_VER_SHORT)

Expand All @@ -32,6 +33,7 @@ VIM_PATCH_DIR = $(INSTALL_DIR)\share\vim\patch
VIM_DIST_DIR = $(OUTPUT_DIR)\vim$(DIST_VER)
KAORIYA_DIR = ..\..\kaoriya
SNAPSHOT_DIR = $(OUTPUT_DIR)\vim$(DIST_VER)-snapshot
TESTRES_DIR = $(OUTPUT_DIR)\test_result

MSVCRT_DIR = $(VCINSTALLDIR)\redist\$(MSVCRT_CPUTYPE)\$(MSVCRT_SUBDIR)

Expand All @@ -42,11 +44,14 @@ COPY = Robocopy /XO
CPUTYPE=x64
MSVCRT_CPUTYPE=x64
WINDOWS_CPUTYPE=win64
VIMDLL_BASE=vim64
!ELSE
CPUTYPE=x32
MSVCRT_CPUTYPE=x86
WINDOWS_CPUTYPE=win32
VIMDLL_BASE=vim32
!ENDIF
VIMDLL=$(VIMDLL_BASE).dll

# Check MSVC version.
!IF "$(_NMAKE_VER)" >= "9." && "$(_NMAKE_VER)" < "@."
Expand Down Expand Up @@ -83,7 +88,7 @@ archive-pre:
$(MAKE) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)"
$(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
$(MAKE) "$(INSTALL_DIR)\bin\winpty-agent.exe"
$(MAKE) vim-clean gvim-clean vim-install
$(MAKE) vim-clean vim-install
$(MAKE) vim-mo-install vim-patch-install
$(MAKE) langja-install

Expand Down Expand Up @@ -114,7 +119,7 @@ version-interfaces:
version-clean:
rm -f version-interfaces.out

rebuild-vim: vim-clean vim-build gvim-clean gvim-build
rebuild-vim: vim-clean vim-build

### ICONV

Expand Down Expand Up @@ -285,7 +290,7 @@ langja-install:
IF NOT EXIST "$(VIM_INSTALL_DIR)\doc" MD "$(VIM_INSTALL_DIR)\doc"
IF NOT EXIST "$(VIM_INSTALL_DIR)\tutor" MD "$(VIM_INSTALL_DIR)\tutor"
cd "$(LANGJA_DIR)"
make test
make LANG=C test
-COPY src\po\ja.mo "$(VIM_INSTALL_DIR)\lang\ja\LC_MESSAGES\vim.mo"
-COPY src\po\ja.euc-jp.mo "$(VIM_INSTALL_DIR)\lang\ja.euc-jp\LC_MESSAGES\vim.mo"
-COPY src\po\ja.sjis.mo "$(VIM_INSTALL_DIR)\lang\ja.sjis\LC_MESSAGES\vim.mo"
Expand All @@ -304,8 +309,18 @@ vim-build:
vim-test: vim-build
cd "$(VIM_DIR)\src\testdir"
nmake /NOLOGO /F Make_dos.mak clean
nmake /NOLOGO /F Make_dos.mak win32
-nmake /NOLOGO /F Make_dos.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
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"
Expand All @@ -329,42 +344,9 @@ vimd-clean:
- if exist vimd.lib del vimd.lib
cd "$(BUILD_DIR)"

gvim-build:
cd "$(VIM_DIR)\src"
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes
cd "$(BUILD_DIR)"

gvim-test: gvim-build
cd "$(VIM_DIR)\src\testdir"
nmake /NOLOGO /F Make_dos.mak VIMPROG=..\gvim clean
nmake /NOLOGO /F Make_dos.mak VIMPROG=..\gvim gui
cd "$(BUILD_DIR)"

gvim-test-clean:
cd "$(VIM_DIR)\src\testdir"
nmake /NOLOGO /F Make_dos.mak VIMPROG=..\gvim clean
cd "$(BUILD_DIR)"

gvim-clean:
cd "$(VIM_DIR)\src"
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes clean
- if exist gvim.lib del gvim.lib
cd "$(BUILD_DIR)"

gvimd-build:
cd "$(VIM_DIR)\src"
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes DEBUG=yes
cd "$(BUILD_DIR)"

gvimd-clean:
cd "$(VIM_DIR)\src"
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes DEBUG=yes clean
- if exist gvimd.lib del gvimd.lib
cd "$(BUILD_DIR)"

vim-install: vim-build gvim-build
vim-install: vim-build
-$(COPY) "$(VIM_DIR)\src" "$(INSTALL_DIR)\bin" \
vim.exe gvim.exe vimrun.exe
vim.exe gvim.exe $(VIMDLL) vimrun.exe
-$(COPY) "$(VIM_DIR)\src\xxd" "$(INSTALL_DIR)\bin" xxd.exe
-$(COPY) "$(VIM_DIR)\src\tee" "$(INSTALL_DIR)\bin" tee.exe

Expand All @@ -388,19 +370,19 @@ PDB_DIST_NAME = vim$(DIST_VER)-pdb
PDB_DIST_ZIP = vim$(DIST_VER)-$(VIM_VER)-$(PATCHSET_VER)-pdb.zip
PDB_DIST_DIR = $(OUTPUT_DIR)\$(PDB_DIST_NAME)

pdb-build: $(VIM_DIR)\src\vim.pdb $(VIM_DIR)\src\gvim.pdb
pdb-build: $(VIM_DIR)\src\$(VIMDLL_BASE).pdb

pdb-install: $(INSTALL_DIR)\bin\vim.pdb $(INSTALL_DIR)\bin\gvim.pdb
pdb-install: $(INSTALL_DIR)\bin\$(VIMDLL_BASE).pdb

pdb-distdir: $(PDB_DIST_DIR)\vim.pdb $(PDB_DIST_DIR)\gvim.pdb
pdb-distdir: $(PDB_DIST_DIR)\$(VIMDLL_BASE).pdb

pdb-archive: $(OUTPUT_DIR)\$(PDB_DIST_ZIP)

$(VIM_DIR)\src\vim.pdb:
$(VIM_DIR)\src\vim.pdb $(VIM_DIR)\src\gvim.pdb:
$(MAKE) vim-build

$(VIM_DIR)\src\gvim.pdb:
$(MAKE) gvim-build
$(VIM_DIR)\src\$(VIMDLL_BASE).pdb:
$(MAKE) vim-build

$(PDB_DIST_DIR):
IF NOT EXIST "$(PDB_DIST_DIR)" MKDIR "$(PDB_DIST_DIR)"
Expand All @@ -419,7 +401,14 @@ $(PDB_DIST_DIR)\gvim.pdb: $(INSTALL_DIR)\bin\gvim.pdb
$(MAKE) $(PDB_DIST_DIR)
-$(COPY) "$(INSTALL_DIR)\bin" "$(PDB_DIST_DIR)" gvim.pdb

$(OUTPUT_DIR)\$(PDB_DIST_ZIP): $(PDB_DIST_DIR)\vim.pdb $(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)
-$(COPY) "$(INSTALL_DIR)\bin" "$(PDB_DIST_DIR)" $(VIMDLL_BASE).pdb

$(OUTPUT_DIR)\$(PDB_DIST_ZIP): $(PDB_DIST_DIR)\$(VIMDLL_BASE).pdb
cd "$(OUTPUT_DIR)"
zip -r9q $(PDB_DIST_ZIP) $(PDB_DIST_NAME)
cd "$(BUILD_DIR)"
Expand All @@ -443,16 +432,16 @@ build-dist:
# Plugin - vimdoc-ja
-$(COPY) /E "$(CONTRIB_DIR)\vimdoc-ja" "$(VIM_DIST_DIR)\plugins\vimdoc-ja" /XD .git /XF .git*
-"$(INSTALL_DIR)\bin\vim.exe" -nes -u NONE -U NONE --noplugin \
-c "helptags $(VIM_DIST_DIR)\plugins\vimdoc-ja\doc | quit"
-c "helptags $(VIM_DIST_DIR)\plugins\vimdoc-ja\doc" -c quit
# Plugin - autofmt
-$(COPY) /E "$(CONTRIB_DIR)\autofmt" "$(VIM_DIST_DIR)\plugins\autofmt" /XD .git /XF .git*
-"$(INSTALL_DIR)\bin\vim.exe" -nes -u NONE -U NONE --noplugin \
-c "helptags $(VIM_DIST_DIR)\plugins\autofmt\doc | quit"
-c "helptags $(VIM_DIST_DIR)\plugins\autofmt\doc" -c quit
# Plugin - vimproc
-$(COPY) /E "$(CONTRIB_DIR)\vimproc\doc" \
"$(VIM_DIST_DIR)\plugins\vimproc\doc"
-"$(INSTALL_DIR)\bin\vim.exe" -nes -u NONE -U NONE --noplugin \
-c "helptags $(VIM_DIST_DIR)\plugins\vimproc\doc | quit"
-c "helptags $(VIM_DIST_DIR)\plugins\vimproc\doc" -c quit
-$(COPY) /E "$(CONTRIB_DIR)\vimproc\plugin" \
"$(VIM_DIST_DIR)\plugins\vimproc\plugin"
-$(COPY) /E "$(CONTRIB_DIR)\vimproc\autoload" \
Expand All @@ -468,13 +457,13 @@ build-dist:
# Vim and other executable and resource files.
-$(COPY) "$(VIM_DIR)" "$(VIM_DIST_DIR)\origdoc" README.txt
-$(COPY) "$(INSTALL_DIR)\bin" "$(VIM_DIST_DIR)" \
vim.exe gvim.exe vimrun.exe xxd.exe tee.exe \
vim.exe gvim.exe $(VIMDLL) vimrun.exe xxd.exe tee.exe \
iconv.dll intl.dll luajit.exe lua51.dll \
winpty.dll winpty-agent.exe
-$(COPY) /E "$(VIM_DIR)\runtime" "$(VIM_DIST_DIR)\$(RTDIR_NAME)"
-$(COPY) /E "$(VIM_INSTALL_DIR)" "$(VIM_DIST_DIR)\$(RTDIR_NAME)"
-"$(INSTALL_DIR)\bin\vim.exe" -nes -u NONE -U NONE --noplugin \
-c "helptags $(VIM_DIST_DIR)\$(RTDIR_NAME)\doc | quit"
-c "helptags $(VIM_DIST_DIR)\$(RTDIR_NAME)\doc" -c quit
# Copy MSVC runtime files.
-$(COPY) "$(MSVCRT_DIR)" "$(VIM_DIST_DIR)" $(MSVCRT_FILES)
# Copy patch (diff) files.
Expand All @@ -500,7 +489,7 @@ build-release-pre:
$(MAKE) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)"
$(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
$(MAKE) "$(INSTALL_DIR)\bin\winpty-agent.exe"
$(MAKE) vim-clean gvim-clean
$(MAKE) vim-clean
$(MAKE) vim-install vim-mo-install vim-patch-install
$(MAKE) langja-install
$(MAKE) build-dist
Expand All @@ -511,19 +500,18 @@ build-release-core:
$(MAKE) pdb-archive

build-release-post:
$(MAKE) vim-clean gvim-clean
$(MAKE) vim-clean

snapshot: snapshot-build snapshot-install snapshot-archive

snapshot-pre: snapshot-install snapshot-archive

snapshot-build:
$(MAKE) vim-clean vim-build
$(MAKE) gvim-clean gvim-build

snapshot-install:
IF NOT EXIST "$(SNAPSHOT_DIR)" MD "$(SNAPSHOT_DIR)"
-$(COPY) "$(VIM_DIR)\src" "$(SNAPSHOT_DIR)" vim.exe gvim.exe
-$(COPY) "$(VIM_DIR)\src" "$(SNAPSHOT_DIR)" vim.exe gvim.exe $(VIMDLL)

snapshot-archive:
cd "$(OUTPUT_DIR)"
Expand All @@ -540,7 +528,6 @@ snapshot-archive:
winpty-install \
langja-install \
vim-build vim-clean vimd-build vimd-clean \
gvim-build gvim-clean gvimd-build gvimd-clean \
vim-install vim-mo-install vim-patch-install \
pdb-build pdb-install pdb-distdir pdb-archive \
build-dist archive-dist zip-dist clean-dist \
Expand All @@ -566,5 +553,4 @@ snapshot-archive:
$(MAKE) winpty-install

"$(INSTALL_DIR)\bin\vim.exe":
$(MAKE) vim-clean gvim-clean vim-install vim-mo-install \
vim-clean gvim-clean
$(MAKE) vim-clean vim-install vim-mo-install vim-clean
6 changes: 4 additions & 2 deletions build/msvc/vim.mak
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
USERNAME=koron.kaoriya
USERDOMAIN=gmail.com

FEATURES=HUGE
MBYTE=YES
USE_MSVCRT=yes
MIGEMO=yes
MAP=no

# build as Vim DLL
VIMDLL=yes
IME=yes

# DirectWrite support.
DIRECTX=yes

Expand Down
1 change: 0 additions & 1 deletion build/msvc2/.gitignore
View file

This file was deleted.

Loading

0 comments on commit ef53257

Please sign in to comment.