mirror of
https://github.com/freedoom/freedoom.git
synced 2025-09-01 22:25:46 -04:00
build: Remove wadinfo-builder script.
The effect of this script should be a no-op and the script therefore entirely redundant now that #487 and #489 have been merged. Fixes #485.
This commit is contained in:
Simon Howard
parent
f942477ccb
commit
d172ffd8ed
3 changed files with 4 additions and 202 deletions
|
|
@ -34,10 +34,6 @@ following diagram illustrates the process:
|
||||||
│ cpp ├───────────┘ │
|
│ cpp ├───────────┘ │
|
||||||
└───┬────┘ │
|
└───┬────┘ │
|
||||||
│ │
|
│ │
|
||||||
┌─────────┴──────────┐ │
|
|
||||||
│ wadinfo─builder.py │ │
|
|
||||||
└─────────┬──────────┘ │
|
|
||||||
│ │
|
|
||||||
wadinfo.txt │
|
wadinfo.txt │
|
||||||
│ │
|
│ │
|
||||||
┌───┴────┐ │
|
┌───┴────┐ │
|
||||||
|
|
@ -145,9 +141,6 @@ WAD files that are built:
|
||||||
| +wadinfo_freedm.txt+ | +freedm.wad+ | FREEDM
|
| +wadinfo_freedm.txt+ | +freedm.wad+ | FREEDM
|
||||||
|===============================================================
|
|===============================================================
|
||||||
|
|
||||||
+wadinfo.txt+ differs from the others in that the '-dummy' option is
|
|
||||||
not passed to the +wadinfo-builder.py+ script.
|
|
||||||
|
|
||||||
== Auxiliary scripts
|
== Auxiliary scripts
|
||||||
|
|
||||||
The build system uses a number of auxiliary scripts in order to
|
The build system uses a number of auxiliary scripts in order to
|
||||||
|
|
@ -167,21 +160,6 @@ preprocessor, firstly so that it is not necessary to install +cpp+,
|
||||||
and secondly because processing with +cpp+ can alter the layout of the
|
and secondly because processing with +cpp+ can alter the layout of the
|
||||||
output file.
|
output file.
|
||||||
|
|
||||||
=== +wadinfo-builder.py+
|
|
||||||
|
|
||||||
This script processes the +wadinfo.txt+ used to build the WAD file,
|
|
||||||
and identifies resources specified in the file that do not yet exist.
|
|
||||||
This is to deal with the fact that Freedoom is incomplete and not all
|
|
||||||
of the material needed for a complete WAD has yet been submitted.
|
|
||||||
|
|
||||||
Different strategies are used to cope with these missing resources
|
|
||||||
depending on the WAD file being built. For IWAD builds, dummy
|
|
||||||
resources are substituted for the missing resources (this mode is
|
|
||||||
activated using the +-dummy+ command line parameter). For resource
|
|
||||||
WAD builds, the missing resources are commented out in the output file
|
|
||||||
so that they are missing from the WAD that is built. This is the
|
|
||||||
default behavior.
|
|
||||||
|
|
||||||
=== +build-textures+
|
=== +build-textures+
|
||||||
|
|
||||||
This script processes the texture file (+texture1.txt+) and outputs
|
This script processes the texture file (+texture1.txt+) and outputs
|
||||||
|
|
|
||||||
8
Makefile
8
Makefile
|
|
@ -35,13 +35,13 @@ lumps/freedoom.lmp lumps/freedm.lmp: force
|
||||||
# update wadinfo.txt
|
# update wadinfo.txt
|
||||||
|
|
||||||
wadinfo.txt: buildcfg.txt subdirs lumps/freedoom.lmp
|
wadinfo.txt: buildcfg.txt subdirs lumps/freedoom.lmp
|
||||||
$(CPP) -P -DDOOM2 < $< | scripts/wadinfo-builder.py > $@
|
$(CPP) -P -DDOOM2 < $< > $@
|
||||||
wadinfo_phase1.txt: buildcfg.txt subdirs lumps/freedoom.lmp
|
wadinfo_phase1.txt: buildcfg.txt subdirs lumps/freedoom.lmp
|
||||||
$(CPP) -P -DDOOM1 -DULTDOOM < $< | scripts/wadinfo-builder.py -dummy > $@
|
$(CPP) -P -DDOOM1 -DULTDOOM < $< > $@
|
||||||
wadinfo_phase2.txt: buildcfg.txt subdirs lumps/freedoom.lmp
|
wadinfo_phase2.txt: buildcfg.txt subdirs lumps/freedoom.lmp
|
||||||
$(CPP) -P -DDOOM2 < $< | scripts/wadinfo-builder.py -dummy > $@
|
$(CPP) -P -DDOOM2 < $< > $@
|
||||||
wadinfo_freedm.txt : buildcfg.txt subdirs lumps/freedoom.lmp lumps/freedm.lmp
|
wadinfo_freedm.txt : buildcfg.txt subdirs lumps/freedoom.lmp lumps/freedm.lmp
|
||||||
$(CPP) -P -DFREEDM < $< | scripts/wadinfo-builder.py -dummy > $@
|
$(CPP) -P -DFREEDM < $< > $@
|
||||||
|
|
||||||
# deutex doesnt allow redirects for the filenames in the texture
|
# deutex doesnt allow redirects for the filenames in the texture
|
||||||
# entries, so we have to change the texture1 symlink to point
|
# entries, so we have to change the texture1 symlink to point
|
||||||
|
|
|
||||||
|
|
@ -1,176 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
#
|
|
||||||
# Wadinfo builder, rewritten in Python :)
|
|
||||||
|
|
||||||
import glob
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import re
|
|
||||||
|
|
||||||
dummy = False
|
|
||||||
|
|
||||||
# Given a file name, get the resource name for it:
|
|
||||||
|
|
||||||
def resource_for_filename(filename):
|
|
||||||
if "." in filename:
|
|
||||||
return filename[0:filename.index(".")]
|
|
||||||
else:
|
|
||||||
return filename
|
|
||||||
|
|
||||||
# Build look-up table, mapping section and resource name to filename.
|
|
||||||
|
|
||||||
def build_lookup_table():
|
|
||||||
result = {}
|
|
||||||
|
|
||||||
for filename in glob.glob("*/*"):
|
|
||||||
section = os.path.dirname(filename)
|
|
||||||
basename = os.path.basename(filename)
|
|
||||||
|
|
||||||
resource = resource_for_filename(basename)
|
|
||||||
|
|
||||||
result[(section, resource)] = filename
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
# Given a file base name, eg. "HEADE5", find the file to be used for
|
|
||||||
# that resource. If the file cannot be found, None is returned.
|
|
||||||
|
|
||||||
def find_file(section, name):
|
|
||||||
key = (section, name)
|
|
||||||
|
|
||||||
if key in file_lut:
|
|
||||||
return file_lut[key]
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Warning header displayed at the top of an output file.
|
|
||||||
|
|
||||||
def print_warning_header():
|
|
||||||
print("; This file is automatically generated.")
|
|
||||||
print("; Do not edit it directly!")
|
|
||||||
print("")
|
|
||||||
|
|
||||||
# Remove comments beginning with "#" or ";"
|
|
||||||
|
|
||||||
def remove_comments(text):
|
|
||||||
if "#" in text:
|
|
||||||
return text[0:text.index("#")]
|
|
||||||
elif ";" in text:
|
|
||||||
return text[0:text.index(";")]
|
|
||||||
else:
|
|
||||||
return text
|
|
||||||
|
|
||||||
# Get the name of a dummy lump to use as a stand-in for the
|
|
||||||
# given resource.
|
|
||||||
|
|
||||||
def get_dummy_name(section, resource):
|
|
||||||
|
|
||||||
# As a special case: some patches used in the TEXTURE1 lump
|
|
||||||
# are actually sprites that are used in textures. This means
|
|
||||||
# that they will not appear in patches/. But we don't want
|
|
||||||
# to include a dummy lump for these - they can just be removed.
|
|
||||||
# Detect this case and don't use a dummy.
|
|
||||||
if section == 'patches':
|
|
||||||
if os.path.exists('sprites/%s.png' % resource):
|
|
||||||
return None
|
|
||||||
|
|
||||||
if resource.lower().startswith("demo"):
|
|
||||||
return "fakedemo"
|
|
||||||
else:
|
|
||||||
return "dummy"
|
|
||||||
|
|
||||||
# Parse an assignment statement.
|
|
||||||
|
|
||||||
def parse_assignment(section, line, match):
|
|
||||||
resource = match.group(1).lower()
|
|
||||||
override = match.group(3)
|
|
||||||
|
|
||||||
# allow "= filename.ext" to override the filename used
|
|
||||||
|
|
||||||
if override is not None:
|
|
||||||
filename = find_file(section, override.lower())
|
|
||||||
else:
|
|
||||||
filename = find_file(section, resource.replace('\\', '^'))
|
|
||||||
|
|
||||||
# File not found?
|
|
||||||
|
|
||||||
if filename is None:
|
|
||||||
|
|
||||||
# This resource hasn't been submitted yet, so either
|
|
||||||
# comment the line out, or use a dummy resource,
|
|
||||||
# depending on configuration.
|
|
||||||
|
|
||||||
if dummy:
|
|
||||||
dummy_name = get_dummy_name(section, resource)
|
|
||||||
|
|
||||||
if dummy_name:
|
|
||||||
result = "%s = %s" % (resource, dummy_name)
|
|
||||||
else:
|
|
||||||
result = "; %s - no dummy" % resource
|
|
||||||
else:
|
|
||||||
result = "; " + line
|
|
||||||
else:
|
|
||||||
# Resource found.
|
|
||||||
|
|
||||||
result = line
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
# Parse data from the given input stream.
|
|
||||||
|
|
||||||
def parse_stream(stream):
|
|
||||||
|
|
||||||
section_re = re.compile(r'\[(.*)\]')
|
|
||||||
assignment_re = re.compile(r'\s*(\S+)[^\=]*(\s*\=\s*(\S+))?')
|
|
||||||
|
|
||||||
print_warning_header()
|
|
||||||
|
|
||||||
section = None
|
|
||||||
|
|
||||||
# Parse each line of the input file, possibly changing things as we go.
|
|
||||||
|
|
||||||
for line in stream:
|
|
||||||
|
|
||||||
# Strip newline
|
|
||||||
|
|
||||||
line = line[0:len(line) - 1]
|
|
||||||
|
|
||||||
# Remove comments
|
|
||||||
|
|
||||||
line = remove_comments(line)
|
|
||||||
|
|
||||||
# start of new section?
|
|
||||||
|
|
||||||
match = section_re.search(line)
|
|
||||||
|
|
||||||
if match:
|
|
||||||
section = match.group(1)
|
|
||||||
|
|
||||||
if section == "texture1" or section == "texture2":
|
|
||||||
section = "textures"
|
|
||||||
|
|
||||||
else:
|
|
||||||
# Possibly comment out assignments.
|
|
||||||
|
|
||||||
match = assignment_re.match(line)
|
|
||||||
|
|
||||||
if match:
|
|
||||||
line = parse_assignment(section, line, match)
|
|
||||||
|
|
||||||
print(line)
|
|
||||||
|
|
||||||
# Parse command line options:
|
|
||||||
|
|
||||||
for arg in sys.argv:
|
|
||||||
if arg == "-dummy":
|
|
||||||
dummy = True
|
|
||||||
|
|
||||||
# Build look-up table for files:
|
|
||||||
|
|
||||||
file_lut = build_lookup_table()
|
|
||||||
|
|
||||||
# Parse the input stream:
|
|
||||||
|
|
||||||
parse_stream(sys.stdin)
|
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue