Fixed a number of errors in generated outputs.

OPCFoundation · Jan 27, 2023 · c7a9be1 · c7a9be1
1 parent a2d7913
commit c7a9be1
Show file tree

Hide file tree

Showing 15 changed files with 706 additions and 491 deletions.
diff --git a/ModelCompiler Solution Debug.sln b/ModelCompiler Solution Debug.sln
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
 		BuildEngineeringUnits.bat = BuildEngineeringUnits.bat
 		BuildStandardTypes.bat = BuildStandardTypes.bat
 		CompileNodeSets.bat = CompileNodeSets.bat
+		PublishNodeSet.bat = PublishNodeSet.bat
 		TestNodeSets.bat = TestNodeSets.bat
 		UpdateLicense.bat = UpdateLicense.bat
 	EndProjectSection

diff --git a/ModelCompiler Solution.sln b/ModelCompiler Solution.sln
@@ -9,7 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
 	ProjectSection(SolutionItems) = preProject
 		BuildEngineeringUnits.bat = BuildEngineeringUnits.bat
 		BuildStandardTypes.bat = BuildStandardTypes.bat
+		CompileNodeSets.bat = CompileNodeSets.bat
 		PublishModel.bat = PublishModel.bat
+		PublishNodeSet.bat = PublishNodeSet.bat
 		UpdateLicense.bat = UpdateLicense.bat
 	EndProjectSection
 EndProject

diff --git a/Opc.Ua.ModelCompiler/ModelCompilerApplication.cs b/Opc.Ua.ModelCompiler/ModelCompilerApplication.cs
@@ -20,7 +20,7 @@ public static void Run(string[] args)
             app.Command("compile", (e) => Compile(e));
             app.Command("units", (e) => Units(e));
             app.Command("update-headers", (e) => UpdateHeaders(e));
-            app.Command("compile-nodesets", (e) => Test(e));
+            app.Command("compile-nodesets", (e) => CompileNodeSets(e));
 
             app.OnExecute(() =>
             {
@@ -306,14 +306,25 @@ private static void GenerateCode(string inputPath, string outputPath, NodeSetInf
             var relativePath = new FileInfo(nodeset.FileName).DirectoryName.Substring(new DirectoryInfo(inputPath).FullName.Length);
 
             var output = Path.Join(outputPath, relativePath);
-            Directory.CreateDirectory(output);
+
+            if (!Directory.Exists(output))
+            {
+                Directory.CreateDirectory(output);
+            }
+
+            var documentation = new FileInfo(nodeset.FileName.Replace(".xml", ".documentation.csv"));
+
+            if (documentation.Exists)
+            {
+                documentation.CopyTo(Path.Join(output, $"{nodeset.Prefix}.NodeSet2.documentation.csv"));
+            }
 
             generator.GenerateMultipleFiles(output, false, exclusions, false);
 
             WriteLine($"NodeSet ({nodeset.ModelUri}) code generated ({output}).", ConsoleColor.DarkGreen);
         }
 
-        private static void Test(CommandLineApplication app)
+        private static void CompileNodeSets(CommandLineApplication app)
         {
             app.Description = "Searches a directory tree for nodesets and generates code for the specified model URIs.";
             app.HelpOption("-?|-h|--help"); 
@@ -328,6 +339,11 @@ private static void Test(CommandLineApplication app)
                 "The path to the directory to use to write the generated files.",
                 CommandOptionType.SingleValue);
 
+            app.Option(
+                $"-{OptionsNames.OutputPrefix}",
+                "The prefix on generated files.",
+                CommandOptionType.SingleValue);
+
             app.Option(
                 $"-{OptionsNames.ModelUris}",
                 "The URI of the model to generate.",
@@ -375,7 +391,6 @@ private static void Test(CommandLineApplication app)
                         continue;
                     }
 
-
                     found.Add(modelUri);
 
                     Dictionary<string, NodeSetInfo> dependencies = new();
@@ -387,6 +402,11 @@ private static void Test(CommandLineApplication app)
 
                     WriteLine($"NodeSet ({nodeset.ModelUri}) dependencies found.", ConsoleColor.DarkYellow);
 
+                    if (!String.IsNullOrEmpty(options.OutputPrefix))
+                    {
+                        nodeset.Prefix = options.OutputPrefix;
+                    }
+
                     try
                     {
                         GenerateCode(input.FullName, options.OutputPath, nodeset, dependencies);
@@ -561,6 +581,7 @@ private static class OptionsNames
             public const string ModelPublicationDate = "pd";
             public const string ReleaseCandidate = "rc";
             public const string ModelUris = "uri";
+            public const string OutputPrefix = "prefix";
         }
 
         private class OptionValues
@@ -585,6 +606,7 @@ private class OptionValues
             public string Annex1Path;
             public string Annex2Path;            
             public IList<string> ModelUris;
+            public string OutputPrefix;
         }
 
         private static void AddCompileOptions(CommandLineApplication app)
@@ -653,6 +675,11 @@ private static void AddCompileOptions(CommandLineApplication app)
                 $"-{OptionsNames.ReleaseCandidate}",
                 "Indicates that a release candidate nodeset is being generated.",
                 CommandOptionType.NoValue);
+
+            app.Option(
+                $"-{OptionsNames.OutputPrefix}",
+                "The prefix to use on the generated files names.",
+                CommandOptionType.SingleValue);
         }
 
         private static OptionValues GetCompileOptions(CommandLineApplication app)
@@ -671,6 +698,7 @@ private static OptionValues GetCompileOptions(CommandLineApplication app)
                 ModelPublicationDate = app.GetOption(OptionsNames.ModelPublicationDate),
                 ReleaseCandidate = app.IsOptionSet(OptionsNames.ReleaseCandidate),
                 ModelUris = app.GetOptionList(OptionsNames.ModelUris),
+                OutputPrefix = app.GetOption(OptionsNames.OutputPrefix),
             };
 
             var path = app.GetOption(OptionsNames.GenerateIdentifierFile);