Revision: 34485
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34485
Author: campbellbarton
Date: 2011-01-25 08:35:10 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
cmake maintenance, was missing 2 headers and made some minor improvements to
cmake_consistency_check.py.
also converted GHOST_SystemWin32.cpp to utf8.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_consistency_check.py
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py 2011-01-25
07:31:11 UTC (rev 34484)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py 2011-01-25
08:35:10 UTC (rev 34485)
@@ -128,6 +128,10 @@
raise Exception("strict formatting not kept '*)'
%s:%d" % (f, i))
break
+ # replace dirs
+ l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
+
+
if not l:
pass
elif l.startswith("$"):
@@ -202,11 +206,14 @@
import traceback
for files in (global_c, global_h):
for f in sorted(files):
- i = 1
- try:
- for l in open(f, "r", encoding="utf8"):
- i += 1
- except:
- print("Non utf8: %s:%d" % (f, i))
- if i > 1:
- traceback.print_exc()
+ if os.path.exists(f):
+ # ignore outside of our source tree
+ if "extern" not in f:
+ i = 1
+ try:
+ for l in open(f, "r", encoding="utf8"):
+ i += 1
+ except:
+ print("Non utf8: %s:%d" % (f, i))
+ if i > 1:
+ traceback.print_exc()
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2011-01-25 07:31:11 UTC (rev
34484)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2011-01-25 08:35:10 UTC (rev
34485)
@@ -55,6 +55,7 @@
GHOST_IEvent.h
GHOST_IEventConsumer.h
GHOST_ISystem.h
+ GHOST_ISystemPaths.h
GHOST_ITimerTask.h
GHOST_IWindow.h
GHOST_Path-api.h
@@ -78,6 +79,7 @@
intern/GHOST_ModifierKeys.h
intern/GHOST_NDOFManager.h
intern/GHOST_System.h
+ intern/GHOST_SystemPaths.h
intern/GHOST_TimerManager.h
intern/GHOST_TimerTask.h
intern/GHOST_Window.h
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2011-01-25
07:31:11 UTC (rev 34484)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2011-01-25
08:35:10 UTC (rev 34485)
@@ -871,7 +871,7 @@
* specifies a character code generated
by a dead key. A dead key is a key that
* generates a character, such as the
umlaut (double-dot), that is combined with
* another character to form a
composite character. For example, the umlaut-O
- * character (\xD6) is generated by
typing the dead key for the umlaut character, and
+ * character (Ö) is generated by typing
the dead key for the umlaut character, and
* then typing the O key.
*/
case WM_SYSDEADCHAR:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
