freedoom
/
freedoom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build separate Zips for doom/doom2 and FreeDM 

Consensus shows that the change in
2014-01-07T06:34:47Z!mikeonthecomputer@gmail.com was a bit too
extreme. Keep FreeDM as its own special thing, being much more focused
on multiplayer than the other IWADs, as well as being the
vanilla-compatible IWAD.
master
Mike Swanson 2014-01-07 17:45:41 -08:00
parent 2912bd1ca1
commit 65eec022ea
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -34,10 +34,11 @@ DEUTEX=deutex
DEUTEX_BASIC_ARGS=-v0 -fullsnd -rate accept -rgb 0 255 255
DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
OBJS= \
$(WADS)/doom2.wad \
$(WADS)/doom.wad \
$(WADS)/freedm.wad
FREEDOOM1=$(WADS)/doom.wad
FREEDOOM2=$(WADS)/doom2.wad
FREEDM=$(WADS)/freedm.wad
OBJS=$(FREEDM) $(FREEDOOM1) $(FREEDOOM2)
all: $(OBJS)
@ -93,7 +94,7 @@ wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
#---------------------------------------------------------
# freedm iwad
$(WADS)/freedm.wad: wadinfo_freedm.txt subdirs force
$(FREEDM): wadinfo_freedm.txt subdirs force
@mkdir -p $(WADS)
ln -sf freedm/texture1.txt textures/texture1.txt
rm -f $@
@ -102,7 +103,7 @@ $(WADS)/freedm.wad: wadinfo_freedm.txt subdirs force
#---------------------------------------------------------
# doom2 iwad
$(WADS)/doom2.wad: wadinfo_iwad.txt subdirs force
$(FREEDOOM2): wadinfo_iwad.txt subdirs force
@mkdir -p $(WADS)
ln -sf doom2/texture1.txt textures/texture1.txt
rm -f $@
@ -111,7 +112,7 @@ $(WADS)/doom2.wad: wadinfo_iwad.txt subdirs force
#---------------------------------------------------------
# udoom iwad
$(WADS)/doom.wad: wadinfo_ult.txt subdirs force
$(FREEDOOM1): wadinfo_ult.txt subdirs force
@mkdir -p $(WADS)
ln -sf doom/texture1.txt textures/texture1.txt
rm -f $@
@ -121,8 +122,12 @@ doc: BUILD-SYSTEM.asc README.asc
asciidoc BUILD-SYSTEM.asc
asciidoc README.asc
DISTDOCS=COPYING CREDITS README.html
# Due to convoluted reasons, the WADs must directly proceed the game name.
dist: $(OBJS) doc
VERSION=$(VERSION) scripts/makepkgs $(OBJS)
VERSION=$(VERSION) scripts/makepkgs freedm $(FREEDM) $(DISTDOCS)
VERSION=$(VERSION) scripts/makepkgs freedoom $(FREEDOOM1) $(FREEDOOM2) $(DISTDOCS)
clean:
rm -f *.html deutex.log $(OBJS) \

19
scripts/makepkgs
View File

@ -32,13 +32,8 @@ import sys
# Documentation files included with distributions.
DIST_DOCS = [
"COPYING",
"CREDITS",
"README.html"
]
DIR_NAME='freedoom'
GAME_NAME=sys.argv[1]
FILES=sys.argv[2:]
# Run a command, displaying it before executing it.
@ -57,17 +52,17 @@ if version[0] is 'v':
# Strip the leading 'v' from versioning
version = version[1:]
path = os.path.dirname(sys.argv[1])
basename = os.path.basename(sys.argv[1])
path = os.path.dirname(FILES[0])
basename = os.path.basename(FILES[0])
base_dir = DIR_NAME + "-" + version
base_dir = GAME_NAME + "-" + version
full_path = path + "/" + base_dir
# Create directory and add files
run_command("mkdir %s" % full_path)
for files in DIST_DOCS + sys.argv[1:]:
run_command("cp %s %s" % (files, full_path))
for file in FILES:
run_command("cp %s %s" % (file, full_path))
orig_dir = os.getcwd()