Bump version to 3.0-alpha.5 (#1079)

* Harmonize descriptions in headers files * Update Reference-FMUs submodule * Update fmiVersion in XML examples * Add pre-release suffix to document version
modelica · Jul 29, 2020 · 1286e1f · 1286e1f
1 parent 973e8a3
commit 1286e1f
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 25 deletions.
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
@@ -259,6 +259,7 @@ master
 
 Follow these steps to create a (pre-)release:
 
+* update the FMI version in the XML examples, header files, and `index.adoc`
 * update <<CHANGELOG.adoc#,CHANGELOG.adoc>>
 * download the `fmi-standard.zip` artifact from https://circleci.com/gh/modelica/fmi-standard[CirleCI] and check for completeness
 * create a tag on `master` (e.g. `v3.0-rc.1`)

diff --git a/docs/Reference-FMUs b/docs/Reference-FMUs
diff --git a/docs/examples/alias_example.xml b/docs/examples/alias_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/build_description_complex.xml b/docs/examples/build_description_complex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiBuildDescription fmiVersion="3.0-alpha.4">
+<fmiBuildDescription fmiVersion="3.0-alpha.5">
 
   <BuildConfiguration modelIdentifier="PlantModel" description="Build configuration for desktop platforms">
     <SourceFileSet language="C99">

diff --git a/docs/examples/build_description_simple.xml b/docs/examples/build_description_simple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiBuildDescription fmiVersion="3.0-alpha.4">
+<fmiBuildDescription fmiVersion="3.0-alpha.5">
 
   <BuildConfiguration modelIdentifier="PIDContoller">
     <SourceFileSet>

diff --git a/docs/examples/co_simulation.xml b/docs/examples/co_simulation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName="MyLibrary.SpringMassDamper"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/co_simulation_early_return.xml b/docs/examples/co_simulation_early_return.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName="MyLibrary.SpringMassDamper_Early_Return_example"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/model_exchange.xml b/docs/examples/model_exchange.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName="MyLibrary.SpringMassDamper"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/model_structure_example1.xml b/docs/examples/model_structure_example1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example2.xml b/docs/examples/model_structure_example2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example3.xml b/docs/examples/model_structure_example3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example4.xml b/docs/examples/model_structure_example4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/structural_parameter_example.xml b/docs/examples/structural_parameter_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/unit_definition.xml b/docs/examples/unit_definition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-alpha.3"
+  fmiVersion="3.0-alpha.5"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/variable_types.xml b/docs/examples/variable_types.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<fmiModelDescription fmiVersion="3.0-alpha" modelName="VariableTypes" instantiationToken="">
+<fmiModelDescription fmiVersion="3.0-alpha.5" modelName="VariableTypes" instantiationToken="">
 
   <CoSimulation modelIdentifier="VariableTypes"/>
 

diff --git a/docs/index.adoc b/docs/index.adoc
@@ -13,7 +13,7 @@
 :nofooter:
 :favicon: images/favicon.ico
 :revdate: unreleased
-:revnumber: 3.0
+:revnumber: 3.0-alpha.5
 :icons: font
 
 include::docs/0___preamble.adoc[]

diff --git a/headers/fmi3FunctionTypes.h b/headers/fmi3FunctionTypes.h
@@ -4,8 +4,8 @@
 #include "fmi3PlatformTypes.h"
 
 /*
-This header file must be utilized when compiling an FMU or an FMI master.
-It declares data and function types for FMI 3.0-alpha.3.
+This header file defines the data and function types of FMI 3.0-alpha.5.
+It must be used when compiling an FMU or an FMI master.
 
 Copyright (C) 2011 MODELISAR consortium,
               2012-2020 Modelica Association Project "FMI"

diff --git a/headers/fmi3Functions.h b/headers/fmi3Functions.h
@@ -2,9 +2,8 @@
 #define fmi3Functions_h
 
 /*
-This header file must be utilized when compiling a FMU.
-It defines all functions of the
-     FMI 3.0-alpha.3 Model Exchange and Co-Simulation Interface.
+This header file declares the functions of FMI 3.0-alpha.5.
+It must be used when compiling an FMU.
 
 In order to have unique function names even if several FMUs
 are compiled together (e.g. for embedded systems), every "real" function name
@@ -94,7 +93,7 @@ it may be set to __declspec(dllimport).
 #endif
 
 /* FMI version */
-#define fmi3Version "3.0-alpha.3"
+#define fmi3Version "3.0-alpha.5"
 
 /***************************************************
 Common Functions

diff --git a/headers/fmi3PlatformTypes.h b/headers/fmi3PlatformTypes.h
@@ -2,10 +2,8 @@
 #define fmi3PlatformTypes_h
 
 /*
-Standard header file to define the argument types of the
-functions of the Functional Mock-up Interface 3.0-alpha.3.
-This header file must be utilized both by the model and
-by the simulation engine.
+This header file defines the data types of FMI 3.0-alpha.5.
+It must be used by both FMU and FMI master.
 
 Copyright (C) 2008-2011 MODELISAR consortium,
               2012-2020 Modelica Association Project "FMI"
+1 −1		BouncingBall/FMI1CS.xml
+1 −1		BouncingBall/FMI1ME.xml
+1 −1		BouncingBall/FMI2.xml
+5 −5		BouncingBall/FMI3.xml
+1 −1		BouncingBall/buildDescription.xml
+1 −1		BouncingBall/config.h
+1 −1		BouncingBall/readme.md
+3 −3		Clocks/FMI3.xml
+1 −1		Clocks/buildDescription.xml
+1 −1		Clocks/config.h
+26 −10		Clocks/model.c
+1 −1		Dahlquist/FMI1CS.xml
+1 −1		Dahlquist/FMI1ME.xml
+1 −1		Dahlquist/FMI2.xml
+2 −2		Dahlquist/FMI3.xml
+1 −1		Dahlquist/buildDescription.xml
+1 −1		Dahlquist/config.h
+1 −1		Feedthrough/FMI1CS.xml
+1 −1		Feedthrough/FMI1ME.xml
+1 −1		Feedthrough/FMI2.xml
+2 −2		Feedthrough/FMI3.xml
+1 −1		Feedthrough/buildDescription.xml
+1 −1		Feedthrough/config.h
+18 −13		LinearTransform/FMI3.xml
+1 −1		LinearTransform/buildDescription.xml
+9 −4		LinearTransform/config.h
+77 −34		LinearTransform/model.c
+3 −3		Resource/FMI1CS.xml
+3 −3		Resource/FMI1ME.xml
+6 −3		Resource/FMI2.xml
+4 −3		Resource/FMI3.xml
+1 −1		Resource/buildDescription.xml
+3 −3		Resource/config.h
+2 −2		Resource/model.c
+1 −1		Resource/resources/y.txt
+1 −1		Stair/FMI1CS.xml
+1 −1		Stair/FMI1ME.xml
+1 −1		Stair/FMI2.xml
+2 −2		Stair/FMI3.xml
+1 −1		Stair/buildDescription.xml
+1 −1		Stair/config.h
+4 −4		Stair/model.c
+1 −1		VanDerPol/FMI1CS.xml
+1 −1		VanDerPol/FMI1ME.xml
+1 −1		VanDerPol/FMI2.xml
+2 −2		VanDerPol/FMI3.xml
+1 −1		VanDerPol/buildDescription.xml
+1 −1		VanDerPol/config.h
+17 −1		azure-pipelines.yml
+65 −0		examples/Examples.cmake
+55 −40		examples/bcs_early_return.c
+59 −41		examples/bcs_intermediate_variable_access.c
+37 −27		examples/co_simulation.c
+63 −44		examples/hcs_early_return.c
+86 −0		examples/import_shared_library.c
+31 −0		examples/import_static_library.c
+8 −8		examples/jacobian.c
+57 −57		examples/model_exchange.c
+45 −47		examples/scs_synchronous.c
+296 −297		examples/scs_threaded.c
+1 −1		examples/util.h
+48 −67		include/fmi3FunctionTypes.h
+7 −18		include/fmi3Functions.h
+2 −4		include/fmi3PlatformTypes.h
+28 −26		include/model.h
+71 −0		lint_files.py
+9 −4		src/fmi1Functions.c
+112 −115		src/fmi3Functions.c
+39 −40		src/slave.c
+6 −6		test_build.py