These XML files stand out because they don't use utf8 encoding like every other XML file.
Details
Details
Notice that we only use ASCI characters in these files, so the encoding doesn't make much of a difference.
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
Build is green
Updating workspaces. Build (release)... Build (debug)... Running release tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
http://jw:8080/job/phabricator/1525/ for more details.
Comment Actions
Executing section Default... Executing section Source... Executing section JS... Executing section XML GUI... | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/init.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/init.xml | 1| |-<?xml version="1.0" encoding="utf8" standalone="no" ?> | 2| |- | | 1|+<?xml version="1.0" encoding="utf8" standalone="no"?> | 3| 2| <!DOCTYPE objects SYSTEM "../gui.dtd"> | 4| |- | 5| 3| <objects> | 6| 4| | 7| 5| <!-- | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/init.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/init.xml | 10| 10| ========================================== | 11| 11| --> | 12| 12| | 13| |- <script file="gui/common/functions_utility.js" /> | | 13|+ <script file="gui/common/functions_utility.js"/> | 14| 14| | 15| 15| <!-- | 16| 16| ========================================== | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/init.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/init.xml | 18| 18| ========================================== | 19| 19| --> | 20| 20| | 21| |- <script file="gui/common/functions_global_object.js" /> | | 21|+ <script file="gui/common/functions_global_object.js"/> | 22| 22| | 23| 23| </objects> | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/mod/gui/common/modern/setup.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/mod/gui/common/modern/setup.xml | 1| |-<?xml version="1.0" encoding="utf8" standalone="no" ?> | | 1|+<?xml version="1.0" encoding="utf8" standalone="no"?> | 2| 2| <!DOCTYPE setup SYSTEM "..\..\gui.dtd"> | 3| |- | 4| 3| <setup> | 5| 4| <!-- | 6| 5| ========================================== | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/mod/gui/common/modern/setup.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/mod/gui/common/modern/setup.xml | 7| 7| - SCROLLBARS - | 8| 8| ========================================== | 9| 9| --> | 10| |- <scrollbar name="ModernScrollBar" | 11| |- width = "15" | 12| |- minimum_bar_size = "15" | 13| |- maximum_bar_size = "15" | 14| |- show_edge_buttons = "false" | 15| |- sprite_back_vertical = "ModernScrollBack" | 16| |- sprite_bar_vertical = "ModernScrollBar" | 17| |- /> | | 10|+ <scrollbar name="ModernScrollBar" width="15" minimum_bar_size="15" maximum_bar_size="15" show_edge_buttons="false" sprite_back_vertical="ModernScrollBack" sprite_bar_vertical="ModernScrollBar"/> | 18| 11| | 19| 12| <!-- | 20| 13| ========================================== | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/mod/gui/common/modern/setup.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/mod/gui/common/modern/setup.xml | 21| 21| - TOOLTIPS - | 22| 22| ========================================== | 23| 23| --> | 24| |- <tooltip name="default" | 25| |- anchor="top" | 26| |- buffer_zone="4" | 27| |- delay="500" | 28| |- font="sans-14" | 29| |- maxwidth="300" | 30| |- offset="16 32" | 31| |- sprite="BlackBorderOnGray" | 32| |- textcolor="255 255 255" | 33| |- /> | | 24|+ <tooltip name="default" anchor="top" buffer_zone="4" delay="500" font="sans-14" maxwidth="300" offset="16 32" sprite="BlackBorderOnGray" textcolor="255 255 255"/> | 34| 25| | 35| |- <tooltip name="sliderTooltip" | 36| |- anchor="top" | 37| |- buffer_zone="4" | 38| |- delay="0" | 39| |- font="sans-14" | 40| |- maxwidth="300" | 41| |- offset="16 32" | 42| |- sprite="BlackBorderOnGray" | 43| |- textcolor="255 255 255" | 44| |- /> | | 26|+ <tooltip name="sliderTooltip" anchor="top" buffer_zone="4" delay="0" font="sans-14" maxwidth="300" offset="16 32" sprite="BlackBorderOnGray" textcolor="255 255 255"/> | 45| 27| | 46| 28| <!-- | 47| 29| ========================================== | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/global.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/global.xml | 1| |-<?xml version="1.0" encoding="utf8" standalone="no" ?> | 2| |- | | 1|+<?xml version="1.0" encoding="utf8" standalone="no"?> | 3| 2| <!DOCTYPE objects SYSTEM "../gui.dtd"> | 4| |- | 5| 3| <objects> | 6| 4| | 7| 5| <!-- | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/global.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/global.xml | 17| 17| - GAMESTATE NOTIFICATIONS | 18| 18| ========================================== | 19| 19| --> | 20| |- <object name="gameStateNotifications" | 21| |- type="text" | 22| |- ghost="true" | 23| |- z="199" | 24| |- size="100%-110 40 100%-110 40" | 25| |- font="mono-stroke-10" | 26| |- textcolor="255 219 77" | 27| |- text_align="center" | 28| |- text_valign="top" | 29| |- sprite="color: 0 0 0 100" | 30| |- > | | 20|+ <object name="gameStateNotifications" type="text" ghost="true" z="199" size="100%-110 40 100%-110 40" font="mono-stroke-10" textcolor="255 219 77" text_align="center" text_valign="top" sprite="color: 0 0 0 100"> | 31| 21| </object> | 32| 22| | 33| 23| <!-- | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/global.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/global.xml | 35| 35| - FPS & REAL TIME & GAME TIME COUNTER | 36| 36| ========================================== | 37| 37| --> | 38| |- <object name="dataCounter" | 39| |- type="text" | 40| |- ghost="true" | 41| |- hidden="false" | 42| |- z="199" | 43| |- size="100%-90 40 100%-5 40" | 44| |- font="mono-10" | 45| |- textcolor="white" | 46| |- text_align="right" | 47| |- text_valign="top" | 48| |- sprite="color: 0 0 0 100" | 49| |- > | | 38|+ <object name="dataCounter" type="text" ghost="true" hidden="false" z="199" size="100%-90 40 100%-5 40" font="mono-10" textcolor="white" text_align="right" text_valign="top" sprite="color: 0 0 0 100"> | 50| 39| <action on="Tick"> | 51| 40| updateCounters(); | 52| 41| </action> | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/global.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/global.xml | 52| 52| </action> | 53| 53| </object> | 54| 54| | 55| |- <object name="fpsCounter" | 56| |- type="text" | 57| |- ghost="true" | 58| |- hidden="true" | 59| |- hotkey="fps.toggle" | 60| |- > | | 55|+ <object name="fpsCounter" type="text"
http://jw:8080/job/phabricator_lint/168/ for more details.
Comment Actions
- The files included in the patch are the only XML-files in the whole 0ad-repo with encoding ISO-8859* (except for ./binaries/data/mods/public/gui/common/init.xml, which already got deleted in f2c16d1cdae273df86530a6b49b4a6c6cdee3549)
- checked with: find ./ -iname '*.xml' -exec grep -l -i -E 'encoding=.*iso-8859' {} \;
- None of the files above contains non-ASCII-characters:
- checked with: for f in $(find ./ -iname '*.xml' -exec grep -l -i -E 'encoding=.*iso-8859' {} \;); do grep --color='auto' -H -P -n '[\x80-\xFF]' $f; done
Therefore the whole patch looks good to me.