diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-29 11:58:03 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-29 11:58:03 +0400 |
commit | 24def76ac899e106b4a04364504ba0cbc100d7f7 (patch) | |
tree | 150a4593cbd3054ab5f10df2ccda6a0fb0c82cd9 /build_files | |
parent | d55f6c64a24c9e8e46f2a7d33da17aff24ce6d1a (diff) |
svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/cmake/cmake_consistency_check.py | 12 | ||||
-rwxr-xr-x | build_files/cmake/cmake_netbeans_project.py | 13 | ||||
-rwxr-xr-x | build_files/cmake/cmake_qtcreator_project.py | 12 |
3 files changed, 29 insertions, 8 deletions
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index 4b35e34a5cd..ba71603b007 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -42,9 +42,9 @@ def replace_line(f, i, text, keep_indent=True): l = data[i] ws = l[:len(l) - len(l.lstrip())] - + data[i] = "%s%s\n" % (ws, text) - + file_handle = open(f, 'w') file_handle.writelines(data) file_handle.close() @@ -182,13 +182,13 @@ def cmake_get_src(f): if new_path_rel != l: print("overly relative path:\n %s:%d\n %s\n %s" % (f, i, l, new_path_rel)) - + ## Save time. just replace the line # replace_line(f, i - 1, new_path_rel) - + else: raise Exception("non existant include %s:%d -> %s" % (f, i, new_file)) - + # print(new_file) global_h.update(set(sources_h)) @@ -206,7 +206,7 @@ def cmake_get_src(f): if ff not in sources_c: print(" missing: " + ff) ''' - + # reset sources_h[:] = [] sources_c[:] = [] diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py index 6afca8f3b6a..8060574580c 100755 --- a/build_files/cmake/cmake_netbeans_project.py +++ b/build_files/cmake/cmake_netbeans_project.py @@ -30,7 +30,18 @@ Example linux usage Windows not supported so far """ -from project_info import * +from project_info import (SIMPLE_PROJECTFILE, + SOURCE_DIR, + CMAKE_DIR, + PROJECT_DIR, + source_list, + is_project_file, + is_c_header, + is_py, + cmake_advanced_info, + cmake_compiler_defines, + ) + import os from os.path import join, dirname, normpath, relpath, exists diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py index 3de15567727..d8993c3197a 100755 --- a/build_files/cmake/cmake_qtcreator_project.py +++ b/build_files/cmake/cmake_qtcreator_project.py @@ -31,7 +31,17 @@ example linux usage python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake """ -from project_info import * +from project_info import (SIMPLE_PROJECTFILE, + SOURCE_DIR, + CMAKE_DIR, + PROJECT_DIR, + source_list, + is_project_file, + is_c_header, + is_py, + cmake_advanced_info, + cmake_compiler_defines, + ) import os import sys |