[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53632] trunk/blender/build_files/cmake: add error check for qtcreator&netbeans project file generators to quit early if cmake fails .
Campbell Barton
ideasman42 at gmail.com
Mon Jan 7 15:25:27 CET 2013
Revision: 53632
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53632
Author: campbellbarton
Date: 2013-01-07 14:25:26 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
add error check for qtcreator&netbeans project file generators to quit early if cmake fails.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_netbeans_project.py
trunk/blender/build_files/cmake/cmake_qtcreator_project.py
trunk/blender/build_files/cmake/project_info.py
Modified: trunk/blender/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_netbeans_project.py 2013-01-07 12:20:51 UTC (rev 53631)
+++ trunk/blender/build_files/cmake/cmake_netbeans_project.py 2013-01-07 14:25:26 UTC (rev 53632)
@@ -56,6 +56,10 @@
pass
else:
includes, defines = cmake_advanced_info()
+
+ if (includes, defines) == (None, None):
+ return
+
# for some reason it doesnt give all internal includes
includes = list(set(includes) | set(dirname(f) for f in files if is_c_header(f)))
includes.sort()
Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2013-01-07 12:20:51 UTC (rev 53631)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2013-01-07 14:25:26 UTC (rev 53632)
@@ -81,6 +81,9 @@
else:
includes, defines = cmake_advanced_info()
+ if (includes, defines) == (None, None):
+ return
+
# for some reason it doesnt give all internal includes
includes = list(set(includes) | set(os.path.dirname(f)
for f in files_rel if is_c_header(f)))
Modified: trunk/blender/build_files/cmake/project_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_info.py 2013-01-07 12:20:51 UTC (rev 53631)
+++ trunk/blender/build_files/cmake/project_info.py 2013-01-07 14:25:26 UTC (rev 53632)
@@ -149,14 +149,20 @@
raise Exception("Unknown make program %r" % make_exe)
os.system(cmd)
+ return join(CMAKE_DIR, ".cproject")
+
includes = []
defines = []
- create_eclipse_project()
+ project_path = create_eclipse_project()
+ if not exists(project_path):
+ print("Generating Eclipse Prokect File Failed: %r not found" % project_path)
+ return None, None
+
from xml.dom.minidom import parse
- tree = parse(join(CMAKE_DIR, ".cproject"))
+ tree = parse(project_path)
# to check on nicer xml
# f = open(".cproject_pretty", 'w')
More information about the Bf-blender-cvs
mailing list