diff --git a/cookiecutter.json b/cookiecutter.json index 6fda5b4f5213eef8f18b14c64fb2e7fa684cb953..0978cf1cd3a6d053330ae8b0add19aa8ab541448 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,4 +1,5 @@ { + "README of": "Cookiecutter template for relational RAG projects]\nPlease refer to <https://git-st.inf.tu-dresden.de/jastadd/project-templates/relast> for information on the parameters to follow\n[Continue with Enter", "repo_name": "test_repo", "project_name": "My New Relational RAG Project", "project_short_name": "NewRelAST", diff --git a/{{cookiecutter.repo_name}}/build.gradle b/{{cookiecutter.repo_name}}/build.gradle index 15e67b55e0cf781dfc1301cd7fdf75657d69b3bf..bc4f8dfad285eea14760797f9ed5a69ca9ba3e70 100644 --- a/{{cookiecutter.repo_name}}/build.gradle +++ b/{{cookiecutter.repo_name}}/build.gradle @@ -1,4 +1,5 @@ plugins { + id 'com.github.ben-manes.versions' version '0.42.0' id 'java' id 'application' id 'maven-publish' @@ -26,8 +27,9 @@ repositories { } configurations { - // add a configuration to store the grammar printing dependency in + // add a configuration to store the dependencies of grammar printing and relast preprocessor library in grammar2uml + relast } File genSrc = file("src/gen/java") @@ -35,9 +37,10 @@ idea.module.generatedSourceDirs += genSrc sourceSets.main.java.srcDir genSrc dependencies { - // uncomment if relast2uml should be used; this requires graphviz in CI and on system - // implementation group: 'de.tudresden.inf.st', name: 'dumpAstWithPlantuml', version: "${relast2uml_version}" + // uncomment if dumpAst should be used; this requires graphviz in CI and on system + // implementation group: 'de.tudresden.inf.st', name: 'dumpAst', version: "${dumpAst_version}" grammar2uml group: 'de.tudresden.inf.st', name: 'grammar2uml', version: "${grammar2uml_version}" + relast group: 'org.jastadd', name: 'relast', version: "${relast_version}" testImplementation group: 'org.assertj', name: 'assertj-core', version: "${assertj_version}" testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: "${jupyter_version}" testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: "${jupyter_version}" @@ -83,7 +86,6 @@ jar { } } -def relastJar = 'libs/relast.jar' def relastFiles = ['./src/main/jastadd/{{cookiecutter.project_short_name}}.relast'] def grammarPrefix = './src/gen/jastadd/{{cookiecutter.project_short_name}}' def grammarDiagramFile = './src/gen/resources/{{cookiecutter.project_short_name}}Grammar.png' @@ -92,8 +94,11 @@ def jastAddListName = 'JastAddList' task generateGrammarDiagrams(type: JavaExec) { group = 'Documentation' classpath = configurations.grammar2uml + mainClass = 'de.tudresden.inf.st.jastadd.grammar2uml.compiler.Compiler' args "--output=${grammarDiagramFile}", '--defaultFolders' + // TODO uncomment if using multiple grammar files + // args '--separateGrammarDiagrams=./src/gen/resources/*.png' args relastFiles inputs.files relastFiles @@ -102,7 +107,13 @@ task generateGrammarDiagrams(type: JavaExec) { task relastToJastAdd(type: JavaExec) { group = 'Build' - classpath = files("${relastJar}") + classpath = configurations.relast + //noinspection GroovyAssignabilityCheck, GroovyAccessibility + mainClass = 'org.jastadd.relast.compiler.Compiler' + + doFirst { + mkdir "src/gen/jastadd/" + } args "--grammarName=${grammarPrefix}", '--useJastAddNames', diff --git a/{{cookiecutter.repo_name}}/gradle.properties b/{{cookiecutter.repo_name}}/gradle.properties index 44581f8cca5fa5957fb1926b86f574084465d5d8..0a6b07560e8b13c5dc9f9bd315d7db84cc577d21 100644 --- a/{{cookiecutter.repo_name}}/gradle.properties +++ b/{{cookiecutter.repo_name}}/gradle.properties @@ -1,5 +1,6 @@ -relast2uml_version = 0.3.6-54 -jupyter_version = 5.8.2 -assertj_version = 3.22.0 -grammar2uml_version = 0.2.1 -jastaddgradle_version = 1.14.5 \ No newline at end of file +dumpAst_version = 1.2.0 +jupyter_version = 5.9.0 +assertj_version = 3.23.1 +grammar2uml_version = 0.2.5-21 +jastaddgradle_version = 1.15.0 +relast_version = 0.4.0 diff --git a/{{cookiecutter.repo_name}}/libs/relast.jar b/{{cookiecutter.repo_name}}/libs/relast.jar deleted file mode 100644 index a12b1b7f2947a898f6ff3b26199be5f6ca4644fe..0000000000000000000000000000000000000000 Binary files a/{{cookiecutter.repo_name}}/libs/relast.jar and /dev/null differ