diff options
| author | ruki <[email protected]> | 2018-08-28 23:44:33 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-08-28 16:27:21 +0800 |
| commit | bf54580b06b259017f4a925aff5a58823f04f845 (patch) | |
| tree | b6992472977c76c825f34b818d665897fac606b6 /core/src | |
| parent | b8d96694e9fae19c96a9579ccea4333522cc7f7f (diff) | |
improve to select version for package manager
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/xmake/semver/select.c | 16 | ||||
| -rw-r--r-- | core/src/xmake/semver/semver.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/src/xmake/semver/select.c b/core/src/xmake/semver/select.c index 54cd99831..7481485c8 100644 --- a/core/src/xmake/semver/select.c +++ b/core/src/xmake/semver/select.c @@ -112,7 +112,7 @@ static tb_bool_t xm_semver_select_from_branches(lua_State* lua, tb_int_t fromidx // no matches return tb_false; } -static tb_bool_t xm_semver_select_master_from_versions_tags(lua_State* lua, tb_int_t fromidx, semver_t* semver, semvers_t* matches) +static tb_bool_t xm_semver_select_lastest_from_versions_tags(lua_State* lua, tb_int_t fromidx, semver_t* semver, semvers_t* matches) { // clear matches semvers_pclear(matches); @@ -161,7 +161,7 @@ static tb_bool_t xm_semver_select_master_from_versions_tags(lua_State* lua, tb_i /* select version * - * local versioninfo, errors = semver.select(">=1.5.0 <1.6", {"1.5.0", "1.5.1"}, {"v1.5.0", ..}, {"master", "dev"}) + * local versioninfo, errors = semver.select(">=1.5.0 <1.6", {"1.5.0", "1.5.1"}, {"v1.5.0", ..}, {"lastest", "dev"}) */ tb_int_t xm_semver_select(lua_State* lua) { @@ -210,18 +210,18 @@ tb_int_t xm_semver_select(lua_State* lua) break; } - // select the lastest version from the tags and versions if be master - if (!tb_strcmp(range_str, "master")) + // select the lastest version from the tags and versions if be lastest + if (!tb_strcmp(range_str, "lastest")) { - // attempt to select master version from the versions list - if (xm_semver_select_master_from_versions_tags(lua, 2, &semver, &matches)) + // attempt to select lastest version from the versions list + if (xm_semver_select_lastest_from_versions_tags(lua, 2, &semver, &matches)) { ok = tb_true; break; } - // attempt to select master version from the tags list - if (xm_semver_select_master_from_versions_tags(lua, 3, &semver, &matches)) + // attempt to select lastest version from the tags list + if (xm_semver_select_lastest_from_versions_tags(lua, 3, &semver, &matches)) { ok = tb_true; break; diff --git a/core/src/xmake/semver/semver.c b/core/src/xmake/semver/semver.c index 2e417e019..323b96552 100644 --- a/core/src/xmake/semver/semver.c +++ b/core/src/xmake/semver/semver.c @@ -19,7 +19,7 @@ * Copyright (C) 2015 - 2018, TBOOX Open Source Group. * * @author uael - * @file semver->c + * @file semver.c * */ |