[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33653] trunk/blender/build_files/cmake/ cmake_consistency_check.py: update for changes in cmake files.

Campbell Barton ideasman42 at gmail.com
Tue Dec 14 09:35:58 CET 2010


Revision: 33653
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33653
Author:   campbellbarton
Date:     2010-12-14 09:35:56 +0100 (Tue, 14 Dec 2010)

Log Message:
-----------
update for changes in cmake files.

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	2010-12-14 06:20:28 UTC (rev 33652)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py	2010-12-14 08:35:56 UTC (rev 33653)
@@ -30,11 +30,14 @@
     "/ik_glut_test/"
 
 import os
-from os.path import join, dirname, normpath
+from os.path import join, dirname, normpath, abspath
 
-base = join(os.getcwd(), "..", "..")
+base = join(os.path.dirname(__file__), "..", "..")
 base = normpath(base)
+base = abspath(base)
 
+print("Scanning:", base)
+
 global_h = set()
 global_c = set()
 
@@ -76,7 +79,7 @@
     sources_h = []
     sources_c = []
     
-    filen = open(f, "r")
+    filen = open(f, "r", encoding="utf8")
     it = iter(filen)
     found = False
     i = 0
@@ -91,15 +94,15 @@
                 break
             l = l.strip()
             if not l.startswith("#"):
-                if 'SET(SRC' in l or ('SET(' in l and l.endswith("SRC")):
+                if 'set(SRC' in l or ('set(' in l and l.endswith("SRC")):
                     if len(l.split()) > 1:
-                        raise Exception("strict formatting not kept 'SET(SRC*' %s:%d" % (f, i))
+                        raise Exception("strict formatting not kept 'set(SRC*' %s:%d" % (f, i))
                     found = True
                     break
                 
-                if "LIST(APPEND SRC" in l:
+                if "list(APPEND SRC" in l:
                     if l.endswith(")"):
-                        raise Exception("strict formatting not kept 'LIST(APPEND SRC...)' on 1 line %s:%d" % (f, i))
+                        raise Exception("strict formatting not kept 'list(APPEND SRC...)' on 1 line %s:%d" % (f, i))
                     found = True
                     break
 





More information about the Bf-blender-cvs mailing list