From 4d34632f66b40177ddd7ae8b01a318c2bfbb3f7c Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 23 Sep 2018 21:36:35 +0900 Subject: [PATCH 01/17] update libiconv --- contrib/libiconv2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libiconv2 b/contrib/libiconv2 index fee4fae..75b9036 160000 --- a/contrib/libiconv2 +++ b/contrib/libiconv2 @@ -1 +1 @@ -Subproject commit fee4fae939dc1defbbc5edd144ed29a5cf5fd1c6 +Subproject commit 75b9036207274e0ece31b298503f63749a25debc From ed1e967497badb72838daded1b800cdb8c91711e Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 23 Sep 2018 21:37:53 +0900 Subject: [PATCH 02/17] add Win32.mak copy --- build/msvc/include/Win32.Mak | 671 +++++++++++++++++++++++++++++++++++ 1 file changed, 671 insertions(+) create mode 100644 build/msvc/include/Win32.Mak diff --git a/build/msvc/include/Win32.Mak b/build/msvc/include/Win32.Mak new file mode 100644 index 0000000..2b47bec --- /dev/null +++ b/build/msvc/include/Win32.Mak @@ -0,0 +1,671 @@ +# Win32.Mak - Win32 application master NMAKE definitions file for the +# Microsoft Windows SDK programming samples +# Copyright (C) Microsoft Corporation +# ------------------------------------------------------------------------- +# This files should be included at the top of all MAKEFILEs as follows: +# !include +# ------------------------------------------------------------------------- +# +# Define APPVER = [ 4.0 | 5.0 | 5.01 | 5.02 | 6.0 | 6.1] prior to including win32.mak to get +# build time checking for version dependencies and to mark the executable +# with version information. +# +# Define TARGETOS = [ WIN95 | WINNT | BOTH ] prior to including win32.mak +# to get some build time checking for platform dependencies. +# +# Define TARGETLANG = [ LANG_JAPANESE | LANG_CHINESE | LANG_KOREAN ] prior +# to including win32.mak to getcompile & link flags for building +# applications to run on Far-East Windows. (This is an optional parameter. +# The system locale is the default.) +# +# Define _WIN32_IE = [ 0x0300 | 0x0400 | 0x0500 | 0x0600 | 0x0700 | 0x0800] prior to including win32.mak to +# get compile and link flags for building applications and components to +# run on Internet Explorer. (This is an optional parameter. IE 4.0 is +# the default.) +# +# ------------------------------------------------------------------------- +# NMAKE Options +# +# Use the table below to determine the additional options for NMAKE to +# generate various application debugging, profiling and performance tuning +# information. +# +# Application Information Type Invoke NMAKE +# ---------------------------- ------------ +# For No Debugging Info nmake nodebug=1 +# For Working Set Tuner Info nmake tune=1 +# For Call Attributed Profiling Info nmake profile=1 +# +# Note: The three options above are mutually exclusive (you may use only +# one to compile/link the application). +# +# Note: creating the environment variables NODEBUG, TUNE, and PROFILE is an +# alternate method to setting these options via the nmake command line. +# +# Note: TUNE and PROFILE do nothing for 64bit compilation +# +# Additional NMAKE Options Invoke NMAKE +# ---------------------------- ------------ +# For No ANSI NULL Compliance nmake no_ansi=1 +# (ANSI NULL is defined as PVOID 0) +# +# ========================================================================= +# Build Rules Quick Start +# +# To build one of the following types of executables, use the specified +# compiler and linker command-line options. +# +# --------------------------------------------------------------------------- +# To build: | Compiler Options | Linker options (pick one +# | | line. con = console, +# | | gui = GUI, ole = GUI OLE) +# --------------------------------------------------------------------------- +# Single threaded | cdebug cflags cvars | ldebug guilflags guilibs +# app with static | | ldebug conlflags conlibs +# CRT | | ldebug guilflags olelibs +# --------------------------------------------------------------------------- +# Multithreaded app | cdebug cflags cvarsmt | ldebug guilflags guilibsmt +# with static CRT | | ldebug conlflags conlibsmt +# | | ldebug guilflags olelibsmt +# --------------------------------------------------------------------------- +# Single or multi- | cdebug cflags cvarsdll | ldebug guilflags guilibsdll +# threaded app with | | ldebug conlflags conlibsdll +# DLL version of CRT | | ldebug guilflags olelibsdll +# (MSVCRT.DLL) | | +# --------------------------------------------------------------------------- +# DLL with static | cdebug cflags cvarsmt | ldebug dlllflags guilibsmt +# CRT* | | ldebug dlllflags conlibsmt +# | | ldebug dlllflags olelibsmt +# --------------------------------------------------------------------------- +# DLL with DLL | cdebug cflags cvarsdll | ldebug dlllflags guilibsdll +# version of CRT | | ldebug dlllflags conlibsdll +# (MSVCRT.DLL) | | ldebug dlllflags olelibsdll +# --------------------------------------------------------------------------- +# +# * Always make DLLs multithreaded because a DLL has no way to know whether +# the calling application has multiple threads, and has no way to prevent +# multithreaded apps from loading it. +# +# To specify an Intel x86 build that defaults to stdcall, add scall to the +# list of compiler options. +# +# ========================================================================= + +!IFNDEF _WIN32_MAK_ +_WIN32_MAK_ = 1 + +# ------------------------------------------------------------------------- +# Get CPU Type - exit if CPU environment variable is not defined +# ------------------------------------------------------------------------- + +# Win95 does not define PROCESSOR_ARCHITECTURE - default to i386 + +!IF "$(PROCESSOR_ARCHITECTURE)" == "" +CPU=i386 +PROCESSOR_ARCHITECTURE=x86 +!endif + +!IF !DEFINED(CPU) || "$(CPU)" == "" +CPU = $(PROCESSOR_ARCHITECTURE) +!ENDIF # CPU + +# if PROCESSOR_ARCHITECTURE was x86 or X86 change CPU to i386 + +!IF ( "$(CPU)" == "X86" ) || ( "$(CPU)" == "x86" ) +CPU = i386 +!ENDIF # CPU == X86 + +!IF "$(CPU)" != "i386" +!IF "$(CPU)" != "IA64" +!IF "$(CPU)" != "AMD64" +!ERROR Must specify CPU environment variable ( CPU=i386, CPU=IA64, CPU=AMD64) +!ENDIF +!ENDIF +!ENDIF + + +# ------------------------------------------------------------------------- +# Get Target Operating System - Default to WINNT +# ------------------------------------------------------------------------- +!IFNDEF TARGETOS +TARGETOS = WINNT +!ENDIF + +!IF "$(TARGETOS)" != "WINNT" +!IF "$(TARGETOS)" != "WIN95" +!IF "$(TARGETOS)" != "BOTH" +!ERROR Must specify TARGETOS environment variable (BOTH, WIN95, WINNT) +!ENDIF +!ENDIF +!ENDIF + +# default to APPVER of 5.0 + +!IFNDEF APPVER +APPVER = 5.0 +!ENDIF + +!IF "$(APPVER)" != "6.1" +!IF "$(APPVER)" != "6.0" +!IF "$(APPVER)" != "5.02" +!IF "$(APPVER)" != "5.01" +!IF "$(APPVER)" != "5.0" +!IF "$(APPVER)" != "4.0" +!ERROR Must specify APPVER environment variable (4.0, 5.0, 5.01, 5.02, 6.0, 6.1) +!ENDIF +!ENDIF +!ENDIF +!ENDIF +!ENDIF +!ENDIF + +!IF "$(APPVER)" =="6.1" +!IFNDEF _WIN32_IE +_WIN32_IE = 0x0800 +!ENDIF # _WIN32_IE +!ENDIF # APPVER == 6.1 + +!IF "$(APPVER)" =="6.0" +!IFNDEF _WIN32_IE +_WIN32_IE = 0x0700 +!ENDIF # _WIN32_IE +!ENDIF # APPVER == 6.0 + +!IF "$(APPVER)" =="5.0" +!IFNDEF _WIN32_IE +_WIN32_IE = 0x0500 +!ENDIF # _WIN32_IE +!ENDIF # APPVER == 5.0 + +!IF "$(APPVER)" =="5.01" +!IFNDEF _WIN32_IE +_WIN32_IE = 0x0600 +!ENDIF # _WIN32_IE +!ENDIF # APPVER == 5.01 + +!IF "$(APPVER)" =="5.02" +!IFNDEF _WIN32_IE +_WIN32_IE = 0x0600 +!ENDIF # _WIN32_IE +!ENDIF # APPVER == 5.02 + +!IFNDEF _WIN32_IE +_WIN32_IE = 0x0400 +!ENDIF + +# ------------------------------------------------------------------------- +# Build tool declarations common to all platforms +# Check to see if Cole Porter is used, otherwise use C/C++ compiler +# ------------------------------------------------------------------------- + +cc = cl +link = link +implib = lib + +midl = midl +rc = Rc +hc = Start /Wait Hcrtf +mc = Mc + +hcvars = -xn + +# ------------------------------------------------------------------------- +# Platform Dependent Compile Flags - must be specified after $(cc) +# +# Note: Debug switches are on by default for current release +# +# These switches set code generation and debugging options for the compiler. +# They also set macros used for conditional compilation. +# +# The debugging switches allow for source level debugging with WinDebug or +# Microsoft Visual C++. +# +# Common compiler flags: +# -c - compile without linking +# -W3 - Set warning level to level 3 (-W4 for 64-bit compilations) +# -Zi - generate debugging information +# -Od - disable all optimizations +# -Ox - use maximum optimizations +# -Zd - generate only public symbols and line numbers for debugging +# -GS - enable security checks +# +# i386 specific compiler flags: +# -Gz - stdcall (only if scall is added to makefile's compiler build rules) +# +# ------------------------------------------------------------------------- + +# declarations common to all compiler options +ccommon = -c -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -GS + +# for compatibility with old source code, map {try, except, leave, finally} +# to their proper names (i.e. prefaced by "__") +!IFDEF SEHMAP +ccommon = $(ccommon) -FIsehmap.h +!ENDIF + +!IF "$(TARGETLANG)" == "LANG_JAPANESE" +ccommon = $(ccommon) -DJAPAN -DDBCS -DFE_IME +!ENDIF + +!IF "$(TARGETLANG)" == "LANG_CHINESE" +ccommon = $(ccommon) -DDBCS -DFE_IME +!ENDIF + +!IF "$(TARGETLANG)" == "LANG_KOREAN" +ccommon = $(ccommon) -DDBCS -DFE_IME +!ENDIF + +!IF "$(CPU)" == "i386" +cflags = $(ccommon) -D_X86_=1 -DWIN32 -D_WIN32 -W3 +scall = -Gz + +!ELSEIF "$(CPU)" == "IA64" +cflags = $(ccommon) -D_IA64_=1 -DWIN64 -D_WIN64 -DWIN32 -D_WIN32 +cflags = $(cflags) -W4 +scall = + +!ELSEIF "$(CPU)" == "AMD64" +cflags = $(ccommon) -D_AMD64_=1 -DWIN64 -D_WIN64 -DWIN32 -D_WIN32 +cflags = $(cflags) -W4 +scall = + +!ENDIF + + +!IF "$(APPVER)" == "4.0" +NMAKE_WINVER = 0x0400 +!ELSEIF "$(APPVER)" == "5.0" +NMAKE_WINVER = 0x0500 +!ELSEIF "$(APPVER)" == "5.01" +NMAKE_WINVER = 0x0501 +!ELSEIF "$(APPVER)" == "5.02" +NMAKE_WINVER = 0x0502 +!ELSEIF "$(APPVER)" == "6.0" +NMAKE_WINVER = 0x0600 +!ELSEIF "$(APPVER)" == "6.1" +NMAKE_WINVER = 0x0601 +!ENDIF + +!IF "$(TARGETOS)" == "WINNT" +cflags = $(cflags) -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DNTDDI_VERSION=$(NMAKE_WINVER)0000 +!ENDIF + +!IF "$(TARGETOS)" == "WIN95" +cflags = $(cflags) -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) /D_WIN32_DCOM +!ENDIF + +# regardless of the TARGET OS, define compile time WINVER to match APPVER macro +cflags = $(cflags) -D_WIN32_IE=$(_WIN32_IE) -DWINVER=$(NMAKE_WINVER) + + +# Set debugging options + +!IF "$(CPU)" != "IA64" +!IFDEF NODEBUG +cdebug = -Ox -DNDEBUG +!ELSE IFDEF PROFILE +cdebug = -Gh -Ox -DNDEBUG +!ELSE IFDEF TUNE +cdebug = -Gh -Ox -DNDEBUG +!ELSE +cdebug = -Zi -Od -DDEBUG +!ENDIF + +!ELSE + +!IFDEF NODEBUG +cdebug = -Ox -DNDEBUG +!ELSE +cdebug = -Zi -Od -DDEBUG +!ENDIF + +!ENDIF + +# ------------------------------------------------------------------------- +# Target Module & Subsystem Dependent Compile Defined Variables - must be +# specified after $(cc) +# +# The following table indicates the various acceptable combinations of +# the C Run-Time libraries LIBC, LIBCMT, and MSVCRT respect to the creation +# of a EXE and/or DLL target object. The appropriate compiler flag macros +# that should be used for each combination are also listed. +# +# Executable Type C Runtime Lib Compiler switch +# ------------------------------------------------------------- +# Single threaded app static CRT CVARS * +# Single-threaded app DLL CRT CVARSDLL +# Multi-threaded app static CRT CVARSMT * +# Multi-threaded app DLL CRT CVARSDLL * +# +# Single threaded DLL static CRT CVARS +# Single-threaded DLL DLL CRT CVARSDLL +# Multi-threaded DLL static CRT CVARSMT * +# Multi-threaded DLL DLL CRT CVARSDLL * +# +# * - Denotes the Recommended Configuration +# +# When building single-threaded applications you can link your executable +# with either LIBC, LIBCMT, or MSVCRT, although LIBC will provide the best +# performance. +# +# When building multi-threaded applications, either LIBCMT or MSVCRT can +# be used as the C-Runtime library, as both are multi-thread safe. +# +# Note: Any executable which accesses a DLL linked with MSVCRT.LIB must +# also link with MSVCRT.LIB instead of LIBC.LIB or LIBCMT.LIB. +# When using DLLs, it is recommended that all of the modules be +# linked with MSVCRT.LIB. +# +# Note: The macros of the form xDLL are used when linking the object with +# the DLL version of the C Run-Time (that is, MSVCRT.LIB). They are +# not used when the target object is itself a DLL. +# +# ------------------------------------------------------------------------- + +!IFDEF NO_ANSI +noansi = -DNULL=0 +!ENDIF + + +# for Windows applications that use the C Run-Time libraries +!IFDEF NODEBUG +cvarsmt = $(noansi) -D_MT -MT +cvars = $(cvarsmt) +cvarsdll = $(noansi) -D_MT -D_DLL -MD +!ELSE +cvarsmt = $(noansi) -D_MT -MTd +cvars = $(cvarsmt) +cvarsdll = $(noansi) -D_MT -D_DLL -MDd +!ENDIF + + +# for compatibility with older-style makefiles +cvarsmtdll = $(cvarsdll) + +# for POSIX applications +psxvars = -D_POSIX_ + +# resource compiler +rcflags = /r +!ifdef NODEBUG +rcvars = -DWIN32 -D_WIN32 -DWINVER=$(NMAKE_WINVER) $(noansi) +!else +rcvars = -DWIN32 -D_WIN32 -DWINVER=$(NMAKE_WINVER) -DDEBUG -D_DEBUG $(noansi) +!endif + + +!IF "$(TARGETLANG)" == "LANG_JAPANESE" +rcflags = $(rcflags) /c932 +rcvars = $(rcvars) -DJAPAN -DDBCS -DFE_IME +!ENDIF + +!IF "$(TARGETLANG)" == "LANG_CHINESE" +rcvars = $(rcvars) -DDBCS -DFE_IME +!ENDIF + +!IF "$(TARGETLANG)" == "LANG_KOREAN" +rcvars = $(rcvars) -DDBCS -DFE_IME +!ENDIF + + +# ------------------------------------------------------------------------- +# Platform Dependent MIDL Flags - must be specified after midl +# +# +# ------------------------------------------------------------------------- +!IF "$(TARGETOS)" == "WIN95" +MIDL_OPTIMIZATION=-target NT40 +!ELSEIF "$(TARGETOS)" == "WINNT" +!IF "$(APPVER)" == "5.0" +MIDL_OPTIMIZATION=-target NT50 +!ELSEIF "$(APPVER)" == "6.0" +MIDL_OPTIMIZATION=-target NT60 +!ELSEIF "$(APPVER)" == "6.1" +MIDL_OPTIMIZATION=-target NT61 +!ELSEIF "$(APPVER)" == "5.01" +MIDL_OPTIMIZATION=-target NT51 +!ELSEIF "$(APPVER)" == "5.02" +MIDL_OPTIMIZATION=-target NT51 +!ELSEIF "$(APPVER)" == "4.0" +MIDL_OPTIMIZATION=-target NT40 +!ENDIF +!ENDIF + +!IF "$(CPU)" == "IA64" +MIDL_OPTIMIZATION = $(MIDL_OPTIMIZATION) /ia64 +!ELSEIF "$(CPU)" == "AMD64" +MIDL_OPTIMIZATION = $(MIDL_OPTIMIZATION) /x64 +!ELSE +MIDL_OPTIMIZATION = $(MIDL_OPTIMIZATION) /win32 +!ENDIF + +!IF ("$(TARGETOS)" == "WINNT" ) && ("$(APPVER)" != "4.0") +MIDL_OPTIMIZATION = $(MIDL_OPTIMIZATION) /robust +!ENDIF + + + +# ------------------------------------------------------------------------- +# Platform Dependent Link Flags - must be specified after $(link) +# +# Note: $(DLLENTRY) should be appended to each -entry: flag on the link +# line. +# +# Note: When creating a DLL that uses C Run-Time functions it is +# recommended to include the entry point function of the name DllMain +# in the DLL's source code. Also, the MAKEFILE should include the +# -entry:_DllMainCRTStartup$(DLLENTRY) option for the creation of +# this DLL. (The C Run-Time entry point _DllMainCRTStartup in turn +# calls the DLL defined DllMain entry point.) +# +# ------------------------------------------------------------------------- + +# declarations common to all linker options +lflags = $(lflags) /INCREMENTAL:NO /NOLOGO + +# declarations for use on Intel x86 systems +!IF "$(CPU)" == "i386" +DLLENTRY = @12 +!ENDIF + +# declarations for use on Intel Architecture 64-bit systems +!IF "$(CPU)" == "IA64" +DLLENTRY = +!ENDIF + +# declarations for use on AMD64 systems +!IF "$(CPU)" == "AMD64" +DLLENTRY = +!ENDIF + + +# ------------------------------------------------------------------------- +# Target Module Dependent Link Debug Flags - must be specified after $(link) +# +# These switches allow the inclusion of the necessary symbolic information +# for source level debugging with WinDebug, profiling and/or performance +# tuning. +# +# Note: Debug switches are on by default. +# ------------------------------------------------------------------------- + +!IF "$(CPU)" == "i386" + +!IFDEF NODEBUG +ldebug = /RELEASE +!ELSE +ldebug = /DEBUG /DEBUGTYPE:cv +!ENDIF + +!ELSE + +!IFDEF NODEBUG +ldebug = /RELEASE +!ELSE IFDEF PROFILE +ldebug = /DEBUG:mapped,partial /DEBUGTYPE:coff +!ELSE IFDEF TUNE +ldebug = /DEBUG:mapped,partial /DEBUGTYPE:coff +!ELSE +ldebug = /DEBUG /DEBUGTYPE:cv +!ENDIF + +!ENDIF + +# for compatibility with older-style makefiles +linkdebug = $(ldebug) + + +# ------------------------------------------------------------------------- +# Subsystem Dependent Link Flags - must be specified after $(link) +# +# These switches allow for source level debugging with WinDebug for local +# and global variables. They also provide the standard application type and +# entry point declarations. +# +# Note that on x86 screensavers have a WinMain entrypoint, but on RISC +# platforms it is main. This is a Win95 compatibility issue. +# +# ------------------------------------------------------------------------- + +# Windows 98 needs subsystem version set to 4.10 for version 5.0 features. +!IF ("$(APPVER)" == "5.0") && (("$(TARGETOS)" == "BOTH") || ("$(TARGETOS)" == "WIN95")) +EXEVER = 4.10 +!ELSE +EXEVER = $(APPVER) +!ENDIF + + +# --------------------------------------------- + +# for Windows applications +conlflags = $(lflags) -subsystem:console,$(EXEVER) +guilflags = $(lflags) -subsystem:windows,$(EXEVER) +dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll + +# For screen savers +!IF "$(CPU)" == "i386" +savlflags = $(lflags) -subsystem:windows,$(EXEVER) -entry:WinMainCRTStartup +!ELSE +savlflags = $(lflags) -subsystem:windows,$(EXEVER) -entry:mainCRTStartup +!ENDIF + +# for POSIX applications +psxlflags = $(lflags) -subsystem:posix -entry:__PosixProcessStartup + +# for compatibility with older-style makefiles +conflags = $(conlflags) +guiflags = $(guilflags) +psxflags = $(psxlflags) + +# ------------------------------------------------------------------------- +# C Run-Time Target Module Dependent Link Libraries +# +# Note: For POSIX applications, link with $(psxlibs). +# ------------------------------------------------------------------------- + +# for POSIX applications +psxlibs = libcpsx.lib psxdll.lib psxrtl.lib oldnames.lib + + +# optional profiling and tuning libraries +!IF "$(CPU)" != "IA64" + +!IFDEF PROFILE +optlibs = cap.lib +!ELSE IFDEF TUNE +optlibs = wst.lib +!ELSE +optlibs = +!ENDIF + +!ELSE +optlibs = +!ENDIF + +# if building for basic Windows 95, use WinSock1, else use WinSock2 +!IF "$(TARGETOS)" == "WIN95" +!IF "$(APPVER)" == "4.0" +winsocklibs = wsock32.lib +!ELSE +winsocklibs = ws2_32.lib mswsock.lib +!ENDIF +!ELSE +winsocklibs = ws2_32.lib mswsock.lib +!ENDIF + + +# basic subsystem specific libraries, less the C Run-Time +baselibs = kernel32.lib $(optlibs) $(winsocklibs) advapi32.lib +winlibs = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib + +# for Windows applications that use the C Run-Time libraries +conlibs = $(baselibs) +guilibs = $(winlibs) + +# for OLE applications +olelibs = ole32.lib uuid.lib oleaut32.lib $(guilibs) + +#for backwards compatibility +conlibsmt = $(conlibs) +conlibsdll = $(conlibs) +guilibsmt = $(guilibs) +guilibsdll = $(guilibs) +olelibsmt = $(olelibs) +olelibsdll = $(olelibs) + +# for backward compatibility +ole2libs = $(olelibs) +ole2libsmt = $(olelibsmt) +ole2libsdll = $(olelibsdll) + +# Visual Basic +bc = vb6 +bc_exe = /Make +bc_dll = /Makedll + +# Set the Output Directory +!IF ("$(APPVER)" == "6.1") +OUTDIR=WIN7 +!ELSEIF ("$(APPVER)" == "6.0") +OUTDIR=Vista +!ELSEIF "$(APPVER)" == "5.0" +OUTDIR=WIN2000 +!ELSEIF "$(APPVER)" == "5.01" +OUTDIR=XP32 +!ELSEIF "$(APPVER)" == "5.02" +OUTDIR=SRV2003 +!ELSEIF "$(APPVER)" == "4.0" +OUTDIR=NT4 +!ENDIF + +!IF "$(CPU)" == "AMD64" +OUTDIR=$(OUTDIR)_X64 +!ELSEIF "$(CPU)" == "IA64" +OUTDIR=$(OUTDIR)_64 +!ENDIF + +#set Prerelease Out directories +!IF "$(SDKPRERELEASE)" == "1" +OUTDIR=PRE_$(OUTDIR) +!ENDIF + +#Set DEBUG +!IF "$(NODEBUG)" == "" +OUTDIR=$(OUTDIR)_DEBUG +!ELSE +OUTDIR=$(OUTDIR)_RETAIL +!ENDIF + +!IF "$(OS)" == "Windows_NT" +CLEANUP=if exist $(OUTDIR)/$(NULL) rd /s /q $(OUTDIR) +!ELSE +CLEANUP=deltree /y $(OUTDIR) +!ENDIF + +VC6MSG=This sample only compiles with Microsoft Visual C++ 6.0. \ + To compile this run vcvars32.bat for Visual C++ 6.0, and setenv.bat in $(MSSDK). + +WIN64MSG=This sample is currently not supported on the 64 bit platform. + +#ENDIF _WIN32_MAK_ +!ENDIF From 5a83538bc7f0c1b9cec5b437b7b9f8e3a71d3d5d Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 12 Mar 2019 23:32:44 +0900 Subject: [PATCH 03/17] catch up vim 8.1.0796 --- patches | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches b/patches index 2633bf2..1979033 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit 2633bf2822d841fd7b63c53de59c92f89f770315 +Subproject commit 1979033c1d57d77dd0abaf0b9d248be2df94b1ba diff --git a/vim b/vim index d19b234..31faed6 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit d19b234154476401a6ad8e690f9705419095f44e +Subproject commit 31faed60bfd54ff8f612f6b311a6cbcd9e7ebedd From c7ebeadd14aa9bdc3625f87ed5e2186db492ccf4 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 13 Mar 2019 00:22:06 +0900 Subject: [PATCH 04/17] catch up vim 8.1.1005 * update patches * update contributes * update documents --- contrib/autofmt | 2 +- contrib/lang-ja | 2 +- contrib/luajit-2.0 | 2 +- contrib/vimdoc-ja | 2 +- contrib/vimproc | 2 +- kaoriya/doc/CHANGES.md | 10 ++++++++++ kaoriya/doc/README.txt | 31 ++++++++++++++++--------------- patches | 2 +- vim | 2 +- 9 files changed, 33 insertions(+), 22 deletions(-) diff --git a/contrib/autofmt b/contrib/autofmt index 99f2b50..641529c 160000 --- a/contrib/autofmt +++ b/contrib/autofmt @@ -1 +1 @@ -Subproject commit 99f2b50c00c48d2b585d56e30d77e87097b067cc +Subproject commit 641529c17265bc5b17db595b17b42401b9daa742 diff --git a/contrib/lang-ja b/contrib/lang-ja index ed89d1d..76e8776 160000 --- a/contrib/lang-ja +++ b/contrib/lang-ja @@ -1 +1 @@ -Subproject commit ed89d1df26d5018a3c6a8fea8b75bc9c8e5a0f02 +Subproject commit 76e877658e8c613a7ce73f7bf8183d9cbf4da248 diff --git a/contrib/luajit-2.0 b/contrib/luajit-2.0 index a90e779..f0e865d 160000 --- a/contrib/luajit-2.0 +++ b/contrib/luajit-2.0 @@ -1 +1 @@ -Subproject commit a90e7795ca7f2b1b372c4971c9e17691f7230174 +Subproject commit f0e865dd4861520258299d0f2a56491bd9d602e1 diff --git a/contrib/vimdoc-ja b/contrib/vimdoc-ja index 3e807ea..6a780f2 160000 --- a/contrib/vimdoc-ja +++ b/contrib/vimdoc-ja @@ -1 +1 @@ -Subproject commit 3e807ea205f9c552541388566c2d961ecafc5ca1 +Subproject commit 6a780f2ba4722ff4c2c30b63d3da887cbcb96019 diff --git a/contrib/vimproc b/contrib/vimproc index 2300224..eb5b2b1 160000 --- a/contrib/vimproc +++ b/contrib/vimproc @@ -1 +1 @@ -Subproject commit 2300224d366642f4f8d6f88861535d4ccbe20143 +Subproject commit eb5b2b1248ccc8b1b9e84d7658508e38b964d17d diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index c52da5d..de2563d 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,3 +1,13 @@ +## 2019/03/XX の変更点 + +* ベースコードを8.1.1005に更新しました +* contrib 更新 + * autofmt (2018-07-03 641529c) + * lang-ja (2019-03-12 76e8776) + * LuaJIT (2019-01-10 f0e865dd48) + * vimdoc-ja (2019-03-08 6a780f2b) + * vimproc (2019-03-10 eb5b2b1) + ## 2018/05/20 の変更点 * ベースコードを8.1.0005に更新しました diff --git a/kaoriya/doc/README.txt b/kaoriya/doc/README.txt index dc99370..ed14870 100644 --- a/kaoriya/doc/README.txt +++ b/kaoriya/doc/README.txt @@ -1,14 +1,14 @@ - Vim version 8.0 艮 }jA + Vim version 8.1 艮 }jA - Version: 1.9.3 + Version: 1.10.0 Author: MURAOKA Taro Since: 23-Aug-1999 - Last Change: 18-May-2018. + Last Change: 13-Mar-2019. Tv VimviN[ɕނeLXgGfB^łB - IWiVimhttp://www.vim.org/ŌJĂÂ܂܂ł{ + IWiVimhttps://www.vim.org/ŌJĂÂ܂܂ł{ ރeLXg͕ҏWł܂A艮ł͓{舵Ղ邽߂̏Cƒ s艮łƂČJĂ܂B @@ -82,7 +82,7 @@ Vim CXg[ĂB - ActiveState (ActivePerl) - http://www.activestate.com/ + https://www.activestate.com/ PythonƂ̘Ag : PythonCXg[ȂĂVim͎gpł܂B @@ -97,7 +97,7 @@ Vim PythonCXg[ĂB - Python.org - http://www.python.org/ + https://www.python.org/ Python 2.7.11 𗘗pꍇɂ́APython 2.7.11̃oO邽߂ɁA ҂ƂĈȉ̃R}hsKv܂B @@ -122,7 +122,7 @@ Vim Python3CXg[ĂB - Python.org - http://www.python.org/ + https://www.python.org/ RubyƂ̘Ag : RubyCXg[ȂĂVim͎gpł܂B @@ -136,9 +136,9 @@ Vim RubyCXg[ĂB - Ruby zzTCg - http://rubyinstaller.org/ + https://rubyinstaller.org/ - RubySʂ̏ - http://www.ruby-lang.org/ja/ + https://www.ruby-lang.org/ja/ gp 艮ł̃CZX̓IWiVimɏ]܂Bڂorigdoc/README.txt @@ -154,7 +154,7 @@ Vim BmȂǂp̍ۂɂ́AiłpB - ɂt - http://iccf-holland.org/click.html + https://iccf-holland.org/click.html VimJX|T[x VimJX|T[xƋ@\v][xn܂܂BLuVim̊Jɂ @@ -166,7 +166,7 @@ Vim ɂ́uHall of honourvɌfڂ܂Bڍׂ͈ȉURLQƂĂB - Sponsor Vim development - http://www.vim.org/sponsor/index.php + https://www.vim.org/sponsor/index.php IWiƂ̑_ \[X @@ -198,7 +198,7 @@ Vim ȂƂł킩ȂƂ̂Ȃ΂ŕĂ݂Ɨǂł傤B 炩̏ɂ͂Ȃ͂łB - http://groups.google.com/group/vim_jp/?hl=ja + https://groups.google.com/group/vim_jp/?hl=ja 񃁁[ō艮ŃeiɒڕĂĂ\܂B{ꉻ Ȃǂ̕ss͍艮Ńei܂ŘA΁A܂݂ďC @@ -210,13 +210,14 @@ Vim Nł邩܂BVim{œ̊֘A͎URLɂ܂B - Vim{ - http://www.vim.org/ + https://www.vim.org/ https://github.com/vim/vim - Vim̓{R~jeBvim-jp - http://vim-jp.org/ + https://vim-jp.org/ https://github.com/vim-jp/issues/issues (oO񍐁A@\v]) + https://vim-jp.org/docs/chat.html (`bg) - vim_jp Google O[v - http://groups.google.com/group/vim_jp/?hl=ja + https://groups.google.com/group/vim_jp/?hl=ja - {hLg https://github.com/vim-jp/vimdoc-ja/ https://github.com/vim-jp/vimdoc-ja-working/ diff --git a/patches b/patches index 1979033..c56a2ae 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit 1979033c1d57d77dd0abaf0b9d248be2df94b1ba +Subproject commit c56a2ae4217bc6a2b816e61516b4cc8e8104142e diff --git a/vim b/vim index 31faed6..55d81cd 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 31faed60bfd54ff8f612f6b311a6cbcd9e7ebedd +Subproject commit 55d81cd2a15d93dba89b2ff1c988d82789919b6b From 179d86648703bad80fe89272f479a078c9a8e2d3 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 13 Mar 2019 00:24:33 +0900 Subject: [PATCH 05/17] update VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 1222a31..363fae4 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 8.1.0005 -PATCHSET_VER = 20180520 +VIM_VER = 8.1.1005 +PATCHSET_VER = 20190313 VIM_VER_SHORT = 81 From d46d35d13425fc3142e0ab64054fb2fdf204b937 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 13 Mar 2019 22:22:11 +0900 Subject: [PATCH 06/17] swtich perl provider switch to StrawberryPerl switch to Perl 5.28.1 --- build/msvc/vim.mak | 236 ++++++++++++++++++++--------------------- kaoriya/doc/CHANGES.md | 4 + kaoriya/doc/README.txt | 16 +-- 3 files changed, 130 insertions(+), 126 deletions(-) diff --git a/build/msvc/vim.mak b/build/msvc/vim.mak index 41504c5..2b99849 100644 --- a/build/msvc/vim.mak +++ b/build/msvc/vim.mak @@ -1,118 +1,118 @@ -USERNAME=koron.kaoriya -USERDOMAIN=gmail.com - -FEATURES=HUGE -MBYTE=YES -USE_MSVCRT=yes -MIGEMO=yes -MAP=no - -# DirectWrite support. -DIRECTX=yes - -# Terminal support. -TERMINAL=yes - -# Perl settings -!if !defined(DISABLE_IF) && !defined(DISABLE_PERL) -DYNAMIC_PERL=yes -PERL_VER=524 -!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -PERL = D:\Perl\Perl-5.24.0-64 -!else -PERL = D:\Perl\Perl-5.24.0-32 -!endif -!endif - -# Python settings -!if !defined(DISABLE_IF) && !defined(DISABLE_PYTHON) -DYNAMIC_PYTHON=yes -PYTHON_VER=27 -DYNAMIC_PYTHON3=yes -PYTHON3_VER=35 -!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -PYTHON = D:\Python\Python27 -PYTHON3 = D:\Python\Python35 -!else -PYTHON = D:\Python\Python27-x86 -PYTHON3 = D:\Python\Python35-32 -!endif -!endif - -# Lua settings -!if !defined(DISABLE_IF) && !defined(DISABLE_LUA) -DYNAMIC_LUA=yes -LUA_VER=51 -!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -LUA= ..\..\build\msvc\target\install-x64\include\lua -!else -LUA= ..\..\build\msvc\target\install-x32\include\lua -!endif -!endif - -# Ruby̐ݒ. -!if !defined(DISABLE_IF) && !defined(DISABLE_RUBY) -RUBY_VER=23 -RUBY_API_VER_LONG=2.3.0 -DYNAMIC_RUBY=yes -!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -RUBY = D:\Ruby\ruby-2.3.1-x64-mswin64 -RUBY_PLATFORM=x64-mswin64_100 -RUBY_INSTALL_NAME=x64-msvcrt-ruby230 -!else -RUBY = D:\Ruby\ruby-2.3.1-i386-mswin32 -RUBY_PLATFORM=i386-mswin32_100 -RUBY_INSTALL_NAME=msvcrt-ruby230 -!endif -!endif - -# XPM̐ݒ -!if !defined(DISABLE_XPM) -!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -XPM=..\..\build\msvc\target\install-x64 -!else -XPM=..\..\build\msvc\target\install-x32 -!endif -!endif - -# +channel feature for non-GUI -CHANNEL=yes - -!ifndef DEBUG -DEBUG=no -!endif - -!IF "$(_NMAKE_VER)" >= "9." && "$(_NMAKE_VER)" < "@." -MSCVER=9.0 -MSVCRT_DLL=msvcr90.dll -!ELSEIF "$(_NMAKE_VER)" >= "10." && "$(_NMAKE_VER)" < "11." -MSCVER=10.0 -MSVCRT_DLL=msvcr100.dll -!ELSEIF "$(_NMAKE_VER)" >= "11." && "$(_NMAKE_VER)" < "12." -MSCVER=11.0 -MSVCRT_DLL=msvcr110.dll -!ELSEIF "$(_NMAKE_VER)" >= "12." && "$(_NMAKE_VER)" < "13." -MSCVER=12.0 -MSVCRT_DLL=msvcr120.dll -!ELSEIF "$(_NMAKE_VER)" >= "14." && "$(_NMAKE_VER)" < "15." -MSCVER=14.0 -MSVCRT_FILES=vcruntime140.dll -!ELSE -!ERROR Unknown MSVC version: $(_NMAKE_VER) -!ENDIF - - -!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -DEFINES_ARCH = -!ELSE -DEFINES_ARCH = /D_USE_32BIT_TIME_T=1 -!ENDIF - -DEFINES= /DMODIFIED_BY=\"$(USERNAME)@$(USERDOMAIN)\" \ - /DDYNAMIC_MSVCRT_DLL=\"$(MSVCRT_DLL)\" \ - /DGETTEXT_DLL=\"intl.dll\" \ - /DGETTEXT_DLL_ALT=\"intl.dll\" \ - /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 \ - $(DEFINES_ARCH) - -!include Make_mvc.mak +USERNAME=koron.kaoriya +USERDOMAIN=gmail.com + +FEATURES=HUGE +MBYTE=YES +USE_MSVCRT=yes +MIGEMO=yes +MAP=no + +# DirectWrite support. +DIRECTX=yes + +# Terminal support. +TERMINAL=yes + +# Perl settings +!if !defined(DISABLE_IF) && !defined(DISABLE_PERL) +DYNAMIC_PERL=yes +PERL_VER=528 +!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" +PERL = D:\Perl\strawberry-perl-5.28.1.1-64bit\perl +!else +PERL = D:\Perl\strawberry-perl-5.28.1.1-32bit\perl +!endif +!endif + +# Python settings +!if !defined(DISABLE_IF) && !defined(DISABLE_PYTHON) +DYNAMIC_PYTHON=yes +PYTHON_VER=27 +DYNAMIC_PYTHON3=yes +PYTHON3_VER=35 +!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" +PYTHON = D:\Python\Python27 +PYTHON3 = D:\Python\Python35 +!else +PYTHON = D:\Python\Python27-x86 +PYTHON3 = D:\Python\Python35-32 +!endif +!endif + +# Lua settings +!if !defined(DISABLE_IF) && !defined(DISABLE_LUA) +DYNAMIC_LUA=yes +LUA_VER=51 +!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" +LUA= ..\..\build\msvc\target\install-x64\include\lua +!else +LUA= ..\..\build\msvc\target\install-x32\include\lua +!endif +!endif + +# Ruby̐ݒ. +!if !defined(DISABLE_IF) && !defined(DISABLE_RUBY) +RUBY_VER=23 +RUBY_API_VER_LONG=2.3.0 +DYNAMIC_RUBY=yes +!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" +RUBY = D:\Ruby\ruby-2.3.1-x64-mswin64 +RUBY_PLATFORM=x64-mswin64_100 +RUBY_INSTALL_NAME=x64-msvcrt-ruby230 +!else +RUBY = D:\Ruby\ruby-2.3.1-i386-mswin32 +RUBY_PLATFORM=i386-mswin32_100 +RUBY_INSTALL_NAME=msvcrt-ruby230 +!endif +!endif + +# XPM̐ݒ +!if !defined(DISABLE_XPM) +!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" +XPM=..\..\build\msvc\target\install-x64 +!else +XPM=..\..\build\msvc\target\install-x32 +!endif +!endif + +# +channel feature for non-GUI +CHANNEL=yes + +!ifndef DEBUG +DEBUG=no +!endif + +!IF "$(_NMAKE_VER)" >= "9." && "$(_NMAKE_VER)" < "@." +MSCVER=9.0 +MSVCRT_DLL=msvcr90.dll +!ELSEIF "$(_NMAKE_VER)" >= "10." && "$(_NMAKE_VER)" < "11." +MSCVER=10.0 +MSVCRT_DLL=msvcr100.dll +!ELSEIF "$(_NMAKE_VER)" >= "11." && "$(_NMAKE_VER)" < "12." +MSCVER=11.0 +MSVCRT_DLL=msvcr110.dll +!ELSEIF "$(_NMAKE_VER)" >= "12." && "$(_NMAKE_VER)" < "13." +MSCVER=12.0 +MSVCRT_DLL=msvcr120.dll +!ELSEIF "$(_NMAKE_VER)" >= "14." && "$(_NMAKE_VER)" < "15." +MSCVER=14.0 +MSVCRT_FILES=vcruntime140.dll +!ELSE +!ERROR Unknown MSVC version: $(_NMAKE_VER) +!ENDIF + + +!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" +DEFINES_ARCH = +!ELSE +DEFINES_ARCH = /D_USE_32BIT_TIME_T=1 +!ENDIF + +DEFINES= /DMODIFIED_BY=\"$(USERNAME)@$(USERDOMAIN)\" \ + /DDYNAMIC_MSVCRT_DLL=\"$(MSVCRT_DLL)\" \ + /DGETTEXT_DLL=\"intl.dll\" \ + /DGETTEXT_DLL_ALT=\"intl.dll\" \ + /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 \ + $(DEFINES_ARCH) + +!include Make_mvc.mak diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index de2563d..cf33e52 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,6 +1,10 @@ ## 2019/03/XX の変更点 * ベースコードを8.1.1005に更新しました +* 外部言語インターフェースの変更 + * Perl + * Strawberry Perlへ変更しました + * Perlのバージョンを5.28.1に変更しました * contrib 更新 * autofmt (2018-07-03 641529c) * lang-ja (2019-03-12 76e8776) diff --git a/kaoriya/doc/README.txt b/kaoriya/doc/README.txt index ed14870..270074f 100644 --- a/kaoriya/doc/README.txt +++ b/kaoriya/doc/README.txt @@ -69,20 +69,20 @@ Vim - LuaJIT TCg http://luajit.org/ - Perl(ActivePerl)Ƃ̘Ag + PerlƂ̘Ag : PerlCXg[ȂĂVim͎gpł܂B - ActiveStateЂɂJĂActivePerl 5.24CXg[邱ƂŁA - PerlC^[tF[Xgp邱Ƃł܂BActivePerlCXg[ - Ȃꍇ́APerlC^[tF[X͎IɖƂȂ܂BPerlC^[ - tF[X̏ڍׂɂ‚Ă":help perl"ƂVimt̃}jAQƂĂ - B + strawberryperl.orgɂČJĂStrawberry Perl 5.28CXg[ + 邱ƂŁAPerlC^[tF[Xgpł܂BStrawberry PerlCX + g[ĂȂꍇ́APerlC^[tF[X͎IɖƂȂ܂BPerl + C^[tF[X̏ڍׂɂ‚Ă":help perl"ƂVimt̃}jAQ + ƂĂB 64bitłVimgꍇ64bitłPerlA32bitłgꍇ32bitłPerl CXg[ĂB - - ActiveState (ActivePerl) - https://www.activestate.com/ + - Strawberry Perl + http://strawberryperl.com/ PythonƂ̘Ag : PythonCXg[ȂĂVim͎gpł܂B From 5fb8d7e0c5ace4aaa5cb2dddbafc3afc483eb2c3 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 14 Mar 2019 01:24:15 +0900 Subject: [PATCH 07/17] upgrade ruby 2.6.1 --- build/msvc/vim.mak | 18 +++++++++--------- kaoriya/doc/CHANGES.md | 3 +++ kaoriya/doc/README.txt | 7 +++++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/build/msvc/vim.mak b/build/msvc/vim.mak index 2b99849..36f60ab 100644 --- a/build/msvc/vim.mak +++ b/build/msvc/vim.mak @@ -50,19 +50,19 @@ LUA= ..\..\build\msvc\target\install-x32\include\lua !endif !endif -# Ruby̐ݒ. +# Ruby 2.6 settings !if !defined(DISABLE_IF) && !defined(DISABLE_RUBY) -RUBY_VER=23 -RUBY_API_VER_LONG=2.3.0 +RUBY_VER=26 +RUBY_API_VER_LONG=2.6.0 DYNAMIC_RUBY=yes !if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -RUBY = D:\Ruby\ruby-2.3.1-x64-mswin64 -RUBY_PLATFORM=x64-mswin64_100 -RUBY_INSTALL_NAME=x64-msvcrt-ruby230 +RUBY = D:\Ruby\rubyinstaller-2.6.1-1-x64 +RUBY_PLATFORM=x64-mingw32 +RUBY_INSTALL_NAME=x64-msvcrt-ruby260 !else -RUBY = D:\Ruby\ruby-2.3.1-i386-mswin32 -RUBY_PLATFORM=i386-mswin32_100 -RUBY_INSTALL_NAME=msvcrt-ruby230 +RUBY = D:\Ruby\rubyinstaller-2.6.1-1-x86 +RUBY_PLATFORM=i386-mingw32 +RUBY_INSTALL_NAME=msvcrt-ruby260 !endif !endif diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index cf33e52..13d5306 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -5,6 +5,9 @@ * Perl * Strawberry Perlへ変更しました * Perlのバージョンを5.28.1に変更しました + * Ruby + * Rubyのバージョンを2.6.1に変更しました + * PATHの追加設定が必要です * contrib 更新 * autofmt (2018-07-03 641529c) * lang-ja (2019-03-12 76e8776) diff --git a/kaoriya/doc/README.txt b/kaoriya/doc/README.txt index 270074f..1077e5b 100644 --- a/kaoriya/doc/README.txt +++ b/kaoriya/doc/README.txt @@ -3,7 +3,7 @@ Version: 1.10.0 Author: MURAOKA Taro Since: 23-Aug-1999 - Last Change: 13-Mar-2019. + Last Change: 14-Mar-2019. Tv VimviN[ɕނeLXgGfB^łB @@ -127,7 +127,7 @@ Vim RubyƂ̘Ag : RubyCXg[ȂĂVim͎gpł܂B - Ruby 2.3.1CXg[RubyC^[tF[X𗘗pł܂BRubyC + Ruby 2.6.1CXg[RubyC^[tF[X𗘗pł܂BRubyC Xg[ĂȂꍇRubyC^[tF[X͎IɖƂȂ܂B RubyC^[tF[X̏ڍׂɂ‚Ă":help ruby"ƂVimt̃}jA QƂĂB @@ -135,6 +135,9 @@ Vim 64bitłVimgꍇ64bitłRubyA32bitłgꍇ32bitł RubyCXg[ĂB + Ruby 2.6.1 ͏]bintH_łȂbin\ruby_builtin_dllstH_ + ɂPATHʂKv܂B + - Ruby zzTCg https://rubyinstaller.org/ - RubySʂ̏ From 1a158c247064b35c08b6fe1c0003851861e600e4 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 14 Mar 2019 09:33:18 +0900 Subject: [PATCH 08/17] bump up version to pre-release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 363fae4..4a68eb4 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ VIM_VER = 8.1.1005 -PATCHSET_VER = 20190313 +PATCHSET_VER = 20190314 VIM_VER_SHORT = 81 From 476c1b88ba497dba42a17afd38c774da24b4b05a Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 14 Mar 2019 22:15:16 +0900 Subject: [PATCH 09/17] translate comment --- build/msvc/vim.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/msvc/vim.mak b/build/msvc/vim.mak index 36f60ab..4b022f2 100644 --- a/build/msvc/vim.mak +++ b/build/msvc/vim.mak @@ -66,7 +66,7 @@ RUBY_INSTALL_NAME=msvcrt-ruby260 !endif !endif -# XPM̐ݒ +# XPM settings !if !defined(DISABLE_XPM) !if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" XPM=..\..\build\msvc\target\install-x64 From f4bc1fb096e5f385ecd04e7fb217504fffe27d6d Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 14 Mar 2019 22:41:08 +0900 Subject: [PATCH 10/17] update python2/3 * 2.7.16 * 3.7.2 --- build/msvc/vim.mak | 6 +++--- kaoriya/doc/CHANGES.md | 3 +++ kaoriya/doc/README.txt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/msvc/vim.mak b/build/msvc/vim.mak index 4b022f2..53f4c54 100644 --- a/build/msvc/vim.mak +++ b/build/msvc/vim.mak @@ -29,13 +29,13 @@ PERL = D:\Perl\strawberry-perl-5.28.1.1-32bit\perl DYNAMIC_PYTHON=yes PYTHON_VER=27 DYNAMIC_PYTHON3=yes -PYTHON3_VER=35 +PYTHON3_VER=37 !if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" PYTHON = D:\Python\Python27 -PYTHON3 = D:\Python\Python35 +PYTHON3 = D:\Python\Python37 !else PYTHON = D:\Python\Python27-x86 -PYTHON3 = D:\Python\Python35-32 +PYTHON3 = D:\Python\Python37-32 !endif !endif diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 13d5306..2a4829a 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -8,6 +8,9 @@ * Ruby * Rubyのバージョンを2.6.1に変更しました * PATHの追加設定が必要です + * Python + * Python2のバージョンを2.7.16に変更しました + * Python3のバージョンを3.7.2に変更しました * contrib 更新 * autofmt (2018-07-03 641529c) * lang-ja (2019-03-12 76e8776) diff --git a/kaoriya/doc/README.txt b/kaoriya/doc/README.txt index 1077e5b..cbe634b 100644 --- a/kaoriya/doc/README.txt +++ b/kaoriya/doc/README.txt @@ -112,7 +112,7 @@ Vim Python3Ƃ̘Ag : Python3CXg[ȂĂVim͎gpł܂B - Python.orgɂJĂPython 3.5CXg[邱ƂŁAPythonC + Python.orgɂJĂPython 3.7CXg[邱ƂŁAPythonC ^[tF[Xgp邱Ƃł܂BPythonCXg[ĂȂꍇ ́APythonC^[tF[X͎IɖƂȂ܂BPythonC^[tF[X ̏ڍׂɂ‚Ă":help python3"ƂVimt̃}jAQƂĂ From 84bf2f068a68c1449b39c571278dd92226b87de1 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 14 Mar 2019 22:46:24 +0900 Subject: [PATCH 11/17] catch up vim 8.1.1007 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 4a68eb4..39ad1cb 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 8.1.1005 +VIM_VER = 8.1.1007 PATCHSET_VER = 20190314 VIM_VER_SHORT = 81 diff --git a/vim b/vim index 55d81cd..209b8e3 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 55d81cd2a15d93dba89b2ff1c988d82789919b6b +Subproject commit 209b8e3e3bf7a4a3d102134124120f6c7f57d560 From ad0d6921cb7b416b47bc4f11f248aafbe807add7 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 15 Mar 2019 00:17:26 +0900 Subject: [PATCH 12/17] move bounding box to draw text 1 dot bottom Some bitmap embeded font have left some garbages when drawing characters. --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index c56a2ae..52ac389 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit c56a2ae4217bc6a2b816e61516b4cc8e8104142e +Subproject commit 52ac389536b220e77517e4bd2e06e4c6844eaff4 From f1cbe107c8418c5a04b833033e8e2991742f8dfd Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 15 Mar 2019 00:48:29 +0900 Subject: [PATCH 13/17] patch to fix DEBUG build with if_python3 --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index 52ac389..5cdc29b 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit 52ac389536b220e77517e4bd2e06e4c6844eaff4 +Subproject commit 5cdc29b29d81525fa7a2dcefdc4c9a87bd7fe1c3 From 5aeb7513a2f7367a6d901e20dcf31d1296028497 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 15 Mar 2019 01:32:13 +0900 Subject: [PATCH 14/17] small fix --- VERSION | 2 +- kaoriya/doc/CHANGES.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 39ad1cb..c82866d 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ VIM_VER = 8.1.1007 -PATCHSET_VER = 20190314 +PATCHSET_VER = 20190315 VIM_VER_SHORT = 81 diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 2a4829a..42fddbe 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -11,6 +11,7 @@ * Python * Python2のバージョンを2.7.16に変更しました * Python3のバージョンを3.7.2に変更しました +* DirectX利用時の文字描画位置を0.5ドット下方へ修正 * contrib 更新 * autofmt (2018-07-03 641529c) * lang-ja (2019-03-12 76e8776) From e86e70714eeabbf34a6192d7767108f33d28dc78 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 15 Mar 2019 10:21:58 +0900 Subject: [PATCH 15/17] catch up vim 8.1.1008 --- VERSION | 2 +- kaoriya/doc/CHANGES.md | 2 +- patches | 2 +- vim | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index c82866d..6c0bbe1 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 8.1.1007 +VIM_VER = 8.1.1008 PATCHSET_VER = 20190315 VIM_VER_SHORT = 81 diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 42fddbe..7cf75e5 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,6 +1,6 @@ ## 2019/03/XX の変更点 -* ベースコードを8.1.1005に更新しました +* ベースコードを8.1.1008に更新しました * 外部言語インターフェースの変更 * Perl * Strawberry Perlへ変更しました diff --git a/patches b/patches index 5cdc29b..7339b05 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit 5cdc29b29d81525fa7a2dcefdc4c9a87bd7fe1c3 +Subproject commit 7339b05d6af50a15898a21ea67d3c86f3ecd0f72 diff --git a/vim b/vim index 209b8e3..0251d2d 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 209b8e3e3bf7a4a3d102134124120f6c7f57d560 +Subproject commit 0251d2d8114f2faae0a5822870af2c6118bfbc15 From 8145b7b2fd472518d3557cc9511f012b67c691c3 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 17 Mar 2019 00:16:43 +0900 Subject: [PATCH 16/17] catch up 8.1.1009 --- .gitignore | 2 +- VERSION | 4 ++-- kaoriya/doc/CHANGES.md | 3 +-- patches | 2 +- vim | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b510320..4e248b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.sw? -/tmp/ +tmp/ diff --git a/VERSION b/VERSION index 6c0bbe1..31a39e2 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 8.1.1008 -PATCHSET_VER = 20190315 +VIM_VER = 8.1.1009 +PATCHSET_VER = 20190317 VIM_VER_SHORT = 81 diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 7cf75e5..7a92e8e 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,6 +1,6 @@ ## 2019/03/XX の変更点 -* ベースコードを8.1.1008に更新しました +* ベースコードを8.1.1009に更新しました * 外部言語インターフェースの変更 * Perl * Strawberry Perlへ変更しました @@ -11,7 +11,6 @@ * Python * Python2のバージョンを2.7.16に変更しました * Python3のバージョンを3.7.2に変更しました -* DirectX利用時の文字描画位置を0.5ドット下方へ修正 * contrib 更新 * autofmt (2018-07-03 641529c) * lang-ja (2019-03-12 76e8776) diff --git a/patches b/patches index 7339b05..ac09aa0 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit 7339b05d6af50a15898a21ea67d3c86f3ecd0f72 +Subproject commit ac09aa0e4e1dc5b2d861ed9f420a3c5c5ee6bdc3 diff --git a/vim b/vim index 0251d2d..1f271ef 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 0251d2d8114f2faae0a5822870af2c6118bfbc15 +Subproject commit 1f271efbbb2004c3e1b90492a3585a6d9ebd7893 From dcbe1bd7e7e9c1c8273b43c59a7c0d70a96c229f Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 17 Mar 2019 01:02:33 +0900 Subject: [PATCH 17/17] catch up 8.1.1010 --- VERSION | 2 +- kaoriya/doc/CHANGES.md | 4 ++-- vim | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 31a39e2..0080e4a 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 8.1.1009 +VIM_VER = 8.1.1010 PATCHSET_VER = 20190317 VIM_VER_SHORT = 81 diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 7a92e8e..917e014 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,6 +1,6 @@ -## 2019/03/XX の変更点 +## 2019/03/17 の変更点 -* ベースコードを8.1.1009に更新しました +* ベースコードを8.1.1010に更新しました * 外部言語インターフェースの変更 * Perl * Strawberry Perlへ変更しました diff --git a/vim b/vim index 1f271ef..713bf9e 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 1f271efbbb2004c3e1b90492a3585a6d9ebd7893 +Subproject commit 713bf9e996d8c9a2cc5003ee0c95f12055756ae5