Details

Reviewers

Commits

rP22647: Fix checkrefs script following rP22586 (phenotypes), and fix the…

Summary

In D1955/rP22586 the gender-tag was replaced with phenotype. Many occurrences were replaced, but apparently not all. This fixes one more.
Also included is a check for the VisualActor-replacement of {phenotype}, which was new in the patch this corrects.

Test Plan

Verify its correctness.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

temp

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 8817
Build 14461: Vulcan Build	Jenkins
Build 14460: arc lint + arc unit

Event Timeline

Freagarach created this revision.Aug 2 2019, 8:56 AM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/290/display/redirect

Harbormaster completed remote builds in B8695: Diff 9197.Aug 2 2019, 9:02 AM

Is the male default still necessary?
I suppose it also should have the VisualActor replacement?

I've grepped for gender in the 0ad-folder and found some in .svn/pristine, what is that? And ought they to be replaced?

No, thats internal svn data (also it can grow up to several gigabytes for no reason)

elexis retitled this revision from Fix test script from D1955/rP22586. to Fix checkrefs script following phenotype D1955/rP22586..Aug 2 2019, 1:09 PM

This script still won't work with a "random" phenotype.
Apparently, using datatype="tokens" twice just adds the token to the list. Nice to know ;)

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/291/display/redirect

Harbormaster completed remote builds in B8699: Diff 9200.Aug 2 2019, 3:02 PM

wraitii mentioned this in rP22611: Fix rP22586 - phenotype tokens were added instead of replacing..Aug 4 2019, 11:12 AM

Commandeering 'cause it's perl and it's annoying.

I'm basically splitting the phenotype and thus random phenotypes ought to work.

Also try and fix the map being wrong... Can't see why it would fail except for whitespace issues.

Owners added a subscriber: Restricted Owners Package.Aug 4 2019, 11:16 AM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/302/display/redirect

Harbormaster completed remote builds in B8729: Diff 9218.Aug 4 2019, 11:57 AM

When running the checkrefs.pl I got:

Use of /g modifier is meaningless in split at checkrefs.pl line 141.
Use of /g modifier is meaningless in split at checkrefs.pl line 159.

and

Duplicate terrain name 'medit_city_tile' (from 'art/terrains/biome-mediterranean/medit_city_tile.xml' and 'art/terrains/road/medit_city_tile.xml')

Or is this wat you meant with

In D2141#89534, @wraitii wrote:

Also try and fix the map being wrong... Can't see why it would fail except for whitespace issues.

No, I mean (see jenkins)=

Relax-NG validity error : Extra element Entities in interleave
/public/maps/scenarios/unit_motion_integration_test.xml:0: Relax-NG validity error : Element Scenario failed to validate content

I can't actually reproduce locally because for some reason the libXML module in perl won't install and can't be bothered to understand why.

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/357/display/redirect

Harbormaster completed remote builds in B8810: Diff 9294.Aug 11 2019, 7:10 PM

Save the failing unit motion map in Atlas, so it probably can't be wrong now.

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/363/display/redirect

Harbormaster completed remote builds in B8817: Diff 9301.Aug 12 2019, 9:54 AM

This revision was not accepted when it landed; it landed in state Needs Review.Aug 12 2019, 10:03 AM

Closed by commit rP22647: Fix checkrefs script following rP22586 (phenotypes), and fix the… (authored by wraitii). · Explain Why

This revision was automatically updated to reflect the committed changes.

wraitii added a commit: rP22647: Fix checkrefs script following rP22586 (phenotypes), and fix the….