1.8.3

・Lua 5.2.3 を 5.3.0 にアップデートしました。
nathancorvussolis · Jan 13, 2015 · ec61014 · ec61014
1 parent 1304b3b
commit ec61014
Show file tree

Hide file tree

Showing 73 changed files with 6,769 additions and 4,196 deletions.
diff --git a/LICENSE.TXT b/LICENSE.TXT
@@ -4,7 +4,7 @@
 
 CorvusSKK
 
-Copyright (C) 2011-2014 SASAKI Nobuyuki
+Copyright (C) 2011-2015 SASAKI Nobuyuki
 
 Microsoft Public License (MS-PL)
 
@@ -74,7 +74,7 @@ License:
 
 Lua
 
-Copyright (C) 1994-2013 Lua.org, PUC-Rio.
+Copyright (C) 1994-2015 Lua.org, PUC-Rio.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/common/version.h b/common/version.h
@@ -3,7 +3,7 @@
 #define VERSION_H
 
 #define TEXTSERVICE_NAME	L"CorvusSKK"
-#define TEXTSERVICE_VER		L"1.8.2"
+#define TEXTSERVICE_VER		L"1.8.3"
 
 #ifndef _DEBUG
 #define TEXTSERVICE_DESC	TEXTSERVICE_NAME
@@ -14,7 +14,7 @@
 //for resource
 #define RC_AUTHOR			"nathancorvussolis"
 #define RC_PRODUCT			"CorvusSKK"
-#define RC_VERSION			"1.8.2"
-#define RC_VERSION_D		1,8,2,0
+#define RC_VERSION			"1.8.3"
+#define RC_VERSION_D		1,8,3,0
 
 #endif
diff --git a/imcrvmgr/imcrvmgr.vcxproj b/imcrvmgr/imcrvmgr.vcxproj
@@ -99,7 +99,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>lua52.lib;common.lib;shlwapi.lib;xmllite.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>lua53.lib;common.lib;shlwapi.lib;xmllite.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
@@ -120,7 +120,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>lua52.lib;common.lib;shlwapi.lib;xmllite.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>lua53.lib;common.lib;shlwapi.lib;xmllite.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
@@ -144,7 +144,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>lua52.lib;common.lib;shlwapi.lib;xmllite.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>lua53.lib;common.lib;shlwapi.lib;xmllite.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
@@ -168,7 +168,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>lua52.lib;common.lib;shlwapi.lib;xmllite.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>lua53.lib;common.lib;shlwapi.lib;xmllite.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>

diff --git a/installer/README.TXT b/installer/README.TXT
@@ -1,6 +1,6 @@
 
 ==============================================================================
-     CorvusSKK version 1.8.2
+     CorvusSKK version 1.8.3
 
      https://code.google.com/p/corvus-skk/
      [email protected]
@@ -474,8 +474,8 @@
 
   サーバープロセス(imcrvmgr.exe)の各機能の拡張、プログラム実行変換もどき、
   数値変換をLuaスクリプトで実装しています。
-  現在使用しているLuaのバージョンは5.2.3です。
-  詳細はこちらを参照下さい。http://www.lua.org/manual/5.2/manual.html
+  現在使用しているLuaのバージョンは5.3.0です。
+  詳細はこちらを参照下さい。http://www.lua.org/manual/5.3/manual.html
 
   Lua内部の文字コードをUTF-8に決め打ちして、Unicode版のWindowsAPIとCランタイム
   関数を呼ぶようにパッチを当てています。

diff --git a/installer/config-lua/init.lua b/installer/config-lua/init.lua
@@ -421,14 +421,12 @@ local function car(t)
 	return skk_num_list[1]
 end
 
--- convert float to integer (remove .0 suffix for compatibility with Lua 5.2)
+-- convert float to integer (remove suffix ".0")
 local function float_to_integer(value)
-	--[[ Lua 5.3 から有効にする予定
-	local ivalue = math.tointeger(value)   -- math.tointeger : Lua 5.3
+	local ivalue = math.tointeger(value)
 	if ivalue then
 		return ivalue
 	end
-	--]]
 	return value
 end
 

diff --git a/installer/corvusskk-x64.wxs b/installer/corvusskk-x64.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define version="1.8.2" ?>
+  <?define version="1.8.3" ?>
   <Product Id="*" Name="CorvusSKK" Language="1033" Version="$(var.version)" Manufacturer="CorvusSKK Project" UpgradeCode="DBDB315C-1F74-4051-8A67-705D0FD16497">
 
     <Package Id="*" Compressed="yes" Description="CorvusSKK" Comments="version $(var.version)" Platform="x64" InstallerVersion="405" InstallScope="perMachine" InstallPrivileges="elevated" />
@@ -24,7 +24,7 @@
               <File Id="F_luaexe_x86" Name="lua.exe" Source="..\Win32\Release\lua.exe" />
             </Component>
             <Component Guid="93ED8DC7-9C63-4950-9BCE-3846F9C9BBB9" Id="LUADLL_X86">
-              <File Id="F_luadll_x86" Name="lua52.dll" Source="..\Win32\Release\lua52.dll" />
+              <File Id="F_luadll_x86" Name="lua53.dll" Source="..\Win32\Release\lua53.dll" />
             </Component>
             <Component Guid="23966B7A-73A0-4E98-8509-02DF0EC3DB7E" Id="LUAINIT_X86">
               <File Id="F_luainit_x86" Name="init.lua" Source="config-lua\init.lua" />
@@ -48,7 +48,7 @@
               <File Id="F_luaexe_x64" Name="lua.exe" Source="..\x64\Release\lua.exe" />
             </Component>
             <Component Guid="39B37C2E-8821-47E8-98FE-00503A54894C" Id="LUADLL_X64" Win64="yes">
-              <File Id="F_luadll_x64" Name="lua52.dll" Source="..\x64\Release\lua52.dll" />
+              <File Id="F_luadll_x64" Name="lua53.dll" Source="..\x64\Release\lua53.dll" />
             </Component>
             <Component Guid="055AA272-77FB-46CD-AB50-34DA50625ABB" Id="INITLUA_X64" Win64="yes">
               <File Id="F_initlua_x64" Name="init.lua" Source="config-lua\init.lua" />

diff --git a/installer/corvusskk-x86.wxs b/installer/corvusskk-x86.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define version="1.8.2" ?>
+  <?define version="1.8.3" ?>
   <Product Id="*" Name="CorvusSKK" Language="1033" Version="$(var.version)" Manufacturer="CorvusSKK Project" UpgradeCode="3F1244EC-9A5C-4041-9A33-E26B03C63C9B">
 
     <Package Id="*" Compressed="yes" Description="CorvusSKK" Comments="version $(var.version)" Platform="x86" InstallerVersion="405" InstallScope="perMachine" InstallPrivileges="elevated" />
@@ -24,7 +24,7 @@
               <File Id="F_luaexe_x86" Name="lua.exe" Source="..\Win32\Release\lua.exe" />
             </Component>
             <Component Guid="84898511-4C96-4114-A7EE-8F32E260D28A" Id="LUADLL_X86">
-              <File Id="F_luadll_x86" Name="lua52.dll" Source="..\Win32\Release\lua52.dll" />
+              <File Id="F_luadll_x86" Name="lua53.dll" Source="..\Win32\Release\lua53.dll" />
             </Component>
             <Component Guid="1229154E-E5AB-430C-87EC-A7DBB451A157" Id="INITLUA_X86">
               <File Id="F_initlua_x86" Name="init.lua" Source="config-lua\init.lua" />