BUILD-SYSTEM: Update for newer AsciiDoc table syntax and box chars

Also remove references to doom1.wad which is no longer built.
master
Mike Swanson 2014-01-04 05:43:51 -08:00
parent ed850290de
commit 3717e52c97
1 changed files with 48 additions and 60 deletions

View File

@ -20,32 +20,32 @@ following diagram illustrates the process:
................................................................
buildcfg.txt textures/combined.txt
| |
| ----------
| | cpp |
| ----------
| |
| textures/(wad)/texture1.txt
| | |
| ------------------- |
| | extract-pnames.py | |
| ------------------- |
-------- | |
| cpp |----- textures/(wad)/pnames.txt |
-------- |
| |
-------------------- |
| wadinfo-builder.py | |
-------------------- |
| |
wadinfo.txt |
| |
-------- |
| |-----------------------------------
| deutex |
| |--------- all other source files (graphics, etc)
--------
|
│ │
│ ┌─────┴────┐
│ │ cpp │
│ └─────┬────┘
│ │
textures/(wad)/texture1.txt
│ │ │
│ ┌────────┴──────────┐ │
│ │ extract─pnames.py │ │
│ └────────┬──────────┘ │
┌───┴────┐ │ │
│ cpp ├───── textures/(wad)/pnames.txt │
└───┬────┘ │
│ │
┌─────────┴──────────┐ │
│ wadinfo─builder.py │ │
└─────────┬──────────┘ │
│ │
wadinfo.txt
│ │
┌───┴────┐ │
│ ├───────────────────────────────────┘
│ deutex │
│ ├───────── all other source files (graphics, etc)
└───┬────┘
wads/(wadname).wad
................................................................
@ -64,8 +64,6 @@ system:
* +freedoom_textures.wad+ : Resource PWAD containing the (Doom II)
textures.
* +doom2.wad+ : Doom II IWAD file.
* +doom1.wad+ : "Shareware" IWAD file, containing only episode 1
levels, and a reduced set of textures and sprites.
* +doom.wad+ : "Ultimate" Doom I IWAD file.
* +freedm.wad+ : FreeDM IWAD file, containing deathmatch levels, and
with all monsters replaced by dummy graphics.
@ -88,8 +86,6 @@ based on the type of output target desired:
* +DOOM2+ : Build for a Doom II WAD.
* +DOOM1+ : Build for a Doom I WAD.
* +SHAREWARE+ : Build for a small IWAD file, similar to the Doom
shareware file.
* +ULTDOOM+ : Include episode four levels.
=== Texture configuration file (+textures/combined.txt+)
@ -106,8 +102,6 @@ line variables are defined based on the desired build settings:
* +DOOM1+ : Include textures that only exist in Doom I.
* +DOOM2+ : Include textures that only exist in Doom II.
* +ULTDOOM+ : Include textures that only exist in Ultimate Doom.
* +SHAREWARE+ : Only include textures that are needed for the
shareware build.
* +FREEDM+ : Include textures that are needed for FreeDM.
Note that +DOOM1+ and +DOOM2+ are not mutually exclusive, and the
@ -128,15 +122,13 @@ generate the +TEXTURE1+ lump. It is generated automatically from
Several different +texture1.txt+ files are generated for the different
WAD files that are built:
[frame=all]
`---------------------------------.--------------.--------------
Filename WAD file CPP variables
----------------------------------------------------------------
+textures/doom2/texture1.txt+ +doom2.wad+ DOOM1, DOOM2
+textures/doom/texture1.txt+ +doom.wad+ DOOM1, ULTDOOM
+textures/shareware/texture1.txt+ +doom1.wad+ SHAREWARE
+textures/freedm/texture1.txt+ +freedm.wad+ FREEDM
----------------------------------------------------------------
[frame="topbot",grid="none",options="header"]
|===============================================================
| Filename | WAD File | CPP Variables
| +textures/doom2/texture1.txt+ | +doom2.wad+ | DOOM1, DOOM2
| +textures/doom/texture1.txt+ | +doom.wad+ | DOOM1, ULTDOOM
| +textures/freedm/texture1.txt+ | +freedm.wad+ | FREEDM
|===============================================================
=== +pnames.txt+
@ -147,15 +139,13 @@ definition file (+texture1.txt+). It is generated by the
Several different +pnames.txt+ files are generated for the different
WAD files that are built:
[frame=all]
`---------------------------------.-----------------------------
Filename WAD file
----------------------------------------------------------------
+textures/doom2/texture1.txt+ +doom2.wad+ and resource WADs
+textures/doom/texture1.txt+ +doom.wad+
+textures/shareware/texture1.txt+ +doom1.wad+
+textures/freedm/texture1.txt+ +freedm.wad+
----------------------------------------------------------------
[frame="topbot",grid="none",options="header"]
|===============================================================
| Filename | WAD File
| +textures/doom2/texture1+ | +doom2.wad+ and resource WADs
| +textures/doom/texture1+ | +doom.wad+
| +textures/freedm/texture1+ | +freedm.wad+
|===============================================================
=== +wadinfo.txt+
@ -166,16 +156,14 @@ This is the auto-generated deutex configuration file, built from the
Several different +wadinfo.txt+ files are generated for the different
WAD files that are built:
[frame=all]
`-----------------------.--------------------.------------------
Filename WAD file CPP variables
----------------------------------------------------------------
+wadinfo.txt+ Resource WAD files DOOM2
+wadinfo_iwad.txt+ +doom2.wad+ DOOM2
+wadinfo_sw.txt+ +doom1.wad+ SHAREWARE
+wadinfo_freedm.txt+ +freedm.wad+ FREEDM
+wadinfo_ult.txt+ +doom.wad+ DOOM1, ULTDOOM
----------------------------------------------------------------
[frame="topbot",grid="none",options="header"]
|===============================================================
| Filename | WAD File | CPP Variables
| +wadinfo.txt+ | Resource WAD files | DOOM2
| +wadinfo_iwad.txt+ | +doom2.wad+ | DOOM2
| +wadinfo_freedm.txt+ | +freedm.wad+ | FREEDM
| +wadinfo_ult.txt+ | +doom.wad+ | DOOM1, ULTDOOM
|===============================================================
+wadinfo.txt+ differs from the others in that the '-dummy' option is
not passed to the +wadinfo-builder.py+ script.