[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37443] trunk/blender/build_files/cmake/ cmake_consistency_check.py: minor updates to the cmake checker

Campbell Barton ideasman42 at gmail.com
Mon Jun 13 05:09:15 CEST 2011


Revision: 37443
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37443
Author:   campbellbarton
Date:     2011-06-13 03:09:14 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
minor updates to the cmake checker

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_consistency_check.py

Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py	2011-06-13 00:02:23 UTC (rev 37442)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py	2011-06-13 03:09:14 UTC (rev 37443)
@@ -23,15 +23,16 @@
 
 # <pep8 compliant>
 
-IGNORE = \
-    "/test/",\
-    "/decimate_glut_test/",\
-    "/BSP_GhostTest/",\
-    "/release/",\
-    "/xembed/",\
-    "/decimation/intern/future/",\
-    "/TerraplayNetwork/",\
-    "/ik_glut_test/"
+IGNORE = (
+    "/test/",
+    "/decimate_glut_test/",
+    "/BSP_GhostTest/",
+    "/release/",
+    "/xembed/",
+    "/decimation/intern/future/",
+    "/TerraplayNetwork/",
+    "/ik_glut_test/",
+    )
 
 import os
 from os.path import join, dirname, normpath, abspath, splitext
@@ -104,7 +105,7 @@
                     found = True
                     break
 
-                if "list(APPEND SRC" in l:
+                if "list(APPEND SRC" in l or ('list(APPEND ' in l and l.endswith("SRC")):
                     if l.endswith(")"):
                         raise Exception("strict formatting not kept 'list(APPEND SRC...)' on 1 line %s:%d" % (f, i))
                     found = True
@@ -136,7 +137,9 @@
                     if not l:
                         pass
                     elif l.startswith("$"):
-                        print("Cant use var '%s' %s:%d" % (l, f, i))
+                        # assume if it ends with SRC we know about it
+                        if not l.split("}")[0].endswith("SRC"):
+                            print("Can't use var '%s' %s:%d" % (l, f, i))
                     elif len(l.split()) > 1:
                         raise Exception("Multi-line define '%s' %s:%d" % (l, f, i))
                     else:




More information about the Bf-blender-cvs mailing list