Applied svn revision #36497 from 1.6 to trunk.

This commit is contained in:
Elias Pschernig 2009-07-01 17:22:06 +00:00
parent 339f172289
commit eeb7d7671a

View file

@ -872,6 +872,30 @@ def output(isocode):
for c in stuff.campaign_lookup.keys():
stuff.is_mainline_campaign[c] = True
# Parse all unit data
# This reads in units.cfg, giving us all the mainline units (and races).
print "Parsing mainline units ...",
sys.stdout.flush()
WML = stuff.parser.parse("{core/units.cfg}")
n = stuff.add_units(WML, "mainline")
print n, "mainline units found."
# Now we read each mainline campaign in turn to get its units.
cnames = stuff.campaign_lookup.keys()
for cname in cnames:
print "Parsing %s units ..." % cname,
sys.stdout.flush()
campaign = stuff.campaign_lookup[cname]
define = campaign.get_text_val("define")
WML = stuff.parser.parse("""
#define %s\n#enddef
{campaigns}""" % define,
ignore_macros = lambda x: x.find("/scenarios") == -1)
n = stuff.add_units(WML, cname)
image_collector.add_binary_pathes_from_WML(cname, WML)
print n, "units found."
sys.stderr.flush()
if userdir:
print "Parsing addons ...",
sys.stdout.flush()
@ -895,30 +919,6 @@ def output(isocode):
image_collector.add_binary_pathes_from_WML(cname, WML)
print n, "units found."
# Parse all unit data
# This reads in units.cfg, giving us all the mainline units.
print "Parsing mainline units ...",
sys.stdout.flush()
WML = stuff.parser.parse("{core/units.cfg}")
n = stuff.add_units(WML, "mainline")
print n, "mainline units found."
# Now we read each mainline campaign in turn to get its units.
cnames = stuff.campaign_lookup.keys()
for cname in cnames:
print "Parsing %s units ..." % cname,
sys.stdout.flush()
campaign = stuff.campaign_lookup[cname]
define = campaign.get_text_val("define")
WML = stuff.parser.parse("""
#define %s\n#enddef
{campaigns}""" % define,
ignore_macros = lambda x: x.find("/scenarios") == -1)
n = stuff.add_units(WML, cname)
image_collector.add_binary_pathes_from_WML(cname, WML)
print n, "units found."
sys.stderr.flush()
stuff.find_unit_factions()
# Report generation