Merge pull request #7 from koron/release-20160326

Release 20160326

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/vim-jp/autofmt.git
 [submodule "contrib/go-vim"]
 	path = contrib/go-vim
-	url = https://github.com/vim-jp/go-vim.git
+	url = https://github.com/vim-jp/vim-go-extra.git
 [submodule "contrib/lang-ja"]
 	path = contrib/lang-ja
 	url = https://github.com/vim-jp/lang-ja.git

Makefile

@@ -1,9 +1,9 @@
 include VERSION
 
 DISTDIR=dist
-CORE=vim-$(VERSION_VIM)+kaoriya-$(VERSION_KAORIYA)
+CORE=vim-$(VIM_VER)+kaoriya-$(PATCHSET_VER)
 CORE_TARGET=$(DISTDIR)/$(CORE).tar.bz2
-PATCH=vim-kaoriya-patches-$(VERSION_KAORIYA)
+PATCH=vim-kaoriya-patches-$(PATCHSET_VER)
 PATCH_TARGET=$(DISTDIR)/$(PATCH).tar.bz2
 PATCH_TMPDIR=$(PATCH_TARGET:.tar.bz2=)
 

VERSION

@@ -1,2 +1,4 @@
-VERSION_VIM=7.4.1016
-VERSION_KAORIYA=20160101
+VIM_VER		= 7.4.1655
+PATCHSET_VER	= 20160326
+
+# vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make:

build/msvc/11-build-all.bat

@@ -4,9 +4,6 @@ SET DATE_VER=%date:~-10,4%%date:~-5,2%%date:~-2,2%
 SET CURDIR=%~dp0
 SET VIMDIR=%~dp0..\..\vim
 
-SET SNAPZIP_W32=vim74-kaoriya-win32-snapshot-%DATE_VER%.zip
-SET SNAPZIP_W64=vim74-kaoriya-win64-snapshot-%DATE_VER%.zip
-
 REM Apply all patches.
 CD "%VIMDIR%"
 git checkout guilt/master
@@ -19,21 +16,10 @@ 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"
 
-REM Clear previous snapshots.
-RD /S /Q "target\vim74-kaoriya-win32-snapshot"
-RD /S /Q "target\vim74-kaoriya-win64-snapshot"
-DEL /F "target\vim74-kaoriya-win32-snapshot-*.zip"
-DEL /F "target\vim74-kaoriya-win64-snapshot-*.zip"
-
-REM Build releases and snapshots.
-CMD /C "tools\msvc-nmake.bat" x86 build-release-pre snapshot-pre
+REM Build releases.
+CMD /C "tools\msvc-nmake.bat" x86 build-release-pre
 IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE
-CMD /C "tools\msvc-nmake.bat" amd64 build-release-pre snapshot-pre
-IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE
-
-REM Update snapshot information.
-DEL /F "target\latest.json"
-go run genjson.go "target\latest.json" "target\%SNAPZIP_W32%" "vim74w32" "http://files.kaoriya.net/vim/snapshots/%SNAPZIP_W32%" "target\%SNAPZIP_W64%" "vim74w64" "http://files.kaoriya.net/vim/snapshots/%SNAPZIP_W64%"
+CMD /C "tools\msvc-nmake.bat" amd64 build-release-pre
 IF %ERRORLEVEL% NEQ 0 GOTO :FAILURE
 
 REM Build release archives.
@@ -42,7 +28,7 @@ START CMD /C "tools\msvc-nmake.bat" amd64 build-release-core
 
 REM Revert all patches.
 CD "%VIMDIR%"
-git checkout master
+REM git checkout master
 CD "%CURDIR%"
 
 :SUCCESS

build/msvc/12-upload-all.bat

@@ -4,12 +4,9 @@ SET DATE_VER=%date:~-10,4%%date:~-5,2%%date:~-2,2%
 
 SET RELZIP_W32=vim74-kaoriya-win32-%DATE_VER%.zip
 SET RELZIP_W64=vim74-kaoriya-win64-%DATE_VER%.zip
-SET SNAPZIP_W32=vim74-kaoriya-win32-snapshot-%DATE_VER%.zip
-SET SNAPZIP_W64=vim74-kaoriya-win64-snapshot-%DATE_VER%.zip
 
 REM Uplaod release files to server.
 
 ECHO Uploading...
 rsync -v target/%RELZIP_W32% target/%RELZIP_W64% "[email protected]:htdocs/files.kaoriya.net/vim"
