From 2f40ca37df46e5f34f70d4644d2966fdb29ed8ab Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 3 Nov 2020 10:02:00 +0100 Subject: [PATCH 1/3] Update master version --- library.json | 2 +- library.properties | 2 +- lv_conf_template.h | 2 +- lvgl.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library.json b/library.json index e1b2f03d1..31a87f814 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "7.7.1", + "version": "7.7.2", "keywords": "graphics, gui, embedded, tft, lvgl", "description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.", "repository": { diff --git a/library.properties b/library.properties index ab875456a..3ddc574c3 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=7.7.1 +version=7.7.2 author=kisvegabor maintainer=kisvegabor,embeddedt,pete-pjb sentence=Full-featured Graphics Library for Embedded Systems diff --git a/lv_conf_template.h b/lv_conf_template.h index 6ff7b4aab..325b141bb 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v7.7.1-dev + * Configuration file for v7.7.2-dev */ /* diff --git a/lvgl.h b/lvgl.h index 73c1f713e..0f4e96983 100644 --- a/lvgl.h +++ b/lvgl.h @@ -16,8 +16,8 @@ extern "C" { ***************************/ #define LVGL_VERSION_MAJOR 7 #define LVGL_VERSION_MINOR 7 -#define LVGL_VERSION_PATCH 1 -#define LVGL_VERSION_INFO "" +#define LVGL_VERSION_PATCH 2 +#define LVGL_VERSION_INFO "dev" /********************* * INCLUDES From 92c75a6e8c5ab1c62f6ca337a2c9f0f4e5af15ac Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 3 Nov 2020 11:02:14 +0100 Subject: [PATCH 2/3] minor release script fixes --- scripts/release/com.py | 5 ++--- scripts/release/dev.py | 36 ++++++++++++++++++------------------ scripts/release/main.py | 3 ++- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/scripts/release/com.py b/scripts/release/com.py index d4abb2868..2bd77edd1 100755 --- a/scripts/release/com.py +++ b/scripts/release/com.py @@ -13,7 +13,7 @@ def cmd(c, ask_on_err = True): r = os.system(c) if r: print("### Error: " + str(r)) - if exit_on_err: + if ask_on_err: input("Press Enter to continue exectution...") def define_set(fn, name, value): @@ -77,8 +77,7 @@ def get_lvgl_version(br): return ver def push(c): - return - cmd(c) + cmd("git push " + c) def update_version(ver): ver_str = ver_format(ver) diff --git a/scripts/release/dev.py b/scripts/release/dev.py index 42cfd6a5e..9ce18c52d 100755 --- a/scripts/release/dev.py +++ b/scripts/release/dev.py @@ -7,7 +7,7 @@ from os import path from datetime import date import com -def lvgl_upadte_ver(ver, br): +def lvgl_update_ver(ver, br): os.chdir("./lvgl") com.cmd("git checkout " + br) @@ -45,26 +45,26 @@ def merge_dev_to_master(): def make(mode): - ver = com.get_lvgl_version("dev") - ver[3] = "dev" if(mode == "bugfix"): - ver[2] = ver[2] + 1 - lvgl_update_ver(ver, "master") - docs_update_ver(ver, "latest") + ver = com.get_lvgl_version("master") + ver[3] = "dev" + ver[2] = str(int(ver[2]) + 1) + lvgl_update_ver(ver, "master") + docs_update_ver(ver, "latest") else: - merge_dev_to_master() - if(mode == "major"): - ver[0] = str(int(ver[0]) + 1) - ver[1] = '0' - ver[2] = '0' - if(mode == "minor"): - ver[1] = str(int(ver[1]) + 1) - ver[2] = '0' + ver = com.get_lvgl_version("dev") + ver[3] = "dev" + merge_dev_to_master() + if(mode == "major"): + ver[0] = str(int(ver[0]) + 1) + ver[1] = '0' + ver[2] = '0' + if(mode == "minor"): + ver[1] = str(int(ver[1]) + 1) + ver[2] = '0' - lvgl_upadte_ver(ver, "dev") - docs_update_ver(ver, "dev") - - + lvgl_upadte_ver(ver, "dev") + docs_update_ver(ver, "dev") if __name__ == '__main__': if(len(sys.argv) != 2): diff --git a/scripts/release/main.py b/scripts/release/main.py index 8d329d471..e400eb159 100755 --- a/scripts/release/main.py +++ b/scripts/release/main.py @@ -43,7 +43,7 @@ def cleanup(): if __name__ == '__main__': prepare_type = ['major', 'minor', 'bugfix'] - dev_prepare = 'minor' + dev_prepare = 'bugfix' # if(len(sys.argv) != 2): # print("Missing argument. Usage ./release.py bugfix | minor | major") @@ -57,6 +57,7 @@ if __name__ == '__main__': clone_repos() release.make() + os.chdir(workdir) for p in proj_list: proj.make(p, True) From d110731409f9f9dd15a86ab007abfabd759c2872 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 3 Nov 2020 11:03:26 +0100 Subject: [PATCH 3/3] add v7.7.2 to changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f034cccb5..369488bd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## v7.7.2 (Planned to 28.11.2020) +### Bugfixes + ## v7.7.1 (04.11.2020) ### Bugfixes - Respect btnmatrix's `one_check` in `lv_btnmatrix_set_btn_ctrl`