From f09dc19abf5dff62974146f622e85d735799a1f2 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Thu, 12 Jan 2023 12:54:12 +0100
Subject: [PATCH] leftovers after renamings
---
{{cookiecutter.repo_name}}/.gitlab-ci.yml | 4 ++--
{{cookiecutter.repo_name}}/build.gradle | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/{{cookiecutter.repo_name}}/.gitlab-ci.yml b/{{cookiecutter.repo_name}}/.gitlab-ci.yml
index 0290ed4..d23211f 100644
--- a/{{cookiecutter.repo_name}}/.gitlab-ci.yml
+++ b/{{cookiecutter.repo_name}}/.gitlab-ci.yml
@@ -37,7 +37,7 @@ diagram:
- "./gradlew generateGrammarDiagrams"
artifacts:
paths:
- - "src/gen/resources/{{cookiecutter.project_short_name}}Grammar.png"
+ - "src/gen/resources/{{cookiecutter.grammar_name}}Grammar.png"
ragdoc_build:
image: "git-st.inf.tu-dresden.de:4567/jastadd/ragdoc-builder"
@@ -80,7 +80,7 @@ pages:
- pip install -r pages/requirements.txt
script:
- mkdir pages/docs/diagrams
- - cp src/gen/resources/{{cookiecutter.project_short_name}}Grammar.png pages/docs/diagrams/
+ - cp src/gen/resources/{{cookiecutter.grammar_name}}Grammar.png pages/docs/diagrams/
- cd pages && mkdocs build
artifacts:
paths:
diff --git a/{{cookiecutter.repo_name}}/build.gradle b/{{cookiecutter.repo_name}}/build.gradle
index d7c3211..a78380c 100644
--- a/{{cookiecutter.repo_name}}/build.gradle
+++ b/{{cookiecutter.repo_name}}/build.gradle
@@ -36,13 +36,13 @@ dependencies {
}
// --- Preprocessors ---
-def genDir = './src/gen/jastadd'
-File genSrc = file("${genDir}")
+def genJastaddDir = './src/gen/jastadd'
+File genSrc = file("${genJastaddDir}")
idea.module.generatedSourceDirs += genSrc
sourceSets.main.java.srcDir genSrc
def relastFiles = ['./src/main/jastadd/{{cookiecutter.grammar_name}}.relast']
-def grammarPrefix = "${genDir}/{{cookiecutter.grammar_name}}"
+def grammarPrefix = "${genJastaddDir}/{{cookiecutter.grammar_name}}"
def grammarDiagramFile = './src/gen/resources/{{cookiecutter.grammar_name}}Grammar.png'
def jastAddListName = 'JastAddList'
@@ -67,7 +67,7 @@ task relastToJastAdd(type: JavaExec) {
mainClass = 'org.jastadd.relast.compiler.Compiler'
doFirst {
- mkdir "${genDir}"
+ mkdir "${genJastaddDir}"
}
args "--grammarName=${grammarPrefix}",
--
GitLab