[Bf-blender-cvs] [47faf61] master: Fix project-file generators (didn't close files)

[Campbell Barton]

Commit: 47faf618a6ff220ad88798b4ab84fb542cf1362c
Author: Campbell Barton
Date:   Thu Oct 30 18:24:57 2014 +0100
Branches: master
https://developer.blender.org/rB47faf618a6ff220ad88798b4ab84fb542cf1362c

Fix project-file generators (didn't close files)

===================================================================

M	build_files/cmake/cmake_netbeans_project.py
M	build_files/cmake/cmake_qtcreator_project.py

===================================================================

diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py
index fc6c64d..81b1a46 100755
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -125,6 +125,8 @@ def create_nb_project_main():
         f.write('    </configuration>\n')
         f.write('</project>\n')
 
+        f.close()
+
         f = open(join(PROJECT_DIR_NB, "configurations.xml"), 'w')
 
         f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
@@ -243,6 +245,8 @@ def create_nb_project_main():
 
         f.write('</configurationDescriptor>\n')
 
+        f.close()
+
 
 def main():
     create_nb_project_main()
diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py
index 346f5ea..59b8c7e 100755
--- a/build_files/cmake/cmake_qtcreator_project.py
+++ b/build_files/cmake/cmake_qtcreator_project.py
@@ -63,21 +63,21 @@ def create_qtc_project_main():
     if SIMPLE_PROJECTFILE:
         # --- qtcreator specific, simple format
         PROJECT_NAME = "Blender"
-        f = open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
-        f.write("\n".join(files_rel))
+        with open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w') as f:
+            f.write("\n".join(files_rel))
 
-        f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
-        f.write("\n".join(sorted(list(set(os.path.dirname(f)
-                          for f in files_rel if is_c_header(f))))))
+        with open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w') as f:
+            f.write("\n".join(sorted(list(set(os.path.dirname(f)
+                              for f in files_rel if is_c_header(f))))))
 
         qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
-        f = open(qtc_prj, 'w')
-        f.write("[General]\n")
+        with open(qtc_prj, 'w') as f:
+            f.write("[General]\n")
 
         qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
         if not os.path.exists(qtc_cfg):
-            f = open(qtc_cfg, 'w')
-            f.write("// ADD PREDEFINED MACROS HERE!\n")
+            with open(qtc_cfg, 'w') as f:
+                f.write("// ADD PREDEFINED MACROS HERE!\n")
     else:
         includes, defines = cmake_advanced_info()
 
@@ -96,29 +96,30 @@ def create_qtc_project_main():
             PROJECT_NAME = project_name_get()
 
         FILE_NAME = PROJECT_NAME.lower()
-        f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
-        f.write("\n".join(files_rel))
+        with open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w') as f:
+            f.write("\n".join(files_rel))
 
-        f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w', encoding='utf-8')
-        f.write("\n".join(sorted(includes)))
+        with open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w', encoding='utf-8') as f:
+            f.write("\n".join(sorted(includes)))
 
         qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
-        f = open(qtc_prj, 'w')
-        f.write("[General]\n")
+        with open(qtc_prj, 'w') as f:
+            f.write("[General]\n")
 
         qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
-        f = open(qtc_cfg, 'w')
-        f.write("// ADD PREDEFINED MACROS TO %s_custom.config!\n" % FILE_NAME)
-        qtc_custom_cfg = os.path.join(PROJECT_DIR, "%s_custom.config" % FILE_NAME)
-        if os.path.exists(qtc_custom_cfg):
-            fc = open(qtc_custom_cfg, 'r')
-            f.write(fc.read())
-            fc.close()
-            f.write("\n")
-        defines_final = [("#define %s %s" % (item[0], quote_define(item[1]))) for item in defines]
-        if sys.platform != "win32":
-            defines_final += cmake_compiler_defines()
-        f.write("\n".join(defines_final))
+        with open(qtc_cfg, 'w') as f:
+            f.write("// ADD PREDEFINED MACROS TO %s_custom.config!\n" % FILE_NAME)
+
+            qtc_custom_cfg = os.path.join(PROJECT_DIR, "%s_custom.config" % FILE_NAME)
+            if os.path.exists(qtc_custom_cfg):
+                with open(qtc_custom_cfg, 'r') as fc:
+                    f.write(fc.read())
+                    f.write("\n")
+
+            defines_final = [("#define %s %s" % (item[0], quote_define(item[1]))) for item in defines]
+            if sys.platform != "win32":
+                defines_final += cmake_compiler_defines()
+            f.write("\n".join(defines_final))
 
     print("Blender project file written to: %r" % qtc_prj)
     # --- end
@@ -137,17 +138,17 @@ def create_qtc_project_python():
         PROJECT_NAME = project_name_get() + "_Python"
 
     FILE_NAME = PROJECT_NAME.lower()
-    f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
-    f.write("\n".join(files_rel))
+    with open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w') as f:
+        f.write("\n".join(files_rel))
 
     qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
-    f = open(qtc_prj, 'w')
-    f.write("[General]\n")
+    with open(qtc_prj, 'w') as f:
+        f.write("[General]\n")
 
     qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
     if not os.path.exists(qtc_cfg):
-        f = open(qtc_cfg, 'w')
-        f.write("// ADD PREDEFINED MACROS HERE!\n")
+        with open(qtc_cfg, 'w') as f:
+            f.write("// ADD PREDEFINED MACROS HERE!\n")
 
     print("Python project file written to:  %r" % qtc_prj)