Fix CMake module generator (#98)

josesimoes · web-flow · commit fbac3574c7e1 · 2020-05-15T14:57:09.000+01:00
***NO_CI***
diff --git a/source/MetadataProcessor.Core/SkeletonGenerator/AssemblyClass.cs b/source/MetadataProcessor.Core/SkeletonGenerator/AssemblyClass.cs
@@ -64,4 +64,9 @@ public class ParameterDeclaration
         public string MarshallingDeclaration;
         public string Declaration;
     }
+
+    public class ClassWithStubs
+    {
+        public string Name;
+    }
 }
diff --git a/source/MetadataProcessor.Core/SkeletonGenerator/AssemblyClassTable.cs b/source/MetadataProcessor.Core/SkeletonGenerator/AssemblyClassTable.cs
@@ -15,5 +15,6 @@ public class AssemblyClassTable
         public bool IsInterop;
 
         public List<Class> Classes = new List<Class>();
+        public List<ClassWithStubs> ClassesWithStubs = new List<ClassWithStubs>();
     }
 }
diff --git a/source/MetadataProcessor.Core/SkeletonGenerator/SkeletonTemplates.cs b/source/MetadataProcessor.Core/SkeletonGenerator/SkeletonTemplates.cs
@@ -267,11 +267,11 @@ struct {{ClassName}}
 
     {{ProjectName}}.cpp
 {{#if IsInterop}}
-{{#each Classes}}
+{{#each ClassesWithStubs}}
     {{HeaderFileName}}_{{Name}}_mshl.cpp
     {{HeaderFileName}}_{{Name}}.cpp{{/each}}
 {{#else}}
-{{#each Classes}}
+{{#each ClassesWithStubs}}
     {{HeaderFileName}}_{{Name}}.cpp{{/each}}
 {{/if}}
 )
diff --git a/source/MetadataProcessor.Core/nanoSkeletonGenerator.cs b/source/MetadataProcessor.Core/nanoSkeletonGenerator.cs
@@ -7,6 +7,7 @@
 using Mustache;
 using nanoFramework.Tools.MetadataProcessor.Core.Extensions;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -76,6 +77,8 @@ public void GenerateSkeleton()
 
         private void GenerateStubs()
         {
+            var generatedFiles = new List<string>();
+
             var classList = new AssemblyClassTable
             {
                 AssemblyName = _tablesContext.AssemblyDefinition.Name.Name,
@@ -235,6 +238,12 @@ private void GenerateStubs()
                                 var output = generator.Render(classStubs);
                                 headerFile.Write(output);
                             }
+
+                            // add class to list of classes with stubs
+                            classList.ClassesWithStubs.Add(new ClassWithStubs()
+                            {
+                                Name = className
+                            });
                         }
                         else
                         {
@@ -269,6 +278,12 @@ private void GenerateStubs()
                                 var output = generator.Render(classStubs);
                                 headerFile.Write(output);
                             }
+
+                            // add class to list of classes with stubs
+                            classList.ClassesWithStubs.Add(new ClassWithStubs()
+                            {
+                                Name = className
+                            });
                         }
                     }
                 }
