Skip to content

Commit

Permalink
modify version
Browse files Browse the repository at this point in the history
  • Loading branch information
waruqi committed Aug 16, 2017
1 parent 728a2d7 commit 7ea60d2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## master (unreleased)

## v2.1.6

### Changes

* Improve `add_files` to configure the compile option of the given files
Expand Down Expand Up @@ -336,6 +338,8 @@

## master (开发中)

## v2.1.6

### 改进

* 改进`add_files`,支持对files粒度进行编译选项的各种配置,更加灵活。
Expand Down
2 changes: 1 addition & 1 deletion core/project.mak
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2
PRO_VERSION_MINOR = 1

# the project alter version
PRO_VERSION_ALTER = 5
PRO_VERSION_ALTER = 6

# the project prefix
PRO_PREFIX = XM_
Expand Down
4 changes: 2 additions & 2 deletions core/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
set_project("xmake")

-- version
set_version("2.1.5")
set_version("2.1.6")

-- set xmake min version
set_xmakever("2.1.5")
set_xmakever("2.1.6")

-- set warning all as error
set_warnings("all", "error")
Expand Down
4 changes: 2 additions & 2 deletions scripts/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ RequestExecutionLevel admin
;--------------------------------
; Version Information

VIProductVersion "2.1.5.0805"
VIProductVersion "2.1.6.0816"
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.5"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.6"

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

Expand Down

0 comments on commit 7ea60d2

Please sign in to comment.