mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 16:08:04 +02:00
intel/genxml: drop sort_xml.sh and move the loop directly in gen_sort_tags.py
Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5353>
This commit is contained in:
parent
c67ef7695a
commit
a874132cc4
3 changed files with 12 additions and 19 deletions
|
|
@ -64,7 +64,7 @@ Keeping genxml files tidy :
|
|||
In order to spot differences easily between generations, we keep genxml files sorted.
|
||||
You can trigger the sort by running :
|
||||
|
||||
$ cd src/intel/genxml; ./sort_xml.sh
|
||||
$ cd src/intel/genxml; ./gen_sort_tags.py
|
||||
|
||||
gen_sort_tags.py is the script that sorts genxml files using with
|
||||
the following rules :
|
||||
|
|
|
|||
21
src/intel/genxml/gen_sort_tags.py
Normal file → Executable file
21
src/intel/genxml/gen_sort_tags.py
Normal file → Executable file
|
|
@ -1,3 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#encoding=utf-8
|
||||
#
|
||||
# Copyright © 2019 Intel Corporation
|
||||
|
|
@ -25,8 +26,8 @@
|
|||
from __future__ import print_function
|
||||
from collections import OrderedDict
|
||||
import os
|
||||
import pathlib
|
||||
import re
|
||||
import sys
|
||||
import xml.etree.cElementTree as et
|
||||
|
||||
def get_filename(element):
|
||||
|
|
@ -125,12 +126,7 @@ def print_node(f, offset, node):
|
|||
f.write('/>\n')
|
||||
|
||||
|
||||
def main():
|
||||
if len(sys.argv) < 2:
|
||||
print("No input xml file specified")
|
||||
sys.exit(1)
|
||||
|
||||
filename = sys.argv[1]
|
||||
def process(filename):
|
||||
xml = et.parse(filename)
|
||||
genxml = xml.getroot()
|
||||
|
||||
|
|
@ -169,9 +165,14 @@ def main():
|
|||
|
||||
genxml[:] = enums + sorted_structs.values() + instructions + registers
|
||||
|
||||
print('<?xml version="1.0" ?>')
|
||||
print_node(sys.stdout, 0, genxml)
|
||||
with open(filename, 'w') as f:
|
||||
f.write('<?xml version="1.0" ?>\n')
|
||||
print_node(f, 0, genxml)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
folder = pathlib.Path('.')
|
||||
for f in folder.glob('*.xml'):
|
||||
print('Processing {}... '.format(f), end='', flush=True)
|
||||
process(f)
|
||||
print('done.')
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
for i in ./*.xml; do
|
||||
echo -n "Processing $i... "
|
||||
python ./gen_sort_tags.py $i > $i.tmp
|
||||
mv $i.tmp $i
|
||||
echo "done."
|
||||
done
|
||||
Loading…
Add table
Reference in a new issue