[jhbuild] moduleset.rnc: The order of elements in <if> is not significant
- From: Ting-Wei Lan <lantw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] moduleset.rnc: The order of elements in <if> is not significant
- Date: Sat, 20 Jan 2018 16:29:51 +0000 (UTC)
commit 903106b802d37df0bedd7c281fd8d391bff85d5a
Author: Ting-Wei Lan <lantw src gnome org>
Date: Tue Jan 9 12:04:13 2018 +0800
moduleset.rnc: The order of elements in <if> is not significant
It is possible to have <if> elements nested inside <if>. Since the
introduction of <if> and condition set is intended to make modulesets
more flexible, I think we should ignore the order of elements inside
<if> to avoid unneeded validation error.
https://bugzilla.gnome.org/show_bug.cgi?id=792379
modulesets/moduleset.rnc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/moduleset.rnc b/modulesets/moduleset.rnc
index beebc10..a16cde1 100644
--- a/modulesets/moduleset.rnc
+++ b/modulesets/moduleset.rnc
@@ -73,7 +73,7 @@ attlist.mirror &=
attlist.include &= attribute href { text }
# As parsed by get_dependencies()
dependencieselements = dependencies?, suggests?, after?, systemdependencies?
-argsif = element if { attlist.if, argsif*, autogenargs*, makeargs*, makeinstallargs* }
+argsif = element if { attlist.if & argsif* & autogenargs* & makeargs* & makeinstallargs* }
autotools =
element autotools {
attlist.autotools, argsif*, autogenargs*, makeargs*, makeinstallargs*, pkg-config?, branch,
dependencieselements
@@ -150,7 +150,7 @@ attlist.distutils &=
[ a:defaultValue = "yes" ]
attribute python3 { "1" }?,
attribute supports-non-srcdir-builds { "yes" | "no" }?
-cmakeargsif = element if { attlist.if, cmakeargsif*, cmakeargs*, makeargs* }
+cmakeargsif = element if { attlist.if & cmakeargsif* & cmakeargs* & makeargs* }
cmake = element cmake { attlist.cmake, cmakeargsif*, cmakeargs*, makeargs*, pkg-config?, branch?,
dependencieselements }
attlist.cmake &=
attribute id { text },
@@ -160,7 +160,7 @@ attlist.cmake &=
attribute force-non-srcdir-builds { "yes" | "no" }?
cmakeargs = element cmakeargs { attlist.cmakeargs }
attlist.cmakeargs &= attribute value { text }
-mesonargsif = element if { attlist.if, mesonargsif*, mesonargs*, makeargs* }
+mesonargsif = element if { attlist.if & mesonargsif* & mesonargs* & makeargs* }
meson = element meson { attlist.meson, mesonargsif*, mesonargs*, makeargs*, pkg-config?, branch?,
dependencieselements }
attlist.meson &=
attribute id { text },
@@ -231,7 +231,7 @@ tested = element tested { attlist.tested, empty }
attlist.tested &= attribute package { text }
# Other children
attlist.if = attribute condition-set { text } | attribute condition-unset { text }
-depif = element if { attlist.if, depif*, dep* }
+depif = element if { attlist.if & depif* & dep* }
dependencies = element dependencies { attlist.dependencies & depif* & dep* }
attlist.dependencies &= empty
suggests = element suggests { attlist.suggests & depif* & dep* }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]