0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid a suffix-aliasing problem.

Browse source
This commit is contained in:
Eric S. Raymond 2007-05-03 18:05:53 +00:00
parent 3cb543823f
commit e1bfd44dc1
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/tools/upconvert
View file

@ -157,8 +157,8 @@ filemoves = {
("units/undead/ghost-attack1.png", "units/undead/ghost-attack-1.png"),
("wolf-attack.wav", "wolf-bite.ogg"),
("wolf-cry.wav", "wolf-die.wav"),
("wose-attack.wav", "wose.attack.ogg"),
("wose.attack.ogg", "wose.attack.ogg"),
("wose-attack.wav", "wose-attack.ogg"),
(r"wose\.attack.ogg", "wose-attack.ogg"),
),
"1.3.1" : (
# Peasant images moved to a new directory
@ -222,6 +222,12 @@ filemoves = {
"1.3.3" : ()
}
# Turn all the filemove string substition pairs into nearly equivalent
# regexp-substitution pairs, forbidding the match from being preceded
# by a dash. This prevents, e.g., "miss.ogg" false-matching on "big-miss.ogg".
for (key, value) in filemoves.items():
filemoves[key] = map(lambda (old, new): (re.compile("(?<!-)"+old), new), value)
# 1.2.x to 1.3.2 terrain conversion
conversion1 = {
" " : "_s",
@ -623,7 +629,7 @@ if __name__ == '__main__':
# First, do resource-file moves
for step in fileconversions:
for (old, new) in step:
transformed = transformed.replace(old, new)
transformed = old.sub(new, transformed)
# Handle terrain_liked=, terrain=, valid_terrain=
spaceless = transformed.replace(" ", "").replace("\t", "")
if spaceless and spaceless[0] != "#" and ("terrain_liked=" in spaceless or "terrain=" in spaceless):