catch up 8.0.0003 to release

Merge remote-tracking branch 'origin/develop'

VERSION

@@ -1,4 +1,6 @@
-VIM_VER		= 7.4.2358
-PATCHSET_VER	= 20160910
+VIM_VER		= 8.0.0003
+PATCHSET_VER	= 20160913
+
+VIM_VER_SHORT	= 80
 
 # vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make:

build/msvc/11-build-all.bat

@@ -1,6 +1,9 @@
 @ECHO OFF
 
-SET DATE_VER=%date:~-10,4%%date:~-5,2%%date:~-2,2%
+FOR /F "usebackq tokens=1,2 delims==	 " %%i IN ("..\..\VERSION") do SET %%i=%%j
+SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
+
 SET CURDIR=%~dp0
 SET VIMDIR=%~dp0..\..\vim
 
@@ -11,10 +14,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE
 CD "%CURDIR%"
 
 REM Clear previous releases.
-RD /S /Q "target\vim74-kaoriya-win32"
-RD /S /Q "target\vim74-kaoriya-win64"
-DEL /F "target\vim74-kaoriya-win32-%DATE_VER%.zip"
-DEL /F "target\vim74-kaoriya-win64-%DATE_VER%.zip"
+RD /S /Q "target\vim%VIM_VER_SHORT%-kaoriya-win32"
+RD /S /Q "target\vim%VIM_VER_SHORT%-kaoriya-win64"
+DEL /F "target\%RELZIP_W32%"
+DEL /F "target\%RELZIP_W64%"
 
 REM Build releases.
 CMD /C "tools\msvc-nmake.bat" x86 build-release-pre

build/msvc/12-upload-all.bat

@@ -1,9 +1,8 @@
 @ECHO OFF
 
 FOR /F "usebackq tokens=1,2 delims==	 " %%i IN ("..\..\VERSION") do SET %%i=%%j
-
-SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
-SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
 
 REM Uplaod release files to server.
 

build/msvc/13-update-canary.bat

@@ -4,10 +4,10 @@ FOR /F "usebackq tokens=1,2 delims==	 " %%i IN ("..\..\VERSION") do SET %%i=%%j
 
 SET REMOTE_HOST=[email protected]
 SET REMOTE_WORKDIR=/home/htdocs/files.kaoriya.net/vim/
-SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
-SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
-SET ABSZIP_W32=vim74-kaoriya-win32-test.zip
-SET ABSZIP_W64=vim74-kaoriya-win64-test.zip
+SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
+SET ABSZIP_W32=vim-kaoriya-win32-canary.zip
+SET ABSZIP_W64=vim-kaoriya-win64-canary.zip
 
 ssh "%REMOTE_HOST%" "cd %REMOTE_WORKDIR%; ln -fv %RELZIP_W32% %ABSZIP_W32%; ln -fv %RELZIP_W64% %ABSZIP_W64%"
 

build/msvc/14-update-develop.bat

@@ -4,10 +4,10 @@ FOR /F "usebackq tokens=1,2 delims==	 " %%i IN ("..\..\VERSION") do SET %%i=%%j
 
 SET REMOTE_HOST=[email protected]
 SET REMOTE_WORKDIR=/home/htdocs/files.kaoriya.net/vim/
-SET RELZIP_W32=vim74-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
-SET RELZIP_W64=vim74-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
-SET ABSZIP_W32=vim74-kaoriya-win32.zip
-SET ABSZIP_W64=vim74-kaoriya-win64.zip
+SET RELZIP_W32=vim%VIM_VER_SHORT%-kaoriya-win32-%VIM_VER%-%PATCHSET_VER%.zip
+SET RELZIP_W64=vim%VIM_VER_SHORT%-kaoriya-win64-%VIM_VER%-%PATCHSET_VER%.zip
+SET ABSZIP_W32=vim-kaoriya-win32-develop.zip
+SET ABSZIP_W64=vim-kaoriya-win64-develop.zip
 
 ssh "%REMOTE_HOST%" "cd %REMOTE_WORKDIR%; ln -fv %RELZIP_W32% %ABSZIP_W32%; ln -fv %RELZIP_W64% %ABSZIP_W64%"
 

build/msvc/Makefile

@@ -8,12 +8,12 @@
 #     DISABLE_LUA=1	Disalbe Lua interfaces
 #     DISABLE_RUBY=1	Disalbe Ruby interfaces
 
-DIST_VER	= 74-kaoriya-$(WINDOWS_CPUTYPE)
-DATE_VER	= %%date:~-10,4%%%%date:~-5,2%%%%date:~-2,2%%
-
 !include ..\..\VERSION
 
