update versionv2.2.1

6 files changed, 11 insertions, 14 deletions

diff --git a/core/project.mak b/core/project.mak
index a6556053f..56ef60f24 100644
--- a/core/project.mak
+++ b/core/project.mak
@@ -7,10 +7,10 @@ PRO_NAME 			= xmake
 PRO_VERSION_MAJOR 	= 2
 
 # the project minor version
-PRO_VERSION_MINOR 	= 1
+PRO_VERSION_MINOR 	= 2
 
 # the project alter version
-PRO_VERSION_ALTER 	= 9
+PRO_VERSION_ALTER 	= 1
 
 # the project prefix
 PRO_PREFIX 			= XM_
diff --git a/core/src/tbox/src/tbox/platform/windows/print.c b/core/src/tbox/src/tbox/platform/windows/print.c
index f9af0fb90..7265a7e5d 100644
--- a/core/src/tbox/src/tbox/platform/windows/print.c
+++ b/core/src/tbox/src/tbox/platform/windows/print.c
@@ -52,7 +52,7 @@ tb_void_t tb_print(tb_char_t const* string)
 
     // the data and size
     tb_byte_t const*    data = (tb_byte_t const*)string;
-    tb_size_t           size = tb_strlen(string) + 1;
+    tb_size_t           size = tb_strlen(string);
 
     // write string to stdout
     tb_size_t writ = 0;
diff --git a/core/xmake.lua b/core/xmake.lua
index 8a2219935..b9f032680 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -2,7 +2,7 @@
 set_project("xmake")
 
 -- version
-set_version("2.1.9", {build = "%Y%m%d%H%M"})
+set_version("2.2.1", {build = "%Y%m%d%H%M"})
 
 -- set xmake min version
 set_xmakever("2.1.8")
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
index 7a672e55e..c749b5b2d 100644
--- a/scripts/installer.nsi
+++ b/scripts/installer.nsi
@@ -49,7 +49,7 @@ RequestExecutionLevel admin
 ; Finish Pages

 

 !define MUI_FINISHPAGE_LINK "Donate $$5"

-!define MUI_FINISHPAGE_LINK_LOCATION "http://xmake.io/pages/donation.html#donate"

+!define MUI_FINISHPAGE_LINK_LOCATION "https://xmake.io/pages/donation.html#donate"

 !insertmacro MUI_PAGE_FINISH

 

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

@@ -60,13 +60,13 @@ RequestExecutionLevel admin
 ;--------------------------------

 ; Version Information

 

-VIProductVersion "2.1.9.0203"

+VIProductVersion "2.2.1.0616"

 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake"

-VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: http://www.xmake.io"

+VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: https://www.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 Make-like Build Utility based on Lua"

-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.9"

+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "The cross-platform build utility based on Lua"

+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.1"

 

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

 

diff --git a/xmake/core/base/option.lua b/xmake/core/base/option.lua
index b4f09f43c..ff969bcae 100644
--- a/xmake/core/base/option.lua
+++ b/xmake/core/base/option.lua
@@ -840,8 +840,8 @@ function option.show_logo()
 
     -- define footer
     local footer = [[
-    ${point_right}  ${bright}Manual${clear}: ${underline}http://xmake.io/#/home${clear}
-    ${pray}  ${bright}Donate${clear}: ${underline}http://xmake.io/pages/donation.html#donate${clear}
+    ${point_right}  ${bright}Manual${clear}: ${underline}https://xmake.io/#/home${clear}
+    ${pray}  ${bright}Donate${clear}: ${underline}https://xmake.io/pages/donation.html#donate${clear}
     ]]
 
     -- show footer
diff --git a/xmake/modules/core/tools/rc.lua b/xmake/modules/core/tools/rc.lua
index 4ff7a2faa..1ffcf2294 100644
--- a/xmake/modules/core/tools/rc.lua
+++ b/xmake/modules/core/tools/rc.lua
@@ -29,9 +29,6 @@ import("core.project.project")
 -- init it
 function init(self)
 
-    -- init mrcflags
-    _g.mrcflags = {"-nologo"}
-    
     -- init buildmodes
     _g.buildmodes = 
     {