Bump version to 3.0 (#1765)

and relax version string constraint in schemas
modelica · May 10, 2022 · 526166d · 526166d
1 parent 93a5d6a
commit 526166d
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 18 deletions.
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-rc.2"
+  fmiVersion="3.0"
   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-rc.2">
+<fmiBuildDescription fmiVersion="3.0">
 
   <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-rc.2">
+<fmiBuildDescription fmiVersion="3.0">
 
   <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-rc.2"
+  fmiVersion="3.0"
   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-rc.2"
+  fmiVersion="3.0"
   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-rc.2"
+  fmiVersion="3.0"
   modelName="MyLibrary.SpringMassDamper"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/scheduled_execution.xml b/docs/examples/scheduled_execution.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiModelDescription fmiVersion="3.0-rc.2" modelName="ThreeInputClocks" instantiationToken="ThreeInputClocks">
+<fmiModelDescription fmiVersion="3.0" modelName="ThreeInputClocks" instantiationToken="ThreeInputClocks">
 	<ScheduledExecution modelIdentifier="ThreeInputClocks"/>
 	<LogCategories>
 		<Category name="logStatusError" description="Log error messages"/>

diff --git a/docs/examples/string_vector_example.xml b/docs/examples/string_vector_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-rc.2"
+  fmiVersion="3.0"
   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-rc.2"
+  fmiVersion="3.0"
   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-rc.2"
+  fmiVersion="3.0"
   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-rc.2" modelName="VariableTypes" instantiationToken="">
+<fmiModelDescription fmiVersion="3.0" modelName="VariableTypes" instantiationToken="">
 
   <CoSimulation modelIdentifier="VariableTypes"/>
 

diff --git a/headers/fmi3FunctionTypes.h b/headers/fmi3FunctionTypes.h
@@ -4,7 +4,7 @@
 #include "fmi3PlatformTypes.h"
 
 /*
-This header file defines the data and function types of FMI 3.0-rc.2.
+This header file defines the data and function types of FMI 3.0.
 It must be used when compiling an FMU or an FMI importer.
 
 Copyright (C) 2011 MODELISAR consortium,

diff --git a/headers/fmi3Functions.h b/headers/fmi3Functions.h
@@ -2,7 +2,7 @@
 #define fmi3Functions_h
 
 /*
-This header file declares the functions of FMI 3.0-rc.2.
+This header file declares the functions of FMI 3.0.
 It must be used when compiling an FMU.
 
 In order to have unique function names even if several FMUs
@@ -103,7 +103,7 @@ it may be set to __declspec(dllimport).
 #endif
 
 /* FMI version */
-#define fmi3Version "3.0-rc.2"
+#define fmi3Version "3.0"
 
 /***************************************************
 Common Functions

diff --git a/headers/fmi3PlatformTypes.h b/headers/fmi3PlatformTypes.h
@@ -2,7 +2,7 @@
 #define fmi3PlatformTypes_h
 
 /*
-This header file defines the data types of FMI 3.0-rc.2.
+This header file defines the data types of FMI 3.0.
 It must be used by both FMU and FMI master.
 
 Copyright (C) 2008-2011 MODELISAR consortium,

diff --git a/schema/fmi3BuildDescription.xsd b/schema/fmi3BuildDescription.xsd
@@ -108,7 +108,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <xs:attribute name="fmiVersion" use="required">
                 <xs:simpleType>
                     <xs:restriction base="xs:normalizedString">
-                        <xs:pattern value="3[.](0-.*)"/>
+                        <xs:pattern value="3[.](0|[1-9][0-9]*)([.](0|[1-9][0-9]*))?(-.+)?"/>
                     </xs:restriction>
                 </xs:simpleType>
             </xs:attribute>

diff --git a/schema/fmi3ModelDescription.xsd b/schema/fmi3ModelDescription.xsd
@@ -102,7 +102,13 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 </xs:element>
                 <xs:element ref="Annotations" minOccurs="0"/>
             </xs:sequence>
-            <xs:attribute name="fmiVersion" fixed="3.0-rc.2" use="required"/>
+            <xs:attribute name="fmiVersion" use="required">
+                <xs:simpleType>
+                    <xs:restriction base="xs:normalizedString">
+                        <xs:pattern value="3[.](0|[1-9][0-9]*)([.](0|[1-9][0-9]*))?(-.+)?"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
             <xs:attribute name="modelName" type="xs:string" use="required"/>
             <xs:attribute name="instantiationToken" type="xs:normalizedString" use="required"/>
             <xs:attribute name="description" type="xs:string"/>

diff --git a/schema/fmi3TerminalsAndIcons.xsd b/schema/fmi3TerminalsAndIcons.xsd
@@ -75,7 +75,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <xs:attribute name="fmiVersion" use="required">
                 <xs:simpleType>
                     <xs:restriction base="xs:normalizedString">
-                        <xs:pattern value="3[.](0-.*)"/>
+                        <xs:pattern value="3[.](0|[1-9][0-9]*)([.](0|[1-9][0-9]*))?(-.+)?"/>
                     </xs:restriction>
                 </xs:simpleType>
             </xs:attribute>