-RTDIR_NAME	= vim74
+DIST_VER	= $(VIM_VER_SHORT)-kaoriya-$(WINDOWS_CPUTYPE)
+DATE_VER	= %%date:~-10,4%%%%date:~-5,2%%%%date:~-2,2%%
+
+RTDIR_NAME	= vim$(VIM_VER_SHORT)
 
 BUILD_DIR	= $(MAKEDIR)
 OUTPUT_DIR	= $(MAKEDIR)\target
@@ -387,7 +387,7 @@ archive-dist: build-dist
 
 zip-dist:
 	cd "$(OUTPUT_DIR)"
-	zip -r9q vim$(DIST_VER)-$(VIM_VER)-$(DATE_VER).zip vim$(DIST_VER)
+	zip -r9q vim$(DIST_VER)-$(VIM_VER)-$(PATCHSET_VER).zip vim$(DIST_VER)
 	cd "$(BUILD_DIR)"
 
 clean-dist:
@@ -422,7 +422,7 @@ snapshot-install:
 
 snapshot-archive:
 	cd "$(OUTPUT_DIR)"
-	zip -r9q vim$(DIST_VER)-snapshot-$(DATE_VER).zip vim$(DIST_VER)-snapshot
+	zip -r9q vim$(DIST_VER)-snapshot-$(PATCHSET_VER).zip vim$(DIST_VER)-snapshot
 	cd "$(BUILD_DIR)"
 
 

build/msvc/vim.mak

@@ -50,7 +50,7 @@ LUA= ..\..\build\msvc\target\install-x32\include\lua
 # Ruby‚̐ݒè.
 !if !defined(DISABLE_IF) && !defined(DISABLE_RUBY)
 RUBY_VER=23
-RUBY_VER_LONG=2.3.0
+RUBY_API_VER_LONG=2.3.0
 DYNAMIC_RUBY=yes
 !if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
 RUBY = D:\Ruby\ruby-2.3.1-x64-mswin64

kaoriya/doc/CHANGES.md

@@ -0,0 +1,9 @@
+## 2016/09/13 の変更点
+
+*   ベースコードを8.0.0003に更新しました
+*   contrib 更新
+    *   lang-ja (2016-09-13 57db842)
+    *   vimdoc-ja (2016-09-12 da005d9)
+*   過去の変更点(CHANGES.txt)を移動しました
+
+    <https://github.com/koron/vim-kaoriya/tree/master/old/CHANGES-7.txt>

kaoriya/doc/README.txt

@@ -1,9 +1,9 @@
-                   Vim version 7.4 ���艮�� �����}�j���A��
+                   Vim version 8.0 ���艮�� �����}�j���A��
 
-                                                         Version: 1.8.1
+                                                         Version: 1.9.0
                                                           Author: MURAOKA Taro
                                                            Since: 23-Aug-1999
-                                                     Last Change: 04-Sep-2016.
+                                                     Last Change: 12-Sep-2016.
 
 �T�v
   Vim��vi�N���[���ɕ��ނ����e�L�X�g�G�f�B�^�ł��B
@@ -20,12 +20,12 @@
   ����̂ŁA�𓀂��ăV�X�e�����̍D���ȏꏊ�ɔz�u���Ă��������B
 
   32bit��
-    �z�z�t�@�C��: vim74-kaoriya-win32-V.V.VVV-YYYYMMDD.zip
-    Vim�v���O�����t�H���_: vim74-kaoriya-win32.zip
+    �z�z�t�@�C��: vim80-kaoriya-win32-V.V.VVV-YYYYMMDD.zip
+    Vim�v���O�����t�H���_: vim80-kaoriya-win32.zip
 
   64bit��
-    �z�z�t�@�C��: vim74-kaoriya-win64-V.V.V-YYYYMMDD.zip
-    Vim�v���O�����t�H���_: vim74-kaoriya-win64
+    �z�z�t�@�C��: vim80-kaoriya-win64-V.V.V-YYYYMMDD.zip
+    Vim�v���O�����t�H���_: vim80-kaoriya-win64
 
   ��L��V.V.V�ɂ̓x�[�X�ƂȂ���Vim�̃o�[�W�������p�b�`�ԍ��܂Ŋ܂߂ē���܂��B
   ��L��YYYYMMDD�ɂ̓����[�X�̔N����������܂��B
@@ -217,10 +217,12 @@ Vim
       https://github.com/vim-jp/issues/issues (�o�O�񍐁A�@�\�v�])
   - vim_jp Google �O���[�v
       http://groups.google.com/group/vim_jp/?hl=ja
-  - Vim�h�L�������g�|��(vimdoc-ja)
+  - ���{��h�L�������g
       https://github.com/vim-jp/vimdoc-ja/
+      https://github.com/vim-jp/vimdoc-ja-working/
+      https://github.com/vim-jp/lang-ja/
   - ���艮�Ń����e�i
-      http://www.kaoriya.net/software/vim
+      https://github.com/koron/vim-kaoriya/
       MURAOKA Taro <[email protected]>
       Twitter @kaoriya