After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 782564 - Update moduleset.dtd and moduleset.rnc to keep modulesets validated
Update moduleset.dtd and moduleset.rnc to keep modulesets validated
Status: RESOLVED FIXED
Product: jhbuild
Classification: Infrastructure
Component: module sets
unspecified
Other FreeBSD
: Normal normal
: ---
Assigned To: Jhbuild maintainers
Jhbuild QA
Depends on:
Blocks:
 
 
Reported: 2017-05-12 15:09 UTC by Ting-Wei Lan
Modified: 2017-05-16 14:21 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
moduleset.{dtd,rnc}: Update definitions to keep modulesets validated (4.77 KB, patch)
2017-05-12 15:29 UTC, Ting-Wei Lan
committed Details | Review

Description Ting-Wei Lan 2017-05-12 15:09:09 UTC
JHBuild was updated to support meson build system and distutils with python3, but moduleset.dtd and moduleset.rnc are not kept updated with these changes, causing validation error when running 'make check'.

<after> can include <if>, but moduleset.dtd and moduleset.rnc don't allow it. GLib module was modified to use <if> in <after> for macos condition, so we should update them to keep modulesets validated.
Comment 1 Ting-Wei Lan 2017-05-12 15:29:23 UTC
Created attachment 351734 [details] [review]
moduleset.{dtd,rnc}: Update definitions to keep modulesets validated

There are 3 changes in this commit:

 1. meson element is added. The definition of meson element is largely
    based on cmake element.
 2. python3 attribute is added to distutils element. It is an optional
    attribute having only only one possible value, 1. The restriction
    on value is added to keep consistency since the code only checks
    the existence of the attribute.
 3. after element can contain if element. The code supports it, but no
    module use it until glib module was updated to support macOS.
Comment 2 Ting-Wei Lan 2017-05-16 14:21:11 UTC
Attachment 351734 [details] pushed as 28d866f - moduleset.{dtd,rnc}: Update definitions to keep modulesets validated