Author: esr
Date: Wed Apr 25 12:31:16 2007
New Revision: 17071
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17071&view=rev
Log:
Ignore backup files in macroscope and upconvert.
Modified:
trunk/data/tools/macroscope
trunk/data/tools/upconvert
Modified: trunk/data/tools/macroscope
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/macroscope?rev=17071&r1=17070&r2=17071&view=diff
==============================================================================
--- trunk/data/tools/macroscope (original)
+++ trunk/data/tools/macroscope Wed Apr 25 12:31:16 2007
@@ -87,6 +87,7 @@
datafiles = filter(lambda x: not os.path.isdir(x), datafiles)
if exclude:
datafiles = filter(lambda x: not re.search(exclude, x), datafiles)
+ datafiles = filter(lambda x: not x.endswith("-bak"), datafiles)
return datafiles
def iswml(filename):
Modified: trunk/data/tools/upconvert
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/upconvert?rev=17071&r1=17070&r2=17071&view=diff
==============================================================================
--- trunk/data/tools/upconvert (original)
+++ trunk/data/tools/upconvert Wed Apr 25 12:31:16 2007
@@ -30,9 +30,30 @@
filemoves = {
# Older includes all previous to 1.3.1.
"older" : (
- ("creepy.ogg", "underground.ogg"),
- ("eagle.wav", "gryphon-shriek-1.ogg"),
- ("lightning.wav", "lightning.ogg"), # Bug fix
+ # These are picked to cover as many as possible of the broken
+ # references in UMC on the campaign server.
+ ("creepy.ogg", "underground.ogg"),
+ ("eagle.wav", "gryphon-shriek-1.ogg"),
+ ("lightning.wav", "lightning.ogg"), # Bug fix
+ ("items/monolith1.png", "scenery/monolith1.png"),
+ ("items/monolith2.png", "scenery/monolith2.png"),
+ ("items/monolith3.png", "scenery/monolith3.png"),
+ ("items/monolith4.png", "scenery/monolith4.png"),
+ ("items/rock1.png", "scenery/rock1.png"),
+ ("items/rock2.png", "scenery/rock2.png"),
+ ("items/rock3.png", "scenery/rock3.png"),
+ ("items/rock4.png", "scenery/rock4.png"),
+ ("items/castle-ruins", "scenery/castle-ruins.png"),
+ ("items/well.png", "scenery/well.png"),
+ ("terrain/flag-1.png", "flags/flag-1.png"),
+ ("terrain/flag-2.png", "flags/flag-2.png"),
+ ("terrain/flag-3.png", "flags/flag-3.png"),
+ ("terrain/flag-4.png", "flags/flag-4.png"),
+
("terrain/village-dwarven-tile.png","terrain/village/dwarven-tile.png"),
+ ("terrain/village-cave-tile.png","terrain/village/cave-tile.png"),
+ ("misc/dwarven-doors.png", "scenery/dwarven-doors-closed.png"),
+ ("sword-swish.wav", "sword-1.ogg"),
+ ("attacks/darkstaff.png", "attacks/staff-necromantic.png"),
),
"1.3.1" : (
# Peasant images moved to a new directory
@@ -374,6 +395,7 @@
None)
datafiles = filter(lambda x: ".svn" not in x, datafiles)
datafiles = filter(lambda x: x.endswith(".cfg") or ('maps' in x and
os.path.isfile(x) and x[-4:] not in ignore), datafiles)
+ datafiles = filter(lambda x: not x.endswith("-bak"), datafiles)
return datafiles
def help():
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
