fix generated module name.

sava-software · Aug 10, 2024 · 78e18d9 · 78e18d9
1 parent a526783
commit 78e18d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ ext {
   jsoniter = '2.11.+'
   sava = '1.0.+'
   sava_solana_programs = '1.0.2'
-  sava_anchor_src_gen = '1.0.2'
+  sava_anchor_src_gen = '1.0.3'
   bouncycastleMinor = 'jdk18on'
   bouncycastlePatch = '1.78.1' // https://www.bouncycastle.org/latest_releases.html#LATEST
 }

diff --git a/generator/src/main/java/software/sava/anchor/programs/Entrypoint.java b/generator/src/main/java/software/sava/anchor/programs/Entrypoint.java
@@ -74,7 +74,6 @@ private String formatPackage(final String moduleName) {
   private AnchorSourceGenerator createGenerator(final String moduleName, final AnchorIDL idl) {
     return new AnchorSourceGenerator(
         sourceDirectory,
-        outputModuleName,
         formatPackage(moduleName),
         tabLength,
         idl
@@ -155,7 +154,7 @@ public static void main(final String[] args) throws InterruptedException {
         "2"
     ));
     final var sourceDirectory = Path.of(propertyOrElse(moduleName + ".sourceDirectory", "anchor-programs/src/main/java")).toAbsolutePath();
-    final var outputModuleName = propertyOrElse(moduleName + ".moduleName", moduleName.substring(moduleName.lastIndexOf('.')) + ".anchor_programs");
+    final var outputModuleName = propertyOrElse(moduleName + ".moduleName", moduleName.substring(0, moduleName.lastIndexOf('.')) + ".anchor_programs");
     final var basePackageName = propertyOrElse(moduleName + ".basePackageName", clas.getPackageName());
     final var rpcEndpoint = System.getProperty(moduleName + ".rpc");
     final var programsCSV = mandatoryProperty(moduleName + ".programsCSV");
@@ -215,7 +214,7 @@ public static void main(final String[] args) throws InterruptedException {
             }
           }
           final var builder = new StringBuilder(2_048);
-          builder.append(String.format("module %s {%n", moduleName));
+          builder.append(String.format("module %s {%n", outputModuleName));
 
           for (final var thread : threads) {
             thread.join();

diff --git a/programs/src/main/java/module-info.java b/programs/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-module software.sava.anchor_generator {
+module software.sava.anchor_programs {
   exports software.sava.anchor.programs.drift.anchor.types;
   exports software.sava.anchor.programs.drift.anchor;
   exports software.sava.anchor.programs.glam.anchor.types;