move generator to anchor-src-gen

sava-software · Aug 19, 2024 · 2463045 · 2463045
1 parent 2b0fd77
commit 2463045
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 319 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -16,23 +16,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - run: |
-         ls
-         pwd
-
-      - name: Checkout Anchor Source Generator
-        uses: actions/checkout@v4
-        with:
-          repository: sava-software/anchor-src-gen
-          token: ${{ secrets.GH_READ_PROJECTS }}
-          path: anchor-src-gen
-
-      - run: |
-          ls
-          pwd
-
-      - uses: gradle/actions/wrapper-validation@v3
-
       - uses: oracle-actions/setup-java@v1
         if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
         with:
@@ -49,12 +32,18 @@ jobs:
           website: jdk.java.net
           release: ${{ vars.JAVA_VERSION }}
 
-      - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
-        if: ${{ vars.GRADLE_JAVA_VERSION == vars.JAVA_VERSION }}
+      - name: Checkout Anchor Source Generator
+        uses: actions/checkout@v4
+        with:
+          repository: sava-software/anchor-src-gen
+          token: ${{ secrets.GH_READ_PROJECTS }}
+          path: anchor-src-gen
+
+      - uses: gradle/actions/wrapper-validation@v3
 
       - name: Generate Source & Check
         run: |
-          ./genSrc.sh --tjv="${{ vars.JAVA_VERSION }}" --log="INFO" --tl=2 --bdm=200 --nt=5 --sd="programs/src/main/java" --rpc="${{ secrets.RPC_URL }}"
+          ./anchor-src-gen/genSrc.sh --tjv="${{ vars.JAVA_VERSION }}" --tl=2 --bdm=200 --nt=5 --sd="programs/src/main/java" --bp="software.sava.anchor.programs" --mn="software.sava.anchor_programs" --rpc="${{ secrets.RPC_URL }}"
           ./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} check --stacktrace
         env:
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,15 +33,21 @@ jobs:
           website: jdk.java.net
           release: ${{ vars.JAVA_VERSION }}
 
-      - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
-        if: ${{ vars.GRADLE_JAVA_VERSION == vars.JAVA_VERSION }}
+      - name: Checkout Anchor Source Generator
+        uses: actions/checkout@v4
+        with:
+          repository: sava-software/anchor-src-gen
+          token: ${{ secrets.GH_READ_PROJECTS }}
+          path: anchor-src-gen
+
+      - uses: gradle/actions/wrapper-validation@v3
 
       - name: Generate Source, Check & Publish
         run: |
-          ./genSrc.sh --tjv="${{ vars.JAVA_VERSION }}" --log="INFO" --tl=2 --bdm=200 --nt=5 --sd="programs/src/main/java" --rpc="${{ secrets.RPC_URL }}"
+          ./anchor-src-gen/genSrc.sh --tjv="${{ vars.JAVA_VERSION }}" --tl=2 --bdm=200 --nt=5 --sd="programs/src/main/java" --bp="software.sava.anchor.programs" --mn="software.sava.anchor_programs" --rpc="${{ secrets.RPC_URL }}"
           ./gradlew --stacktrace -PtargetJava=${{ vars.JAVA_VERSION }} check :anchor-programs:publish
         env:
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_SAVA_USER: ${{ secrets.GPR_USER }}
-          GITHUB_SAVA_TOKEN: ${{ secrets.GPR_TOKEN }}
+          GITHUB_SAVA_TOKEN: ${{ secrets.GPR_TOKEN }}
diff --git a/README.md b/README.md
@@ -2,24 +2,6 @@
 
 # Anchor Programs [![Build](https://github.com/sava-software/anchor-programs/actions/workflows/gradle.yml/badge.svg)](https://github.com/sava-software/anchor-programs/actions/workflows/gradle.yml) [![Release](https://github.com/sava-software/anchor-programs/actions/workflows/release.yml/badge.svg)](https://github.com/sava-software/anchor-programs/actions/workflows/release.yml)
 
-## Generate Source
-
-Replace the values below to fit your needs.
-
-```bash
-./genSrc.sh \
- --log=[INFO|WARN|DEBUG] \
- --tabLength=2 \
- --sourceDirectory="programs/src/main/java" \
- --moduleName="software.sava.anchor_programs" \
- --basePackageName="software.sava.anchor.programs" \
- --rpc="https://rpc.com" \
- --programsCSV="generator/main_net_programs.csv" \
- --baseDelayMillis=200 \
- --numThreads=5 \
- --screen=[0|1]
-```
-
 ## Requirements
 
 - The latest generally available JDK. This project will continue to move to the latest and will not maintain

diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,3 @@
-buildscript {
-  repositories {
-    maven { url = 'https://plugins.gradle.org/m2/' }
-    mavenCentral()
-  }
-  dependencies {
-    // https://plugins.gradle.org/plugin/org.beryx.jlink
-    classpath "org.beryx:badass-jlink-plugin:3.0.1"
-  }
-}
-
 def getAppVersion = { ->
   try (final var gitTagOut = new ByteArrayOutputStream()) {
     exec {

diff --git a/generator/build.gradle b/generator/build.gradle
diff --git a/generator/src/main/java/module-info.java b/generator/src/main/java/module-info.java
diff --git a/generator/src/main/java/software/sava/anchor/programs/Entrypoint.java b/generator/src/main/java/software/sava/anchor/programs/Entrypoint.java
diff --git a/generator/main_net_programs.csv → main_net_programs.csv b/generator/main_net_programs.csv → main_net_programs.csv
diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,4 @@
 rootProject.name = 'anchor-programs'
 
-include 'generator'
-
 include 'programs'
 project(':programs').name = 'anchor-programs'