added VERSION_FILE props
This commit is contained in:
parent
f2838a3cfe
commit
1a6c18aff1
|
@ -11,7 +11,7 @@ task('version', function()
|
||||||
task('inc_game_version', function()
|
task('inc_game_version', function()
|
||||||
{
|
{
|
||||||
global $GAME_ROOT;
|
global $GAME_ROOT;
|
||||||
$path_to_version = $GAME_ROOT . "/VERSION";
|
$path_to_version = $GAME_ROOT . getor('VERSION_FILE', "/VERSION");
|
||||||
ensure_write($path_to_version, get_inc_game_version());
|
ensure_write($path_to_version, get_inc_game_version());
|
||||||
git_try_commit($path_to_version, "inc version");
|
git_try_commit($path_to_version, "inc version");
|
||||||
});
|
});
|
||||||
|
@ -19,7 +19,7 @@ task('inc_game_version', function()
|
||||||
function game_version_full_str()
|
function game_version_full_str()
|
||||||
{
|
{
|
||||||
global $GAME_ROOT;
|
global $GAME_ROOT;
|
||||||
return trim(file($GAME_ROOT . "/VERSION")[0]);
|
return trim(file($GAME_ROOT . getor('VERSION_FILE', "/VERSION"))[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
function game_version()
|
function game_version()
|
||||||
|
@ -90,11 +90,9 @@ function get_version_file_lifetime()
|
||||||
{
|
{
|
||||||
global $GAME_ROOT;
|
global $GAME_ROOT;
|
||||||
|
|
||||||
exec("git log --follow --format=%ad --date=format:\"%Y-%m-%d %H:%M:%S\" " . $GAME_ROOT . "/VERSION" , $out, $ret);
|
exec("git log --follow --format=%ad --date=format:'%Y-%m-%d %H:%M:%S' " . $GAME_ROOT . getor('VERSION_FILE', "/VERSION") , $out, $ret);
|
||||||
|
|
||||||
if($ret != 0)
|
if($ret != 0)
|
||||||
throw new Exception("Can't get date from git.");
|
throw new Exception("git error");
|
||||||
|
|
||||||
$minutes = (time() - strtotime($out[0])) / 60;
|
$minutes = (time() - strtotime($out[0])) / 60;
|
||||||
|
|
||||||
return ceil($minutes);
|
return ceil($minutes);
|
||||||
|
|
Loading…
Reference in New Issue