diff --git a/{{cookiecutter.repo_name}}/.gitlab-ci.yml b/{{cookiecutter.repo_name}}/.gitlab-ci.yml index 0290ed4790bfd5f67d04da3178f12f8e735a63a5..d23211f1714b371ab001f7e3d3599db165067701 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 d7c3211cd4379d8037fa2222e9b983b6231f1c1c..a78380cddf43b7db8e46e57c2eea3331d189b70e 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}",