gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Fix checkrefs following D11 / 1c9efa6fb5

Browse Source 
Fixes D11 / 1c9efa6fb5.

The problem is that some GUI pages were simply named "page.xml" which
the regex didn't like.

Accepted By: Nescio
Differential Revision: https://code.wildfiregames.com/D3644
This was SVN commit r25022.
This commit is contained in:
wraitii
2021-03-06 13:57:11 +00:00
parent afd1eaee0d
commit 3b3a297cca
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tools/entity/checkrefs.pl
+2 -2
View File
@@ -435,8 +435,8 @@ sub add_gui_xml
{
push @files, $f;
# GUI page definitions are assumed to be named page_[something].xml and alone in that.
if ($f =~ /\/page_[^.\/]+\.xml$/)
# GUI page definitions are assumed to be named page[_something].xml and alone in that.
if ($f =~ /\/page(_[^.\/]+)?\.xml$/)
{
push @roots, $f;
my $xml = XMLin(vfs_to_physical($f), ForceArray => [qw(include)], KeyAttr => []) or die "Failed to parse '$f': $!";
source/tools/xmlvalidator/validate.pl
+2 -2
View File
@@ -98,8 +98,8 @@ sub validate_guis
my (@guipages, @guixmls);
for my $f (@files)
{
# GUI page definitions are assumed to be named page_[something].xml and alone in that.
if ($f =~ /\/page_[^.\/]+\.xml$/)
# GUI page definitions are assumed to be named page[_something].xml and alone in that.
if ($f =~ /\/page(_[^.\/]+)?\.xml$/)
{
push @guipages, $f;
}