mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-24 05:54:08 +00:00
Merge "feat(build): manage patch version in Makefile" into integration
This commit is contained in:
commit
d4a990b8f4
2 changed files with 6 additions and 2 deletions
|
@ -129,16 +129,19 @@ module.exports = {
|
|||
"readVersion": function (contents) {
|
||||
const major = contents.match(/^VERSION_MAJOR\s*:=\s*(\d+?)$/m)[1];
|
||||
const minor = contents.match(/^VERSION_MINOR\s*:=\s*(\d+?)$/m)[1];
|
||||
const patch = contents.match(/^VERSION_PATCH\s*:=\s*(\d+?)$/m)[1];
|
||||
|
||||
return `${major}.${minor}.0`;
|
||||
return `${major}.${minor}.${patch}`;
|
||||
},
|
||||
|
||||
"writeVersion": function (contents, version) {
|
||||
const major = version.split(".")[0];
|
||||
const minor = version.split(".")[1];
|
||||
const patch = version.split(".")[2];
|
||||
|
||||
contents = contents.replace(/^(VERSION_MAJOR\s*:=\s*)(\d+?)$/m, `$1${major}`);
|
||||
contents = contents.replace(/^(VERSION_MINOR\s*:=\s*)(\d+?)$/m, `$1${minor}`);
|
||||
contents = contents.replace(/^(VERSION_PATCH\s*:=\s*)(\d+?)$/m, `$1${patch}`);
|
||||
|
||||
return contents;
|
||||
}
|
||||
|
|
3
Makefile
3
Makefile
|
@ -9,7 +9,8 @@
|
|||
#
|
||||
VERSION_MAJOR := 2
|
||||
VERSION_MINOR := 9
|
||||
VERSION := ${VERSION_MAJOR}.${VERSION_MINOR}
|
||||
VERSION_PATCH := 0
|
||||
VERSION := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
|
||||
|
||||
# Default goal is build all images
|
||||
.DEFAULT_GOAL := all
|
||||
|
|
Loading…
Add table
Reference in a new issue