From cca3ccaebbb3319c00ddf86a7ded83cb024d4ffb Mon Sep 17 00:00:00 2001 From: Nick Sanders Date: Fri, 11 Mar 2011 22:20:48 -0800 Subject: Don't modify fv old-style bitmaps * Just make new "bmp" files as necessary BUG=chrome-os-partner:2558 TEST=runs as expected Change-Id: I3046630ea3e3f0a40429bb63a986c6044b83c6a6 Review URL: http://codereview.chromium.org/6623008 (cherry picked from commit d221f223bdf97912101747d029403053dadf6da5) Review URL: http://codereview.chromium.org/6686025 --- scripts/newbitmaps/make_bmp_from_components.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/newbitmaps/make_bmp_from_components.py b/scripts/newbitmaps/make_bmp_from_components.py index ad4c3d4e..dffe1eda 100755 --- a/scripts/newbitmaps/make_bmp_from_components.py +++ b/scripts/newbitmaps/make_bmp_from_components.py @@ -49,6 +49,8 @@ def ProcessDir(directory): re_bmp = re.compile(r'\'data_bitmap_fv\': \[\'(?P.*)\'\],') re_hwid = re.compile(r'\'part_id_hwqual\': \[\'(?P.*)\'\],') re_geom = re.compile(r'\'data_display_geometry\': \[\'(?P.*)\'\],') + # Old bitmap style + re_fv = re.compile(r'.*\.fv') # Find the components files. files = glob.glob(os.path.join(directory, "data_*/components_*")) @@ -74,8 +76,11 @@ def ProcessDir(directory): if not ( bmp and hwid and geom): print "Corrupt HWID configuration" sys.exit(1) - print "HWID: %s, %s, %s" % (hwid, geom, bmp) - MakeBmp(hwid, geom, bmp, directory) + if re_fv.match(bmp): + print "HWID: %s, %s, %s (skipping old style bitmap)" % (hwid, geom, bmp) + else: + print "HWID: %s, %s, %s" % (hwid, geom, bmp) + MakeBmp(hwid, geom, bmp, directory) def main(): directory = os.path.abspath(sys.argv[1]) -- cgit v1.2.1