[Bf-blender-cvs] [a0d9953] master: Fix netbeans project generator

Campbell Barton noreply at git.blender.org
Sat Oct 31 01:38:00 CET 2015


Commit: a0d9953841b156c0bfe4f99b245cb38c50005e29
Author: Campbell Barton
Date:   Sat Oct 31 08:26:22 2015 +1100
Branches: master
https://developer.blender.org/rBa0d9953841b156c0bfe4f99b245cb38c50005e29

Fix netbeans project generator

Need to escape defines

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

M	build_files/cmake/cmake_netbeans_project.py

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

diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py
index d4cce46..9ff9d85 100755
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -50,6 +50,8 @@ from os.path import join, dirname, normpath, relpath, exists
 
 
 def create_nb_project_main():
+    from xml.sax.saxutils import escape
+
     files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
     files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
     files_rel.sort()
@@ -207,8 +209,8 @@ def create_nb_project_main():
             build_cmd = "${MAKE} -f Makefile"
             clean_cmd = "${MAKE} -f Makefile clean"
 
-        f.write('          <buildCommand>%s</buildCommand>\n' % build_cmd)
-        f.write('          <cleanCommand>%s</cleanCommand>\n' % clean_cmd)
+        f.write('          <buildCommand>%s</buildCommand>\n' % escape(build_cmd))
+        f.write('          <cleanCommand>%s</cleanCommand>\n' % escape(clean_cmd))
         f.write('          <executablePath>./bin/blender</executablePath>\n')
         del build_cmd, clean_cmd
 
@@ -219,7 +221,7 @@ def create_nb_project_main():
             f.write('            </incDir>\n')
             f.write('            <preprocessorList>\n')
             for cdef in defines:
-                f.write('              <Elem>%s</Elem>\n' % cdef)
+                f.write('              <Elem>%s</Elem>\n' % escape(cdef))
             f.write('            </preprocessorList>\n')
 
         f.write('          <cTool>\n')




More information about the Bf-blender-cvs mailing list