From 8e12caceca92d1b4b793b4eb0cc0155b577f3ff7 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Wed, 27 Oct 2021 12:07:35 +0200 Subject: [PATCH 1/3] Move to 3.4.0 pre-release base --- examples/open-simulation-interface | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/open-simulation-interface b/examples/open-simulation-interface index ab60959..a5f90fd 160000 --- a/examples/open-simulation-interface +++ b/examples/open-simulation-interface @@ -1 +1 @@ -Subproject commit ab609598e2b6ac7561c6b7736625aa12afae41ce +Subproject commit a5f90fdfb09ec7618b5dcb8c8edd7464cc17f24c From d7943c320a3efd7a820a478ab47f21c5f6cb1987 Mon Sep 17 00:00:00 2001 From: Stefan Cyliax Date: Thu, 18 Nov 2021 14:17:30 +0100 Subject: [PATCH 2/3] Removed submodule ASAM resources since not needed here Signed-off-by: Stefan Cyliax --- .gitmodules | 3 --- asciidoc-resources | 1 - 2 files changed, 4 deletions(-) delete mode 160000 asciidoc-resources diff --git a/.gitmodules b/.gitmodules index db72cee..4f956e3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,3 @@ path = examples/open-simulation-interface url = https://github.com/OpenSimulationInterface/open-simulation-interface.git branch = master -[submodule "asciidoc-resources"] - path = asciidoc-resources - url = https://code.asam.net/simulation/asciidoc-resources.git diff --git a/asciidoc-resources b/asciidoc-resources deleted file mode 160000 index e0bd505..0000000 --- a/asciidoc-resources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e0bd5051571733414a219ed0e94f5de346ca49cd From 92178e972297acecaa9f2ef2ed8c51213a703ea5 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Fri, 19 Nov 2021 22:08:35 +0100 Subject: [PATCH 3/3] Update version and referenced OSI for 1.2.0 release --- doc/misc/example.adoc | 14 +++++++------- doc/misc/introduction.adoc | 2 +- doc/spec/basic_conventions.adoc | 2 +- examples/CMakeLists.txt | 2 +- examples/open-simulation-interface | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/misc/example.adoc b/doc/misc/example.adoc index 7909209..65a4b1f 100644 --- a/doc/misc/example.adoc +++ b/doc/misc/example.adoc @@ -16,43 +16,43 @@ The example describes a sensor model FMU with one input, one output, and no addi canNotUseMemoryManagementFunctions="true"/> - + - + - + - + - + - + - + diff --git a/doc/misc/introduction.adoc b/doc/misc/introduction.adoc index 9872bad..acc4345 100644 --- a/doc/misc/introduction.adoc +++ b/doc/misc/introduction.adoc @@ -3,5 +3,5 @@ _OSI Sensor Model Packaging_ (OSMP) is a package layer specification for the _Open Simulation Interface_ (OSI). It specifies how models that use OSI are packaged as _Functional Mock-up Units_ (FMUs) in accordance with the _Functional Mock-up Interface 2.0_ (FMI 2.0). -This is version 1.1.1 of this specification. The version number is to be +This is version 1.2.0 of this specification. The version number is to be interpreted according to the https://semver.org/spec/v2.0.0.html[_Semantic Versioning Specification 2.0.0_]. diff --git a/doc/spec/basic_conventions.adoc b/doc/spec/basic_conventions.adoc index 75edf44..7cd646c 100644 --- a/doc/spec/basic_conventions.adoc +++ b/doc/spec/basic_conventions.adoc @@ -7,7 +7,7 @@ The following annotation shall be placed into the `` element [source,xml] ---- - + ---- The `@osi-version` attribute should contain the major, minor, and patch version number of the OSI specification that this model was compiled against. diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 0e9e2d9..4b0fbcc 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -16,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) "Debug" "Release" "MinSizeRel" "RelWithDebInfo") endif() -set(OSMPVERSION "1.1.1" CACHE STRING "OSMP Version String") +set(OSMPVERSION "1.2.0" CACHE STRING "OSMP Version String") add_subdirectory( open-simulation-interface ) diff --git a/examples/open-simulation-interface b/examples/open-simulation-interface index a5f90fd..412521e 160000 --- a/examples/open-simulation-interface +++ b/examples/open-simulation-interface @@ -1 +1 @@ -Subproject commit a5f90fdfb09ec7618b5dcb8c8edd7464cc17f24c +Subproject commit 412521e7fc3fd3d66ec80df2688fb9794fdcc28b