diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 18:25:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 18:25:26 +0400 |
commit | d22c8cfca39d3f55447bc54870f6984edf1ae3c2 (patch) | |
tree | a2eb862ac81056e881c1e8fda6ddd81cdfde1dcc /build_files | |
parent | c598a306c4422db483d122cbdcea54c1baf60d11 (diff) |
add error check for qtcreator&netbeans project file generators to quit early if cmake fails.
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/cmake/cmake_netbeans_project.py | 4 | ||||
-rwxr-xr-x | build_files/cmake/cmake_qtcreator_project.py | 3 | ||||
-rwxr-xr-x | build_files/cmake/project_info.py | 10 |
3 files changed, 15 insertions, 2 deletions
diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py index 2f36cad4d24..17490e36bb3 100755 --- a/build_files/cmake/cmake_netbeans_project.py +++ b/build_files/cmake/cmake_netbeans_project.py @@ -56,6 +56,10 @@ def create_nb_project_main(): 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() diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py index 86201da23de..4cf854aad77 100755 --- a/build_files/cmake/cmake_qtcreator_project.py +++ b/build_files/cmake/cmake_qtcreator_project.py @@ -81,6 +81,9 @@ def create_qtc_project_main(): 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))) diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index 495ca71263e..e73b94a7051 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -149,14 +149,20 @@ def cmake_advanced_info(): 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') |