Publish rrd

Author: rs22

.github/workflows/gh-pages.yml

@@ -45,6 +45,11 @@ jobs:
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@v2
 
+      - name: Railroad Diagrams
+        run: |
+          cd language/rrd
+          make
+
       - name: Geographical Interlocking NPM
         run: cd geographical_interlocking/simulator/react && npm ci
 
@@ -59,6 +64,8 @@ jobs:
 
       - name: Copy output artifacts
         run: |
+          mkdir -p _site/rrd
+          cp -r language/rrd/out/* _site/rrd/
           mkdir -p _site/locking_table_interlocking
           cp -r locking_table_interlocking/simulator/react/build/client/* _site/locking_table_interlocking/
           mkdir -p _site/geographical_interlocking

README.md

@@ -1,7 +1,7 @@
 # OSM Interlocking
 Design framework and examples for software-based railway interlocking logic.
 
-![Interactive Interlocking UI](resources/interlocking.png)
+[![Interactive Interlocking UI](resources/interlocking.png)](https://osmhpi.github.io/interlocking/locking_table_interlocking/)
 
 This repository contains a framework for designing railway interlocking software.
 It consists of a state machine language definition (syntax and semantics), compilers and simulators.
@@ -42,20 +42,6 @@ Often, many point machines share the same power supply.
 When multiple point machines are powered on at the same time due to the commanding of a route, a current spike can cause damage to the power supply.
 Hence, although a staggered point machine operation is not a safety-related function, it is present within the core logic of many interlocking systems.
 
-## Setup and Development
-
-Prerequisites (as tested, newer versions may work as well):
- - .NET 8.0 SDK
- - Rust 1.91.1
- - Node.js 22 and npm
- - Antlr 4.13.2
- - wasm-pack 0.13.1
- - make
-
-For a simplified setup, a VS Code Devcontainer configuration file is provided.
-
-To compile and run the web-based debugging interface, run `make web` from the [locking_table_interlocking](locking_table_interlocking) or [geographical_interlocking](geographical_interlocking) directories, then open http://localhost:3000/.
-
 ## Interlocking Software Design Language (Meta Model)
 
 [Language Semantics Documentation](language/README.md)
@@ -76,6 +62,7 @@ To compile and run the web-based debugging interface, run `make web` from the [l
 
 | | Locking Table Interlocking | Geographical Interlocking |
 |-|-|-|
+| | [🌍 Simulator](https://osmhpi.github.io/interlocking/locking_table_interlocking/) | [🌍 Simulator](https://osmhpi.github.io/interlocking/geographical_interlocking/) |
 | **Generic Application** |
 | Entity Types | [entity_types](locking_table_interlocking/generic_application/entity_types) | [entity_types](geographical_interlocking/generic_application/entity_types)
 | Graphs | [graphs](locking_table_interlocking/generic_application/graphs) | [graphs](geographical_interlocking/generic_application/graphs) |
@@ -86,3 +73,17 @@ To compile and run the web-based debugging interface, run `make web` from the [l
 | **Specific Application** |
 | Configuration JSON | [configuration.json](locking_table_interlocking/specific_application/configuration.json) | [configuration.json](geographical_interlocking/specific_application/configuration.json) |
 | Web-based Simulator | [simulator](locking_table_interlocking/simulator) | [simulator](geographical_interlocking/simulator) |
+
+## Setup and Development
+
+Prerequisites (as tested, newer versions may work as well):
+ - .NET 8.0 SDK
+ - Rust 1.91.1
+ - Node.js 22 and npm
+ - Antlr 4.13.2
+ - wasm-pack 0.13.1
+ - make
+
+For a simplified setup, a VS Code Devcontainer configuration file is provided.
+
+To compile and run the web-based debugging interface, run `make web` from the [locking_table_interlocking](locking_table_interlocking) or [geographical_interlocking](geographical_interlocking) directories, then open http://localhost:3000/.

language/rrd/.gitignore

@@ -1,3 +1,2 @@
 *.ebnf
-*.war
 out/

language/rrd/Makefile

@@ -1,18 +1,20 @@
 all: out/index.xhtml
 clean:
-	rm -rf rr.war ebnf-convert.war Expression.ebnf out out.zip
+	rm -rf ../../.tools/rr.war ../../.tools/ebnf-convert.war Expression.ebnf out out.zip
 
-rr.war:
-	curl -L -o rr.war https://repo1.maven.org/maven2/de/bottlecaps/rr/rr-webapp/2.6/rr-webapp-2.6.war
+../../.tools/rr.war:
+	mkdir -p ../../.tools
+	curl -L -o ../../.tools/rr.war https://repo1.maven.org/maven2/de/bottlecaps/rr/rr-webapp/2.6/rr-webapp-2.6.war
 
-ebnf-convert.war:
-	curl -L -o ebnf-convert.war https://repo1.maven.org/maven2/de/bottlecaps/ebnf-convert/ebnf-convert-webapp/0.73/ebnf-convert-webapp-0.73.war
+../../.tools/ebnf-convert.war:
+	mkdir -p ../../.tools
+	curl -L -o ../../.tools/ebnf-convert.war https://repo1.maven.org/maven2/de/bottlecaps/ebnf-convert/ebnf-convert-webapp/0.73/ebnf-convert-webapp-0.73.war
 
-Expression.ebnf: ebnf-convert.war ../Expression.g4
-	java -jar ebnf-convert.war ../Expression.g4 > $@
+Expression.ebnf: ../../.tools/ebnf-convert.war ../Expression.g4
+	java -Djava.awt.headless=true -jar ../../.tools/ebnf-convert.war ../Expression.g4 > $@
 
-out/index.xhtml: rr.war Expression.ebnf
-	java -jar rr.war -color:#dedede -noembedded Expression.ebnf > out.zip
+out/index.xhtml: ../../.tools/rr.war Expression.ebnf
+	java -Djava.awt.headless=true -jar ../../.tools/rr.war -color:#dedede -noembedded Expression.ebnf > out.zip
 	unzip -o out.zip -d out
 	rm out.zip
 	for f in out/diagram/*.svg; do \