Update netbeans project file generator

2 files changed, 10 insertions, 7 deletions

diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py
index 25d07373569..6575e8f8cf0 100755
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -131,9 +131,9 @@ def create_nb_project_main():
         f = open(join(PROJECT_DIR_NB, "configurations.xml"), 'w')
 
         f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-        f.write('<configurationDescriptor version="94">\n')
+        f.write('<configurationDescriptor version="95">\n')
         f.write('  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">\n')
-        f.write('    <df name="0" root="%s">\n' % SOURCE_DIR)  # base_root_rel
+        f.write('    <df root="%s" name="0">\n' % SOURCE_DIR)  # base_root_rel
 
         # write files!
         files_rel_local = [normpath(relpath(join(CMAKE_DIR, path), SOURCE_DIR)) for path in files_rel]
@@ -185,9 +185,11 @@ def create_nb_project_main():
 
         f.write('      <toolsSet>\n')
         f.write('        <compilerSet>default</compilerSet>\n')
+        f.write('        <dependencyChecking>false</dependencyChecking>\n')
+        f.write('        <rebuildPropChanged>false</rebuildPropChanged>\n')
         f.write('      </toolsSet>\n')
-        f.write('      <dependencyChecking>false</dependencyChecking>\n')
-        f.write('      <rebuildPropChanged>false</rebuildPropChanged>\n')
+        f.write('      <codeAssistance>\n')
+        f.write('      </codeAssistance>\n')
         f.write('      <makefileType>\n')
 
         f.write('        <makeTool>\n')
@@ -221,10 +223,11 @@ def create_nb_project_main():
         f.write('    \n')
 
         for path in files_rel_local:
+            is_c = path.endswith(".c")
             f.write('      <item path="%s"\n' % path)
             f.write('            ex="false"\n')
-            f.write('            tool="1"\n')
-            f.write('            flavor2="0">\n')
+            f.write('            tool="%d"\n' % (0 if is_c else 1))
+            f.write('            flavor2="%d">\n' % (3 if is_c else 0))
             f.write('      </item>\n')
 
         f.write('      <runprofile version="9">\n')
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py
index fcd4501f231..c9ea2497987 100755
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -130,7 +130,7 @@ def is_project_file(filename):
 
 
 def cmake_advanced_info():
-    """ Extracr includes and defines from cmake.
+    """ Extract includes and defines from cmake.
     """
 
     make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")