Skip to content

Commit 7aeeae6

Browse files
koronkoron
committed
Merge branch 'develop' to release
2 parents 99e527e + 8e4b2aa commit 7aeeae6

10 files changed

Lines changed: 39 additions & 11 deletions

File tree

‎VERSION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VIM_VER = 8.0.0082
2-
PATCHSET_VER = 20161113
1+
VIM_VER = 8.0.0134
2+
PATCHSET_VER = 20170101
33

44
VIM_VER_SHORT = 80
55

‎build/msvc/Makefile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ version-interfaces:
115115
version-clean:
116116
rm -f version-interfaces.out
117117

118+
rebuild-vim: vim-clean vim-build gvim-clean gvim-build
119+
118120
### ICONV
119121

120122
iconv-build:
@@ -287,7 +289,9 @@ vim-build:
287289

288290
vim-test: vim-build
289291
cd "$(VIM_DIR)\src\testdir"
290-
nmake /NOLOGO /F Make_dos.mak win32 clean
292+
nmake /NOLOGO /F Make_dos.mak clean
293+
nmake /NOLOGO /F Make_dos.mak win32
294+
nmake /NOLOGO /F Make_dos.mak clean
291295
cd "$(BUILD_DIR)"
292296

293297
vim-clean:
@@ -312,6 +316,13 @@ gvim-build:
312316
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes
313317
cd "$(BUILD_DIR)"
314318

319+
gvim-test: gvim-build
320+
cd "$(VIM_DIR)\src\testdir"
321+
nmake /NOLOGO /F Make_dos.mak VIMPROG=..\gvim clean
322+
nmake /NOLOGO /F Make_dos.mak VIMPROG=..\gvim gui
323+
nmake /NOLOGO /F Make_dos.mak VIMPROG=..\gvim clean
324+
cd "$(BUILD_DIR)"
325+
315326
gvim-clean:
316327
cd "$(VIM_DIR)\src"
317328
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak GUI=yes IME=yes clean

‎build/msvc/README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,11 @@
2121

2222
1. https://www.virustotal.com/ で配布URL & zip ファイルを検査
2323
2. koron/vim-kaoriya にタグを追加し、release を作成し zip を追加して公開
24+
25+
## テストの実行方法
26+
27+
```
28+
nmake rebuild-vim
29+
nmake vim-test
30+
nmake gvim-test
31+
```

‎contrib/autofmt‎

‎contrib/lang-ja‎

‎contrib/luajit-2.0‎

Submodule luajit-2.0 updated from 716f2da to 8e5d7be

‎contrib/vimdoc-ja‎

‎kaoriya/doc/CHANGES.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 2017/01/01 の変更点
2+
3+
* ベースコードを8.0.0134に更新しました
4+
* contrib 追加
5+
* autofmt (2016-12-03 4bf8dbb)
6+
* lang-ja (2016-12-08 4c3c613)
7+
* LuaJIT (2016-12-30 8e5d7be)
8+
* vimdoc-ja (2016-12-23 489d8a0)
9+
110
## 2016/11/13 の変更点
211

312
* ベースコードを8.0.0082に更新しました

‎kaoriya/doc/README.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Vim version 8.0 ���艮�� �����}�j���A��
22

3-
Version: 1.9.0
3+
Version: 1.9.1
44
Author: MURAOKA Taro
55
Since: 23-Aug-1999
6-
Last Change: 12-Sep-2016.
6+
Last Change: 01-Jan-2017.
77

88
�T�v
99
Vim��vi�N���[���ɕ��ނ����e�L�X�g�G�f�B�^�ł��B
@@ -20,7 +20,7 @@
2020
����̂ŁA�𓀂��ăV�X�e�����̍D���ȏꏊ�ɔz�u���Ă��������B
2121

2222
32bit��
23-
�z�z�t�@�C��: vim80-kaoriya-win32-V.V.VVV-YYYYMMDD.zip
23+
�z�z�t�@�C��: vim80-kaoriya-win32-V.V.V-YYYYMMDD.zip
2424
Vim�v���O�����t�H���_: vim80-kaoriya-win32.zip
2525

2626
64bit��

‎vim‎

Submodule vim updated 99 files

0 commit comments

Comments
 (0)