Skip to content

Commit

Permalink
update version
Browse files Browse the repository at this point in the history
  • Loading branch information
waruqi committed Oct 13, 2017
1 parent b9df5ea commit a047256
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,8 @@

## master (unreleased)

## v2.1.7

### New features

* Add `add_imports` to bulk import modules for the target, option and package script
Expand Down Expand Up @@ -370,6 +372,8 @@

## master (开发中)

## v2.1.7

### 新特性

* 添加`add_imports`去为target,option和package的自定义脚本批量导入模块,简化自定义脚本
Expand Down
2 changes: 1 addition & 1 deletion core/project.mak
Expand Up @@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2
PRO_VERSION_MINOR = 1

# the project alter version
PRO_VERSION_ALTER = 6
PRO_VERSION_ALTER = 7

# the project prefix
PRO_PREFIX = XM_
Expand Down
2 changes: 1 addition & 1 deletion core/xmake.lua
Expand Up @@ -2,7 +2,7 @@
set_project("xmake")

-- version
set_version("2.1.6", {build = "%Y%m%d%H%M"})
set_version("2.1.7", {build = "%Y%m%d%H%M"})

-- set xmake min version
set_xmakever("2.1.6")
Expand Down
4 changes: 2 additions & 2 deletions scripts/installer.nsi
Expand Up @@ -60,13 +60,13 @@ RequestExecutionLevel admin
;--------------------------------
; Version Information

VIProductVersion "2.1.6.0816"
VIProductVersion "2.1.7.1013"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake"
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: http://www.xmake.io"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2015-2017 tboox.org"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "The Make-like Build Utility based on Lua"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.6"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.7"

;--------------------------------

Expand Down

0 comments on commit a047256

Please sign in to comment.