From 392c45bd62303904a82568a378490f278d797e7b Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sun, 27 Feb 2022 15:51:14 +0100
Subject: [PATCH] add diagram to pages
---
{{cookiecutter.repo_name}}/.gitlab-ci.yml | 13 +++++++++++++
{{cookiecutter.repo_name}}/build.gradle | 3 +--
.../{{cookiecutter.project_short_name}}.relast | 10 ++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/{{cookiecutter.repo_name}}/.gitlab-ci.yml b/{{cookiecutter.repo_name}}/.gitlab-ci.yml
index 2b4e2e8..fbe82d9 100644
--- a/{{cookiecutter.repo_name}}/.gitlab-ci.yml
+++ b/{{cookiecutter.repo_name}}/.gitlab-ci.yml
@@ -31,6 +31,17 @@ test:
artifacts:
reports:
junit: "build/test-results/test/TEST-*.xml"
+
+diagram:
+ image: openjdk:11
+ stage: build
+ needs:
+ - build
+ before_script:
+ - apt-get update && apt-get -y install graphviz
+ script:
+ - "./gradlew generateGrammarDiagrams"
+ artifacts:
paths:
- "src/gen/resources"
@@ -74,9 +85,11 @@ pages:
needs:
- ragdoc_view
- test
+ - diagram
before_script:
- pip install -r pages/requirements.txt
script:
+ - cp -r src/gen/resources/diagrams/ pages/docs/diagrams
- cd pages && mkdocs build
artifacts:
paths:
diff --git a/{{cookiecutter.repo_name}}/build.gradle b/{{cookiecutter.repo_name}}/build.gradle
index e6415e3..4443446 100644
--- a/{{cookiecutter.repo_name}}/build.gradle
+++ b/{{cookiecutter.repo_name}}/build.gradle
@@ -169,7 +169,7 @@ jastadd {
}
-//{{cookiecutter.project_gitlab_id}}
+// publish gitlab project {{cookiecutter.project_gitlab_id}}
publishing {
publications {
maven(MavenPublication) {
@@ -203,6 +203,5 @@ publishing {
// Workflow configuration for phases
clean.dependsOn cleanGen
generateAst.dependsOn relastToJastAdd
-generateAst.dependsOn generateGrammarDiagrams
publish.dependsOn jar
diff --git a/{{cookiecutter.repo_name}}/src/main/jastadd/{{cookiecutter.project_short_name}}.relast b/{{cookiecutter.repo_name}}/src/main/jastadd/{{cookiecutter.project_short_name}}.relast
index 388588b..c03fee7 100644
--- a/{{cookiecutter.repo_name}}/src/main/jastadd/{{cookiecutter.project_short_name}}.relast
+++ b/{{cookiecutter.repo_name}}/src/main/jastadd/{{cookiecutter.project_short_name}}.relast
@@ -1 +1,11 @@
// Grammar for {{cookiecutter.project_short_name}}
+
+// TODO replace with own grammar
+Root ::= A B* [myC:C];
+A ::= <Name>;
+B ::= <Count:int>;
+C;
+D:A;
+
+rel D.a <-> A.d*;
+
--
GitLab