Page MenuHomeWildfire Games

move builder entities list to template_unit.xml
Needs ReviewPublic

Authored by Nescio on Jan 28 2021, 9:36 PM.

Details

Reviewers
None
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Summary

Currently identical builder entities are maintained in template_unit_infantry.xml, template_unit_support_female_citizen.xml, and template_unit_support_slave.xml.
This patch removes those and instead includes the list in template_unit.xml and inserts <Builder disable=""/> in its other children, effectively saving many lines and making things easier to maintain.
See also D3290.

Test Plan

Check for completeness and correctness.

Event Timeline

Nescio created this revision.Jan 28 2021, 9:36 PM
Owners added a subscriber: Restricted Owners Package.Jan 28 2021, 9:36 PM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/3111/display/redirect for more details.

Nescio requested review of this revision.Jan 28 2021, 9:41 PM
Nescio updated this revision to Diff 15761.Jan 28 2021, 9:43 PM
Nescio retitled this revision from move builder entities list to template_unit_support.xml to move builder entities list to template_unit.xml.
Nescio edited the summary of this revision. (Show Details)
  • list in template_unit.xml
Nescio updated this revision to Diff 15762.Jan 28 2021, 9:46 PM
Nescio edited the summary of this revision. (Show Details)
  • forgot siege

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/3112/display/redirect for more details.

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/3113/display/redirect for more details.

I disagree with this change, both because it is cheaper to not disable a template and because it is clearer where the builder is actually used.

because it is cheaper to not disable a template

How is it cheaper?

because it is clearer where the builder is actually used

The following lines are only present in templates that can actually build:

<Builder>
  <Rate>1.0</Rate>
</Builder>

Isn't that clear enough?