From 7fc25a8f8f1f1c91e30db50f68f2c8a2d5aa1ea9 Mon Sep 17 00:00:00 2001 From: ck Date: Mon, 1 Mar 2021 18:05:21 +0800 Subject: [PATCH] fix: gerrit build error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当版本号出现类似5.4.4+r009时,VER_BUI=009被判断成8进制,此处转成10进制去掉0 Log: 修复gerrit构建出错的问题 Change-Id: I3555543bd28e0681a838738aa35df4581a462d28 --- dtk_build_config.prf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dtk_build_config.prf b/dtk_build_config.prf index dd6a1ac..18ce436 100644 --- a/dtk_build_config.prf +++ b/dtk_build_config.prf @@ -33,18 +33,20 @@ message("build dtk with version $$VERSION") ver_list = $$split(VERSION, .) isEmpty(VER_MAJ) { - VER_MAJ = $$first(ver_list) + VER_MAJ = $$format_number($$first(ver_list), ibase=10) } isEmpty(VER_MIN) { - VER_MIN = $$member(ver_list, 1, 1) + VER_MIN = $$format_number($$member(ver_list, 1, 1), ibase=10) isEmpty(VER_MIN):VER_MIN = 0 } isEmpty(VER_PAT) { - VER_PAT = $$member(ver_list, 2, 2) + VER_PAT = $$format_number($$member(ver_list, 2, 2), ibase=10) isEmpty(VER_PAT):VER_PAT = 0 } isEmpty(VER_BUI) { VER_BUI = $$member(ver_list, 3, 3) + # fix VER_BUI=009, invalid digit "9" in octal constant error + VER_BUI = $$format_number($$VER_BUI, ibase=10) isEmpty(VER_BUI):VER_BUI = 0 }