Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ Add @mentions of the person or team responsible for reviewing proposed changes.
- [ ] I have performed a self-review of my own code/documentation.
- [ ] My documentation changes are related to another repository in the organization. Here is the link to the issue/repo.
- [ ] My changes generate no new warnings during the documentation generation.
- [ ] The existing travis ci which pushes the documentation to gh-pages passes with my changes.
- [ ] The Antora pipeline which pushes the documentation to gh-pages on the downstream repository passes with my changes.
90 changes: 0 additions & 90 deletions .github/workflows/asciidoc-build.yml

This file was deleted.

31 changes: 10 additions & 21 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,38 +1,27 @@
= OSI Documentation

This repo hosts the AsciiDoc-based part of the documentation.
This repo contains most of the AsciiDoc-based part of the documentation.
It contains generals parts of the content and a CI-pipeline that renders the document with Antora.

// TODO: Update if Asciidoctor is completely dropped!
NOTE: The actual hosting has been moved to the generator repository (see link below).

== ASAM OSI (R) official documentation

See the documentation https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/index.html[here].


== Build pipeline
// === Asciidoctor pipeline

// The Asciidoctor pipline is no longer active, see Antora pipeline.

// image::https://github.com/OpenSimulationInterface/osi-documentation/actions/workflows/asciidoc-build.yml/badge.svg[link=https://github.com/OpenSimulationInterface/osi-documentation/actions/workflows/asciidoc-build.yml]

// The pipeline collects the documentation from both https://github.com/OpenSimulationInterface/open-simulation-interface[open-simulation-interface] and https://github.com/OpenSimulationInterface/osi-sensor-model-packaging[osi-sensor-model-packaging] and integrates it into skeleton of this repo.
// As with all ASAM Asciidoctor projects, the complete document structure is described in the mapping file https://github.com/OpenSimulationInterface/osi-documentation/blob/master/index.adoc[index.adoc].

=== Antora pipeline
== Antora build pipeline
image::https://github.com/OpenSimulationInterface/osi-antora-generator/actions/workflows/site-build.yml/badge.svg?branch=main[link=https://github.com/OpenSimulationInterface/osi-antora-generator/actions/workflows/site-build.yml]

NOTE: This pipeline runs on https://github.com/OpenSimulationInterface/osi-antora-generator.


== How To build and change documentation locally

IMPORTANT: These instructions relate ONLY to the Asciidoctor build.
IMPORTANT: These instructions relate ONLY to the Asciidoctor build.
For Antora, check the https://github.com/OpenSimulationInterface/osi-antora-generator[ASAM OSI Antora generator].


The following instructions show how to build the document locally.
The following instructions show how to build the document locally.
Take note that the document is built with a version 'localbuild' in the document and filename.

The instruction should work on Windows, Linux, and MacOS.
Expand All @@ -41,7 +30,7 @@ The instruction should work on Windows, Linux, and MacOS.
+
TIP: Official installation can be found https://docs.docker.com/get-docker/[here].

. Clone this repository with submodules.
. Clone this repository with submodules.
+
[source, shell]
----
Expand All @@ -63,17 +52,17 @@ git clone https://github.com/OpenSimulationInterface/osi-sensor-model-packaging.
[source, yaml]
----
version: "2"
services:

services:
asciidoctor:
image: asciidoctor/docker-asciidoctor:1
volumes:
volumes:
- .:/documents
working_dir: /documents
entrypoint: asciidoctor -D . --failure-level WARN -r asciidoctor-bibtex -r asciidoctor-diagram -a mathjax --trace --backend=html5 index.adoc -o open-simulation-interface_localbuild.html
----

. Run
. Run
+
[source, shell]
----
Expand Down
10 changes: 7 additions & 3 deletions content/general_docs/osi_repos.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@ OSI and its supporting tools are developed publicly on GitHub.
The source code and documentation for OSI and OSI-related tools are spread over several repositories:

https://github.com/OpenSimulationInterface/open-simulation-interface[open-simulation-interface]::
Main repository containing the interface description based on Google's Protocol Buffers, including helper scripts and test scripts. Hosts the .proto files as well as the https://opensimulationinterface.github.io/open-simulation-interface/[Doxygen reference documentation].
Main repository containing the interface description based on Google's Protocol Buffers, including helper scripts and test scripts.
Hosts the .proto files.

https://github.com/OpenSimulationInterface/osi-documentation[osi-documentation]:: Source for the OSI user guide sources and hosts the https://opensimulationinterface.github.io/osi-documentation/[{THIS_STANDARD} user guide].
https://github.com/OpenSimulationInterface/osi-documentation[osi-documentation]:: Source for the OSI user guide sources.

https://github.com/OpenSimulationInterface/osi-sensor-model-packaging[osi-sensor-model-packaging]:: Packaging specification for OSI models used in FMI 2.0 cite:[fmi2.0] simulation environments, including examples.

https://github.com/OpenSimulationInterface/proto2cpp[proto2cpp]:: Doxygen filter for creating the reference documentation from OSI .proto files.
https://github.com/OpenSimulationInterface/proto2cpp[proto2cpp]:: Doxygen filter for creating the reference documentation from OSI .proto files.

https://github.com/OpenSimulationInterface/osi-antora-generator[osi-antora-generator]:: Contains the Antora generator and the relevant pipeline.
This repository is responsible for both building and hosting the https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/index.html/[{THIS_STANDARD} Specification^] as well as the https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/gen/index.html[{THIS_STANDARD} Reference Documentation^].