[wesnoth-commits] [wesnoth/wesnoth] c8ab19: Implement validation of the core game config WML

GitHub noreply at github.com
Tue Mar 6 02:53:22 UTC 2018


  Branch: refs/heads/schema
  Home:   https://github.com/wesnoth/wesnoth
  Commit: c8ab199ad344ff3ce90694d844bf0ff24d27c6b6
      https://github.com/wesnoth/wesnoth/commit/c8ab199ad344ff3ce90694d844bf0ff24d27c6b6
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    R data/schema-gui.cfg
    R data/schema.cfg
    A data/schema/core/actionwml.cfg
    A data/schema/core/addons.cfg
    A data/schema/core/ai.cfg
    A data/schema/core/conditionalwml.cfg
    A data/schema/core/config.cfg
    A data/schema/core/help.cfg
    A data/schema/core/themes.cfg
    A data/schema/editor/groups.cfg
    A data/schema/editor/misc.cfg
    A data/schema/editor/times.cfg
    A data/schema/filters/_initial.cfg
    A data/schema/filters/base_value.cfg
    A data/schema/filters/location.cfg
    A data/schema/filters/side.cfg
    A data/schema/filters/unit.cfg
    A data/schema/filters/weapon.cfg
    A data/schema/game_config.cfg
    A data/schema/macros.cfg
    A data/schema/terrain/graphics.cfg
    A data/schema/terrain/types.cfg
    A data/schema/types/basic.cfg
    A data/schema/types/formula.cfg
    A data/schema/types/lists.cfg
    A data/schema/types/progressive.cfg
    A data/schema/units/_main.cfg
    A data/schema/units/abilities.cfg
    A data/schema/units/animations.cfg
    A data/schema/units/modifications.cfg
    A data/schema/units/movetypes.cfg
    A data/schema/units/races.cfg
    A data/schema/units/single.cfg
    A data/schema/units/specials.cfg
    A data/schema/units/types.cfg
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/config_cache.cpp
    M src/config_cache.hpp
    M src/game_config_manager.cpp
    M src/serialization/schema_validator.cpp
    M src/serialization/schema_validator.hpp
    M src/serialization/tag.cpp
    M src/serialization/tag.hpp

  Log Message:
  -----------
  Implement validation of the core game config WML
Currently this is disabled by default
Use --validate command-line argument to enable

The following new features were added in the schema format:
* Union, intersection, and list types
* Keys can specify a union of known types on-the-fly
* Key and tag names can include wildcards (* and ?, glob-style)
* Tags support any_key=yes, which means unrecognized subtags will be ignored
* Tags and keys support deprecated=yes (unimplemented)
* Specify max=infinite instead of max=-1


  Commit: 520ee2d1d7b64995dae6ddd3fe077b9220003e18
      https://github.com/wesnoth/wesnoth/commit/520ee2d1d7b64995dae6ddd3fe077b9220003e18
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M data/schema/core/addons.cfg

  Log Message:
  -----------
  Address some feedback


  Commit: 67fd5d75aaa549337d7e7d073cd0c8b43b47ae25
      https://github.com/wesnoth/wesnoth/commit/67fd5d75aaa549337d7e7d073cd0c8b43b47ae25
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M data/schema/core/config.cfg
    M data/schema/game_config.cfg
    M data/schema/terrain/graphics.cfg

  Log Message:
  -----------
  Address a few TODO notes


  Commit: 5d39e30f954b08061cb17dfd1f566064bb51c093
      https://github.com/wesnoth/wesnoth/commit/5d39e30f954b08061cb17dfd1f566064bb51c093
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    R data/gui/schema.cfg
    A data/schema/gui.cfg
    M src/gui/gui.cpp

  Log Message:
  -----------
  Move GUI2 schema into the schema directory


  Commit: 5049c570445f4ad180a59881f273e5d04872da1a
      https://github.com/wesnoth/wesnoth/commit/5049c570445f4ad180a59881f273e5d04872da1a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M data/schema/game_config.cfg
    M data/schema/gui.cfg
    M data/schema/types/basic.cfg
    M data/schema/types/formula.cfg
    M src/serialization/tag.cpp

  Log Message:
  -----------
  Get game config and schema to use some common types

This also fixes an invalid type issue in the GUI2 schema,
and allows types to be a direct alias for other types.


  Commit: 615388792fb69f4bf72cd375a339faf4ccfba3ba
      https://github.com/wesnoth/wesnoth/commit/615388792fb69f4bf72cd375a339faf4ccfba3ba
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M data/core/units/dwarves/Thunderer.cfg
    M data/core/units/monsters/Water_Serpent.cfg

  Log Message:
  -----------
  Fix incorrect filter for Thunderer victory animation
Also remove a useless key in a Water Serpent attack animation

Issues found by schema validation (#2562)


Compare: https://github.com/wesnoth/wesnoth/compare/f09691c27c4a...615388792fb6


More information about the Commits mailing list