Skip to content

Commit

Permalink
Merge pull request #6 from koron/release-20160305
Browse files Browse the repository at this point in the history
Release 20160305
  • Loading branch information
koron committed Mar 5, 2016
2 parents 48a75dc + 38b8362 commit 3155f77
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 21 deletions.
4 changes: 4 additions & 0 deletions build/msvc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ vim-build:
vim-clean:
cd "$(VIM_DIR)\src"
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak clean
- if exist vim.lib del vim.lib
cd "$(BUILD_DIR)"

vimd-build:
Expand All @@ -237,6 +238,7 @@ vimd-build:
vimd-clean:
cd "$(VIM_DIR)\src"
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak DEBUG=yes clean
- if exist vimd.lib del vimd.lib
cd "$(BUILD_DIR)"

gvim-build:
Expand All @@ -247,6 +249,7 @@ gvim-build:
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:
Expand All @@ -257,6 +260,7 @@ gvimd-build:
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
Expand Down
24 changes: 12 additions & 12 deletions build/msvc/vim.mak
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ DIRECTX=yes
# Perl settings
!if !defined(DISABLE_IF) && !defined(DISABLE_PERL)
DYNAMIC_PERL=yes
PERL_VER=520
PERL_VER=522
!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
PERL = D:\Perl\Perl-5.20.1-64
PERL = D:\Perl\Perl-5.22.1-64
!else
PERL = D:\Perl\Perl-5.20.1-32
PERL = D:\Perl\Perl-5.22.1-32
!endif
!endif

Expand All @@ -26,13 +26,13 @@ PERL = D:\Perl\Perl-5.20.1-32
DYNAMIC_PYTHON=yes
PYTHON_VER=27
DYNAMIC_PYTHON3=yes
PYTHON3_VER=34
PYTHON3_VER=35
!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
PYTHON = D:\Python\Python27
PYTHON3 = D:\Python\Python34
PYTHON3 = D:\Python\Python35
!else
PYTHON = D:\Python\Python27-x86
PYTHON3 = D:\Python\Python34-x86
PYTHON3 = D:\Python\Python35-32
!endif
!endif

Expand All @@ -49,17 +49,17 @@ LUA= ..\..\build\msvc\target\install-x32\include\lua

# Ruby‚̐ݒè.
!if !defined(DISABLE_IF) && !defined(DISABLE_RUBY)
RUBY_VER=20
RUBY_VER_LONG=2.0.0
RUBY_VER=22
RUBY_VER_LONG=2.2.0
DYNAMIC_RUBY=yes
!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
RUBY = D:\Ruby\ruby-2.0.0-p451-x64-mswin64
RUBY = D:\Ruby\ruby-2.2.4-x64-mswin64
RUBY_PLATFORM=x64-mswin64_100
RUBY_INSTALL_NAME=x64-msvcrt-ruby200
RUBY_INSTALL_NAME=x64-msvcrt-ruby220
!else
RUBY = D:\Ruby\ruby-2.0.0-p451-i386-mswin32
RUBY = D:\Ruby\ruby-2.2.4-i386-mswin32
RUBY_PLATFORM=i386-mswin32_100
RUBY_INSTALL_NAME=msvcrt-ruby200
RUBY_INSTALL_NAME=msvcrt-ruby220
!endif
!endif

Expand Down
2 changes: 1 addition & 1 deletion contrib/lang-ja
2 changes: 1 addition & 1 deletion contrib/luajit-2.0
Submodule luajit-2.0 updated from 18f6aa to 3e4a19
2 changes: 1 addition & 1 deletion contrib/vimproc
15 changes: 14 additions & 1 deletion kaoriya/doc/CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
=== 201602XX�̕ύX�_ ===
=== 20160305�̕ύX�_ ===