-rsync -v target/%SNAPZIP_W32% target/%SNAPZIP_W64% target/latest.json "[email protected]:htdocs/files.kaoriya.net/vim/snapshots"
 PAUSE

build/msvc/Makefile

@@ -23,6 +23,7 @@ GETTEXT_DIR	= $(CONTRIB_DIR)\gettext
 VIMPROC_DIR	= $(CONTRIB_DIR)\vimproc
 VIMPROC_DLL	= vimproc_$(WINDOWS_CPUTYPE).dll
 LUAJIT_DIR	= $(CONTRIB_DIR)\luajit-2.0
+LANGJA_DIR	= $(CONTRIB_DIR)\lang-ja
 VIM_DIR		= ..\..\vim
 VIM_INSTALL_DIR	= $(INSTALL_DIR)\share\vim\runtime
 VIM_PATCH_DIR	= $(INSTALL_DIR)\share\vim\patch
@@ -49,7 +50,7 @@ WINDOWS_CPUTYPE=win32
 !IF "$(_NMAKE_VER)" >= "9." && "$(_NMAKE_VER)" < "@."
 MSVC_VERSION=msvc9
 MSVCRT_SUBDIR=Microsoft.VC90.CRT
-MSVCRT_FILES=msvcr90.dll Microsoft.VC90.CRT.manifest
+MSVCRT_FILES=msvcr90.dll
 !ELSEIF "$(_NMAKE_VER)" >= "10." && "$(_NMAKE_VER)" < "11."
 MSVC_VERSION=msvc10
 MSVCRT_SUBDIR=Microsoft.VC100.CRT
@@ -81,6 +82,7 @@ archive-pre:
 	$(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
 	$(MAKE) vim-clean gvim-clean vim-install
 	$(MAKE) vim-mo-install vim-patch-install
+	$(MAKE) langja-install
 
 contrib: $(INSTALL_DIR)\bin\iconv.dll $(INSTALL_DIR)\bin\intl.dll \
 	$(INSTALL_DIR)\lib\libXpm.lib \
@@ -217,6 +219,28 @@ luajit-clean:
 
 luajit-distclean: luajit-clean
 
+### lang-ja
+
+langja-install:
+	IF NOT EXIST "$(VIM_INSTALL_DIR)" MD "$(VIM_INSTALL_DIR)"
+	IF NOT EXIST "$(VIM_INSTALL_DIR)\lang\ja\LC_MESSAGES" \
+		MD "$(VIM_INSTALL_DIR)\lang\ja\LC_MESSAGES"
+	IF NOT EXIST "$(VIM_INSTALL_DIR)\lang\ja.euc-jp\LC_MESSAGES" \
+		MD "$(VIM_INSTALL_DIR)\lang\ja.euc-jp\LC_MESSAGES"
+	IF NOT EXIST "$(VIM_INSTALL_DIR)\lang\ja.sjis\LC_MESSAGES" \
+		MD "$(VIM_INSTALL_DIR)\lang\ja.sjis\LC_MESSAGES"
+	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
+	-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" 
+	-$(COPY) "runtime\lang" "$(VIM_INSTALL_DIR)\lang" menu_ja*.vim
+	-$(COPY) "runtime\doc" "$(VIM_INSTALL_DIR)\doc" *.UTF-8.1
+	-$(COPY) "runtime\tutor" "$(VIM_INSTALL_DIR)\tutor" tutor.ja.*
+	cd "$(BUILD_DIR)"
+
 ### VIM
 
 vim-build:
@@ -358,6 +382,7 @@ build-release-pre:
 	$(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
 	$(MAKE) vim-clean gvim-clean vim-install
 	$(MAKE) vim-mo-install vim-patch-install
+	$(MAKE) langja-install
 	$(MAKE) build-dist
 
 build-release-core:
@@ -388,6 +413,7 @@ snapshot-archive:
 	xpm-build xpm-install xpm-clean xpm-distclean \
 	vimproc-build vimproc-install vimproc-clean vimproc-distclean \
 	luajit-build luajit-install luajit-clean luajit-distclean \
+	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 \

build/msvc2/.gitignore

@@ -0,0 +1 @@
+/target/