diff options
| author | ruki <[email protected]> | 2016-05-23 10:40:50 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-05-23 10:40:50 +0800 |
| commit | c8454a31c38bbf25b56d0dd4a9a7c8d71ca59419 (patch) | |
| tree | 126433106bc622ee8671f73aaf1fb5870c9427b9 /xmake/core | |
| parent | 273e6abaea05b469bdb10b5cce57ff064886fe52 (diff) | |
impl run action
Diffstat (limited to 'xmake/core')
| -rw-r--r-- | xmake/core/_xmake_main.lua | 1 | ||||
| -rw-r--r-- | xmake/core/project/cache.lua | 4 | ||||
| -rw-r--r-- | xmake/core/project/config.lua | 2 | ||||
| -rw-r--r-- | xmake/core/project/global.lua | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/xmake/core/_xmake_main.lua b/xmake/core/_xmake_main.lua index 77e27f9e8..2289b9141 100644 --- a/xmake/core/_xmake_main.lua +++ b/xmake/core/_xmake_main.lua @@ -27,6 +27,7 @@ xmake._HOST = _HOST xmake._ARCH = _ARCH xmake._NULDEV = _NULDEV xmake._VERSION = _VERSION +xmake._VERSION_SHORT = _VERSION_SHORT xmake._PROGRAM_DIR = _PROGRAM_DIR xmake._PROJECT_DIR = _PROJECT_DIR xmake._CORE_DIR = _PROGRAM_DIR .. "/core" diff --git a/xmake/core/project/cache.lua b/xmake/core/project/cache.lua index 9a7491aed..5ea212dfc 100644 --- a/xmake/core/project/cache.lua +++ b/xmake/core/project/cache.lua @@ -67,7 +67,7 @@ function cache._instance(scopename) if results then instance._CACHEDATA = results end - instance._CACHEDATA = instance._CACHEDATA or {__version = xmake._VERSION} + instance._CACHEDATA = instance._CACHEDATA or {__version = xmake._VERSION_SHORT} -- save instance instances[scopename] = instance @@ -94,7 +94,7 @@ end function cache:clear() -- clear it - self._CACHEDATA = {__version = xmake._VERSION} + self._CACHEDATA = {__version = xmake._VERSION_SHORT} end -- flush to cache file diff --git a/xmake/core/project/config.lua b/xmake/core/project/config.lua index a79292bea..a732baed3 100644 --- a/xmake/core/project/config.lua +++ b/xmake/core/project/config.lua @@ -149,7 +149,7 @@ function config.save(targetname) end -- add version - results.__version = xmake._VERSION + results.__version = xmake._VERSION_SHORT -- update options for the given target local target = nil diff --git a/xmake/core/project/global.lua b/xmake/core/project/global.lua index 9d72e73c1..4649139b5 100644 --- a/xmake/core/project/global.lua +++ b/xmake/core/project/global.lua @@ -123,7 +123,7 @@ function global.save() assert(options) -- add version - options.__version = xmake._VERSION + options.__version = xmake._VERSION_SHORT -- save it return io.save(global._file(), options) |