Skip to content

Commit 0e44777

Browse files
authored
clarify specification for required software pack version (#375)
Addressing #370
1 parent 2b87127 commit 0e44777

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

doxygen/src/pdsc_format.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ There are the following requirement types:
909909
<package name="STM32F4xx_DFP" vendor="Keil" version="2.8.0:2.8.0"/>
910910
</packages>
911911
<compilers>
912-
<compiler name="ARMCC" version="5.0.0:5.99.0"/>
912+
<compiler name="ARMCC" version="5.0.0:6.0.0-0"/>
913913
</compilers>
914914
<languages>
915915
<language name="C" version="99"/>
@@ -979,6 +979,7 @@ There are the following requirement types:
979979
<requirements>
980980
<packages>
981981
<package name="STM32F4xx_DFP" vendor="Keil" version="2.8.0:2.8.0"/>
982+
<package name="CMSIS" vendor="ARM" version="6.1.0:7.0.0-0"/> <!-- restrict to major version 6 -->
982983
</packages>
983984
</requirements>
984985
...
@@ -1018,10 +1019,12 @@ There are the following requirement types:
10181019
<td>\ref VersionType "Version" of the required software pack which can be:
10191020
- Minimum version (higher versions are accepted).
10201021
- Version range specified with <em>min_version</em><b>:</b><em>max_version</em>. <em>min_version</em> must be lower or
1021-
equal than <em>max_version</em>. If <em>min_version</em> and <em>max_version</em> are equal, the version must match.
1022-
- If no version is specified, the latest available version is assumed.
1022+
equal than <em>max_version</em>. For a version range that retains the major version, the <em>max_version</em> is set
1023+
to the next major version with minor, patch and release qualifier set to "0".
1024+
- Fixed version is specified if <em>min_version</em> and <em>max_version</em> are equal.
1025+
- If no version is specified, the latest available installed version is accepted and used.
10231026
</td>
1024-
<td>\ref VersionType</td>
1027+
<td>\ref VersionType</td>
10251028
<td>optional</td>
10261029
</tr>
10271030
</table>
@@ -1037,7 +1040,7 @@ There are the following requirement types:
10371040
...
10381041
<requirements>
10391042
<compilers>
1040-
<compiler name="ARMCC" version="5.0.0:5.99.0"/>
1043+
<compiler name="ARMCC" version="5.0.0:6.0.0-0"/>
10411044
</compilers>
10421045
</requirements>
10431046
...
@@ -1071,8 +1074,9 @@ There are the following requirement types:
10711074
<td>\ref VersionType "Version" of the required compiler which can be:
10721075
- Minimum version (higher versions are accepted).
10731076
- Version range specified with <em>min_version</em><b>:</b><em>max_version</em>. <em>min_version</em> must be lower or
1074-
equal than <em>max_version</em>. If <em>min_version</em> and <em>max_version</em> are equal, the version must match.
1075-
<br>
1077+
equal than <em>max_version</em>. For a version range that retains the major version, the <em>max_version</em> is set
1078+
to the next major version with minor, patch and release qualifier set to "0".
1079+
- Fixed version is specified if <em>min_version</em> and <em>max_version</em> are equal.
10761080
</td>
10771081
<td>\ref VersionType</td>
10781082
<td>required</td>

0 commit comments

Comments
 (0)