Fix #529 and copyright embedded in the tool to avoid external file (#531

) * Fix #529 * Default copyright embedded in the tool to avoid external file
masesgroup · Sep 19, 2024 · 5713321 · 5713321
1 parent 5ab9f91
commit 5713321
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/src/configuration.json b/src/configuration.json
@@ -1,5 +1,4 @@
 {
-  "CopyrightFile": "copyright.txt",
   "RelativeDestinationCSharpClassPath": "net\\JNet\\Generated",
   "RelativeDestinationJavaListenerPath": "jvm\\jnet\\src\\main\\java",
   "JavaListenerBasePackage": "org.mases.jnet.generated",

diff --git a/src/net/JNetReflector/InternalMethods.cs b/src/net/JNetReflector/InternalMethods.cs
@@ -326,7 +326,7 @@ static void AnalyzeSubItems(string package, IDictionary<string, IDictionary<stri
                 }
             }
 
-            var path = Path.Combine(JNetReflectorCore.DestinationCSharpClassPath, package.Replace(SpecialNames.NamespaceSeparator, Path.DirectorySeparatorChar), "AllPackageClasses.cs");
+            var path = Path.Combine(JNetReflectorCore.DestinationCSharpClassPath, package.Replace(SpecialNames.NamespaceSeparator, Path.DirectorySeparatorChar), FileNameAndDirectory.AllPackageClassesFileName);
             if (JNetReflectorCore.JarsToAnalyze != null)
             {
                 sb.AppendLine(AllPackageClasses.CLASSES);

diff --git a/src/net/JNetReflector/JNetReflector.csproj b/src/net/JNetReflector/JNetReflector.csproj
@@ -32,6 +32,7 @@
     <None Remove="AllPackageClasses.template" />
     <None Remove="AllPackageClassesStubClass.template" />
     <None Remove="AllPackageClassesStubNestedClass.template" />
+    <None Remove="copyright.txt" />
     <None Remove="SingleClass.template" />
     <None Remove="Templates\AllPackageClassesStubClassInterfaceOrAbstract.template" />
     <None Remove="Templates\AllPackageClassesStubClassListener.template" />
@@ -84,6 +85,7 @@
     <Compile Include="..\JNet\Specific\AsyncEnumerable.cs" Link="Specific\AsyncEnumerable.cs" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="copyright.txt" />
     <EmbeddedResource Include="Templates\AllPackageClassesStubClassInterfaceOrAbstract.template" />
     <EmbeddedResource Include="Templates\AllPackageClassesStubClassMainClass.template" />
     <EmbeddedResource Include="Templates\AllPackageClassesStubClassListener.template" />

diff --git a/src/net/JNetReflector/JNetReflectorCore.cs b/src/net/JNetReflector/JNetReflectorCore.cs
@@ -18,6 +18,7 @@
 
 using MASES.CLIParser;
 using MASES.JNet;
+using MASES.JNetReflector.Templates;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -807,6 +808,16 @@ protected override string[] ProcessCommandLine()
                     CopyrightFileContent = File.ReadAllText(path);
                 }
             }
+            else
+            {
+                using (var stream = typeof(JNetReflectorCore).Assembly.GetManifestResourceStream(typeof(JNetReflectorCore).Namespace + "." + "copyright.txt"))
+                {
+                    using (var sr = new StreamReader(stream))
+                    {
+                        CopyrightFileContent = sr.ReadToEnd();
+                    }
+                }
+            }
 
             return result;
         }

diff --git a/src/copyright.txt → src/net/JNetReflector/copyright.txt b/src/copyright.txt → src/net/JNetReflector/copyright.txt