Define pocketmine\BUILD_NUMBER from phar metadata

this way we don't have to patch the code (no idea why we were doing that anyway).
This commit is contained in:
Dylan K. Taylor
2021-11-26 22:27:58 +00:00
parent f2540a72ad
commit 71b813d4f9
6 changed files with 25 additions and 13 deletions

View File

@ -212,10 +212,8 @@ JIT_WARNING
set_error_handler([Utils::class, 'errorExceptionHandler']);
$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
define('pocketmine\VERSION', $version->getFullVersion(true));
$gitHash = str_repeat("00", 20);
$buildNumber = 0;
if(\Phar::running(true) === ""){
$gitHash = Git::getRepositoryStatePretty(\pocketmine\PATH);
@ -225,9 +223,16 @@ JIT_WARNING
if(isset($meta["git"])){
$gitHash = $meta["git"];
}
if(isset($meta["build"]) && is_int($meta["build"])){
$buildNumber = $meta["build"];
}
}
define('pocketmine\GIT_COMMIT', $gitHash);
define('pocketmine\BUILD_NUMBER', $buildNumber);
$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
define('pocketmine\VERSION', $version->getFullVersion(true));
$composerGitHash = InstalledVersions::getReference('pocketmine/pocketmine-mp');
if($composerGitHash !== null){

View File

@ -35,5 +35,4 @@ const _VERSION_INFO_INCLUDED = true;
const NAME = "PocketMine-MP";
const BASE_VERSION = "3.25.5";
const IS_DEVELOPMENT_BUILD = true;
const BUILD_NUMBER = 0;
const BUILD_CHANNEL = "stable";