diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d56ccdddfc..a6b042ce000 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.2.5 + ### New features * Add `string.serialize` and `string.deserialize` to serialize and deserialize object, function and others. @@ -560,6 +562,8 @@ ## master (开发中) +## v2.2.5 + ### 新特性 * 添加`string.serialize`和`string.deserialize`去序列化,反序列化对象,函数以及其他类型 diff --git a/README.md b/README.md index 0deea2bd768..8dcd18a3e40 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ so that any developer can quickly pick it up and enjoy the productivity boost wh If you want to known more, please refer to: -* [Documents](http://xmake.io/#/home) -* [HomePage](http://www.xmake.io) +* [Documents](https://xmake.io/#/home) +* [HomePage](https://xmake.io) * [Github](https://github.com/xmake-io/xmake) * [Gitee](https://gitee.com/tboox/xmake) diff --git a/README_zh.md b/README_zh.md index 96abb300f13..e21a2b94340 100644 --- a/README_zh.md +++ b/README_zh.md @@ -58,8 +58,8 @@ xmake的目标是开发者更加关注于项目本身开发,简化项目的描 如果你想要了解更多,请参考: -* [在线文档](http://xmake.io/#/zh/) -* [项目主页](http://www.xmake.io/cn) +* [在线文档](https://xmake.io/#/zh/) +* [项目主页](https://xmake.io/cn) * [Github](https://github.com/xmake-io/xmake) * [Gitee](https://gitee.com/tboox/xmake) diff --git a/core/project.mak b/core/project.mak index 28e867ebc3b..1b92aeac7b6 100644 --- a/core/project.mak +++ b/core/project.mak @@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2 PRO_VERSION_MINOR = 2 # the project alter version -PRO_VERSION_ALTER = 3 +PRO_VERSION_ALTER = 5 # the project prefix PRO_PREFIX = XM_ diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua index b342fbb674a..0dd1345f8c3 100644 --- a/core/src/luajit/xmake.lua +++ b/core/src/luajit/xmake.lua @@ -22,12 +22,12 @@ target("luajit") set_languages("gnu99") end - -- add headers + -- add header files add_headerfiles("src/(*.h)") - add_headerdirs("src") -- add include directories - add_includedirs("src", autogendir) + add_includedirs(autogendir) + add_includedirs("src", {public = true}) -- add the common source files add_files("src/*.c|ljamalg.c|luajit.c") diff --git a/core/src/sv/xmake.lua b/core/src/sv/xmake.lua index cb7c6fa9785..324d9600ae9 100644 --- a/core/src/sv/xmake.lua +++ b/core/src/sv/xmake.lua @@ -21,8 +21,7 @@ target("sv") set_languages("c99") set_kind("$(kind)") add_headerfiles("include/(*.h)") - add_headerdirs("include") - add_includedirs("include") + add_includedirs("include", {public = true}) add_files("src/*.c") includes("test") diff --git a/core/xmake.lua b/core/xmake.lua index 227d6d20c88..bcc6500a34f 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.2.3", {build = "%Y%m%d%H%M"}) +set_version("2.2.5", {build = "%Y%m%d%H%M"}) -- set xmake min version set_xmakever("2.2.3") diff --git a/scripts/brew-pr b/scripts/brew-pr index 2bdfe7a1ca7..6eab4b3c8db 100755 --- a/scripts/brew-pr +++ b/scripts/brew-pr @@ -1,2 +1,2 @@ #!/bin/bash -brew bump-formula-pr --url=https://github.com/xmake-io/xmake/archive/v2.2.3.tar.gz --sha256=c73d34805ab26d214f22fee74bf033942f91ce43bfc028663ffb910ad22c2c5d xmake +brew bump-formula-pr --url=https://github.com/xmake-io/xmake/archive/v2.2.5.tar.gz --sha256=c73d34805ab26d214f22fee74bf033942f91ce43bfc028663ffb910ad22c2c5d xmake diff --git a/scripts/get.ps1 b/scripts/get.ps1 index 0612719e887..f81863994be 100644 --- a/scripts/get.ps1 +++ b/scripts/get.ps1 @@ -4,7 +4,7 @@ param ( [string]$branch = "master", - [string]$version = "v2.2.3" + [string]$version = "v2.2.5" ) & { diff --git a/scripts/installer.nsi b/scripts/installer.nsi index c290620f0a5..28be963e903 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -14,7 +14,7 @@ ;-------------------------------- ; The name of the installer -Name "xmake-v2.2.3" +Name "xmake-v2.2.5" ; The file to write OutFile "xmake.exe" @@ -60,13 +60,13 @@ RequestExecutionLevel admin ;-------------------------------- ; Version Information -VIProductVersion "2.2.3.1128" +VIProductVersion "2.2.5.0401" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake" -VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: https://www.xmake.io" +VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: https://xmake.io" VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group" -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2015-2018 tboox.org" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "The cross-platform build utility based on Lua" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.3" +VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2015-2019 tboox.org" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "A cross-platform build utility based on Lua" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.5" ;--------------------------------