Skip to content

Commit f44cfe4

Browse files
OCHSTMjkrech
andauthored
feat: implement issue 335 to add environments section below package (#337)
Co-authored-by: Joachim Krech <[email protected]>
1 parent 08db955 commit f44cfe4

File tree

5 files changed

+60
-9
lines changed

5 files changed

+60
-9
lines changed

doxygen/pack.dxy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "Open-CMSIS-Pack"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = "Version 1.7.43"
41+
PROJECT_NUMBER = "Version 1.7.44"
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

doxygen/src/General.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ The following sections provide more information:
7878
<th>Version</th>
7979
<th>Description</th>
8080
</tr>
81+
<tr>
82+
<td>1.7.44</td>
83+
<td>
84+
- added optional 'environments' section below package element to hold environment-specific information pertaining to the package as a whole
85+
</td>
86+
</tr>
8187
<tr>
8288
<td>1.7.43</td>
8389
<td>

doxygen/src/components_schema.txt

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,9 +1218,9 @@ The possible values are not imposed by this specification.
12181218

12191219
\section element_component_environments /package/.../environments
12201220

1221-
The group <b>environments</b> can appear in \ref element_component "component" element. This group is the frame for defining individual \ref element_component_environment "environment".
1221+
The group <b>environments</b> can appear in \ref element_component "component" element and in \ref element_package "package" element. This group is the frame for defining individual \ref element_component_environment "environment".
12221222

1223-
\b Example:
1223+
\b Example #1:
12241224
\code
12251225
<package>
12261226
...
@@ -1235,6 +1235,21 @@ The group <b>environments</b> can appear in \ref element_component "component" e
12351235
</package>
12361236
\endcode
12371237

1238+
\b Example #2: describing "tool-x" and "tool-y" custom information applicable to the whole pack:
1239+
\code
1240+
<package>
1241+
<environments>
1242+
<environment name="tool-x">
1243+
...
1244+
</environment>
1245+
<environment name="tool-y">
1246+
...
1247+
</environment>
1248+
</environments>
1249+
...
1250+
</package>
1251+
\endcode
1252+
12381253
<p>&nbsp;</p>
12391254

12401255
<table class="cmtable" summary="Element: Environments">
@@ -1250,6 +1265,10 @@ The group <b>environments</b> can appear in \ref element_component "component" e
12501265
<td>\ref element_component "component"</td>
12511266
<td colspan="3">\ref element_component "/package/components/bundle/component"</td>
12521267
</tr>
1268+
<tr>
1269+
<td>\ref element_package "package"</td>
1270+
<td colspan="3">\ref element_package "/package"</td>
1271+
</tr>
12531272
<tr>
12541273
<th>Child&nbsp;Elements</th>
12551274
<th>Description</th>

doxygen/src/pdsc_format.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ The \ref packFormat is structured using grouping elements and contains the follo
6363
- \subpage element_package_description "<description>": brief description of the software pack with optional link to Markdown overview documentation.
6464
- \subpage element_ECCN "<ECCN>": section listing Export Control Classification Numbers (ECCN) for EU and US.
6565
- \subpage element_keywords "<keywords>": lists keywords to search for packages. Can be used for search engines.
66+
- \ref element_component_environments "environments": Grouping element for environments information. Each inner \ref element_component_environment "environment" element may be used to provide tool-specific information pertaining to the package as a whole.
6667
- \subpage element_repository "<repository>": specifies the URL and repository type of a public repository where the pack originates from.
6768
- \subpage element_dominate "<dominate>": the pack contains one or more device, API, or component that overrules other packs with identical items.
6869
- \subpage element_releases "<releases>": lists release versions with descriptions.
@@ -99,7 +100,7 @@ This example of a *.pdsc File explains the sections, particularly how dependenci
99100
The basic package information captures the package vendor, the package name, a brief description of the package, and the schema version.
100101
Additional elements support the logistics of handling packages. The url specifies the origin of the description. It may be left empty if
101102
the pack will not be uploaded onto a web server. A license file might point to license agreements. A list of keywords
102-
assists searching for packages.
103+
assists searching for packages. An optional environments element can be used to list environment-specific information.
103104

104105
\b Example:
105106
\code
@@ -127,6 +128,15 @@ assists searching for packages.
127128
<keyword>STM32F2xx</keyword>
128129
</keywords>
129130

131+
<environments>
132+
<environment name="tool-x"> <!-- tool-x specific information for the whole package -->
133+
...
134+
</environment>
135+
<environment name="tool-y"> <!-- tool-y specific information for the whole package -->
136+
...
137+
</environment>
138+
</environments>
139+
130140
<taxonomy> <!-- class and group descriptions -->
131141
<description Cclass="Board Support">
132142
Generic Interfaces and Templates for Evaluation and Development Boards
@@ -307,6 +317,12 @@ assists searching for packages.
307317
<td>group</td>
308318
<td>0..1 </td>
309319
</tr>
320+
<tr>
321+
<td>\ref element_component_environments "environments"</td>
322+
<td>Grouping element for environments information. Each inner \ref element_component_environment "environment" element may be used to provide tool-specific information pertaining to the package as a whole.</td>
323+
<td>group</td>
324+
<td>0..1</td>
325+
</tr>
310326
<tr>
311327
<td>\ref element_generators "generators"</td>
312328
<td>Specifies generator tools that have been used to create components.</td>

schema/PACK.xsd

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
limitations under the License.
1919
2020
21-
$Date: 12. Nov 2024
22-
$Revision: 1.7.43
21+
$Date: 14. Nov 2024
22+
$Revision: 1.7.44
2323
$Project: Schema File for Package Description File Format Specification
2424
2525
Package file name convention <vendor>.<name>.<version>.pack
26-
SchemaVersion=1.7.43
26+
SchemaVersion=1.7.44
2727
28+
14. Nov 2024: v1.7.44
29+
- added optional 'environments' section below package element to hold environment-specific information pertaining to the package as a whole
2830
12. Nov 2024: v1.7.43
2931
- added optional 'ECCN' section for EU and US export control classification numbers
3032
10. Oct 2024: v1.7.42
@@ -133,7 +135,6 @@
133135
- added 'Star' to DcoreEnum
134136
1. December 2020: v1.7.2
135137
- added 'XC' to CompilerEnumType to enable use of Microchip XC32 compiler
136-
137138
13. November 2020: v1.7.1
138139
- undo removing deprecated attributes as they are still used in latest pdsc file versions:
139140
DeviceVendorEnum: Lapis Semiconductor, DeviceVendorEnum: Pname, BoardReferenceType: Dvendor, Dname
@@ -241,7 +242,7 @@
241242
242243
-->
243244

244-
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.7.43">
245+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.7.44">
245246

246247
<!-- NonNegativeInteger specifies the format in which numbers are represented in hexadecimal or decimal format -->
247248
<xs:simpleType name="NonNegativeInteger">
@@ -2296,6 +2297,15 @@
22962297
<xs:element name="changelogs" type="ChangelogsType" minOccurs="0" />
22972298
<!-- keyword for Search Engine Indexing (e.g. Google) -->
22982299
<xs:element name="keywords" type="KeywordsType" minOccurs="0" />
2300+
<!-- extension point to add information pertaining to the package as a whole -->
2301+
<!-- list of environments (elements containing information that is specific for a development tool) -->
2302+
<xs:element name="environments" minOccurs="0" >
2303+
<xs:complexType>
2304+
<xs:sequence>
2305+
<xs:element name="environment" type="EnvironmentType" minOccurs="1" maxOccurs="unbounded" />
2306+
</xs:sequence>
2307+
</xs:complexType>
2308+
</xs:element>
22992309
<!-- generators are tools and utilities that are used to generate software components -->
23002310
<xs:element name="generators" type="GeneratorsType" minOccurs="0" />
23012311
<!-- definition of devices including references to device support files contained in package -->

0 commit comments

Comments
 (0)