will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fontgen: assume plain .patch for single string patch

Browse Source
This commit is contained in:
Yehoshua Pesach Wallach 2022-04-27 18:25:03 +03:00 committed by JF
parent 8b2e1c69f2
commit 27e598f3fa
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/displayapp/fonts/fonts.json
View File

@ -12,7 +12,7 @@
], ],
"bpp": 1, "bpp": 1,
"size": 20, "size": 20,
"patches": [["patch", "{file}", "{file}_zero.patch"]] "patches": ["{file}_zero.patch"]
}, },
"jetbrains_mono_42": { "jetbrains_mono_42": {
"sources": [ "sources": [

15
src/displayapp/fonts/generate.py
View File

@ -66,11 +66,18 @@ def main():
subprocess.check_call(line) subprocess.check_call(line)
if patches: if patches:
for patch in patches: for patch in patches:
try: patch = patch.format(name=name, file=name+'.c') try:
# Try and patch, if given a string
patch = patch.format(name=name, file=name+'.c')
subprocess.check_call(['/usr/bin/patch', name+'.c', patch])
continue
except: pass except: pass
try: patch = [arg.format(name=name, file=name+'.c') for arg in patch] try:
except: pass # otherwise, assume a "advanced" patch, which is a list of strings.
subprocess.check_call(patch) patch = [arg.format(name=name, file=name+'.c') for arg in patch]
subprocess.check_call(patch)
except Exception as e:
sys.exit('Failed to patch using "{patch}"\n{err}'.format(patch=patch,err=e))