* �x�[�X�R�[�h��7.4.1490�ɍX�V���܂���
* �R���p�C�����Ɏg�p����Perl��5.22.1�ɃA�b�v�f�[�g���܂���
* �R���p�C�����Ɏg�p����Python���A�b�v�f�[�g���܂���
* 3.X: 3.5.1
* 2.X: 2.7.11
* �R���p�C�����Ɏg�p����Ruby��2.2.4�ɃA�b�v�f�[�g���܂���
* contrib �X�V
* lang-ja (2016-03-04 3085219)
* LuaJIT (2016-03-03 3e4a196)
* vimproc (2016-03-04 4eb5ad8)

=== 20160228�̕ύX�_ ===

* �x�[�X�R�[�h��7.4.1444�ɍX�V���܂���
* contrib �X�V
Expand Down
18 changes: 14 additions & 4 deletions kaoriya/doc/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Version: 1.8
Author: MURAOKA Taro
Since: 23-Aug-1999
Last Change: 30-Aug-2015.
Last Change: 29-Feb-2016.

�T�v
Vim��vi�N���[���ɕ��ނ����e�L�X�g�G�f�B�^�ł��B
Expand Down Expand Up @@ -71,7 +71,7 @@ Vim
Perl(ActivePerl)�Ƃ̘A�g
����: Perl���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B

ActiveState�Ђɂ����J����Ă���ActivePerl 5.20���C���X�g�[�����邱�ƂŁA
ActiveState�Ђɂ����J����Ă���ActivePerl 5.22���C���X�g�[�����邱�ƂŁA
Perl�C���^�[�t�F�[�X���g�p���邱�Ƃ��ł��܂��BActivePerl���C���X�g�[������
���Ȃ��ꍇ�́APerl�C���^�[�t�F�[�X�͎����I�ɖ����ƂȂ�܂��BPerl�C���^�[
�t�F�[�X�̏ڍׂɂ‚��Ă�":help perl"�Ƃ���Vim�t���̃}�j���A�����Q�Ƃ��Ă�
Expand All @@ -98,10 +98,20 @@ Vim
- Python.org
http://www.python.org/

Python 2.7.11 �𗘗p����ꍇ�ɂ́APython 2.7.11�̃o�O��������邽�߂ɁA��
���҂Ƃ��Ĉȉ��̃R�}���h�����s����K�v������܂��B

- 32�r�b�g��
reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:32
- 64�r�b�g��
reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:64

�Q��: https://github.com/vim-jp/issues/issues/843#issuecomment-189205350

Python3�Ƃ̘A�g
����: Python3���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B

Python.org�ɂ����J����Ă���Python 3.4���C���X�g�[�����邱�ƂŁAPython�C
Python.org�ɂ����J����Ă���Python 3.5���C���X�g�[�����邱�ƂŁAPython�C
���^�[�t�F�[�X���g�p���邱�Ƃ��ł��܂��BPython���C���X�g�[�����Ă��Ȃ��ꍇ
�́APython�C���^�[�t�F�[�X�͎����I�ɖ����ƂȂ�܂��BPython�C���^�[�t�F�[�X
�̏ڍׂɂ‚��Ă�":help python3"�Ƃ���Vim�t���̃}�j���A�����Q�Ƃ��Ă�����
Expand All @@ -116,7 +126,7 @@ Vim
Ruby�Ƃ̘A�g
����: Ruby���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B

Ruby 2.0.0���C���X�g�[�������Ruby�C���^�[�t�F�[�X�𗘗p�ł��܂��BRuby���C
Ruby 2.2.4���C���X�g�[�������Ruby�C���^�[�t�F�[�X�𗘗p�ł��܂��BRuby���C
���X�g�[�����Ă��Ȃ��ꍇ��Ruby�C���^�[�t�F�[�X�͎����I�ɖ����ƂȂ�܂��B
Ruby�C���^�[�t�F�[�X�̏ڍׂɂ‚��Ă�":help ruby"�Ƃ���Vim�t���̃}�j���A��
���Q�Ƃ��Ă��������B
Expand Down

0 comments on commit 3155f77

Please sign in to comment.