mirror of
https://github.com/lvgl/lvgl.git
synced 2025-01-14 06:42:58 +08:00
Merge faf50714a12a93c981b02be7e139c3a26a0c89b2 into dev
This commit is contained in:
commit
6f312e34e3
@ -108,10 +108,6 @@ def clone_repos():
|
|||||||
cmd("mkdir " + workdir)
|
cmd("mkdir " + workdir)
|
||||||
os.chdir(workdir)
|
os.chdir(workdir)
|
||||||
|
|
||||||
#For debuging just copy the repos
|
|
||||||
#cmd("cp -a ../repos/. .")
|
|
||||||
#return
|
|
||||||
|
|
||||||
cmd("git clone " + upstream("lvgl") + "; cd lvgl; git checkout master; git remote update origin --prune; ")
|
cmd("git clone " + upstream("lvgl") + "; cd lvgl; git checkout master; git remote update origin --prune; ")
|
||||||
cmd("git clone " + upstream("lv_examples") + "; cd lv_examples; git checkout master; git remote update origin --prune; ")
|
cmd("git clone " + upstream("lv_examples") + "; cd lv_examples; git checkout master; git remote update origin --prune; ")
|
||||||
cmd("git clone " + upstream("lv_drivers") + "; cd lv_drivers; git checkout master; git remote update origin --prune; ")
|
cmd("git clone " + upstream("lv_drivers") + "; cd lv_drivers; git checkout master; git remote update origin --prune; ")
|
||||||
@ -452,7 +448,7 @@ def cleanup():
|
|||||||
cmd("rm -fr " + workdir)
|
cmd("rm -fr " + workdir)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
dev_prepare = 'bugfix'
|
dev_prepare = 'minor'
|
||||||
if(len(sys.argv) != 2):
|
if(len(sys.argv) != 2):
|
||||||
print("Missing argument. Usage ./release.py bugfix | minor | major")
|
print("Missing argument. Usage ./release.py bugfix | minor | major")
|
||||||
print("Use minor by deafult")
|
print("Use minor by deafult")
|
||||||
@ -482,6 +478,10 @@ if __name__ == '__main__':
|
|||||||
publish_master()
|
publish_master()
|
||||||
|
|
||||||
projs_update()
|
projs_update()
|
||||||
|
dev_ver_major = "7"
|
||||||
|
dev_ver_minor = "7"
|
||||||
|
dev_ver_patch = "0"
|
||||||
|
dev_ver_str = "v7.7.0"
|
||||||
|
|
||||||
if dev_prepare == 'bugfix':
|
if dev_prepare == 'bugfix':
|
||||||
ver_patch = str(int(ver_patch) + 1)
|
ver_patch = str(int(ver_patch) + 1)
|
||||||
@ -493,15 +493,14 @@ if __name__ == '__main__':
|
|||||||
docs_update_latest_version()
|
docs_update_latest_version()
|
||||||
|
|
||||||
else:
|
else:
|
||||||
#merge_from_dev()
|
merge_from_dev()
|
||||||
|
|
||||||
get_lvgl_version("master")
|
|
||||||
|
|
||||||
if dev_prepare == 'minor':
|
if dev_prepare == 'minor':
|
||||||
ver_minor = str(int(ver_minor) + 1)
|
ver_major = dev_ver_major
|
||||||
|
ver_minor = str(int(dev_ver_minor) + 1)
|
||||||
ver_patch = "0"
|
ver_patch = "0"
|
||||||
else:
|
else:
|
||||||
ver_major = str(int(ver_major) + 1)
|
ver_major = str(int(dev_ver_major) + 1)
|
||||||
ver_minor = "0"
|
ver_minor = "0"
|
||||||
ver_patch = "0"
|
ver_patch = "0"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user