Makefile: remove wad-image targets
These targets were rather complicated to set up and use and were
geared around a couple very specific use-cases rather than fully
allowing a set of features wad2image can really accomplish.
In favor of keeping Freedoom’s Makefile relevant just to building (and
installing) our own game, let’s remove this. wad2image can be used
independently anyhow. 😃
master
Mike Swanson
parent
f961c3e72c
commit
119f129417
|
|
@ -73,8 +73,4 @@ doom.gpl
|
|||
|
||||
/lumps/textures/phase2/
|
||||
|
||||
/scripts/wad2image
|
||||
|
||||
/wad-images/
|
||||
|
||||
/wads/
|
||||
|
|
|
|||
130
Makefile
130
Makefile
|
|
@ -131,136 +131,6 @@ clean: wad-image-clean
|
|||
$(MAKE) -C lumps/textures clean
|
||||
$(MAKE) -C manual clean
|
||||
|
||||
# Variables that are common to wad-image* targets.
|
||||
WI_LEVELS := levels
|
||||
WI_SCRIPTS := scripts
|
||||
WI_PATH := $(shell command -v wad2image.py)
|
||||
WI_HOME := $(if $(WAD2IMAGE_HOME),$(WAD2IMAGE_HOME),$(if $(WI_PATH),$(shell $(WI_PATH) \
|
||||
--get-top-dir),$(WI_SCRIPTS)/wad2image))
|
||||
WI_IMAGES := wad-images
|
||||
WI_WAD_SPATH := wads,{top-dir}/wads,.,/usr/share/doom,/usr/local/doom
|
||||
WI_ALL_OPTIONS := $(WI_OPTIONS) $(if $(WI_BW), --colors-images bw,) \
|
||||
$(if $(WI_CMD), --show-cmd $(WI_CMD),) $(if $(WI_GIF), -d gif,) \
|
||||
$(if $(WI_IMAGES), --out-dir $(WI_IMAGES),) $(if $(WI_SHOW), -s,) \
|
||||
$(if $(WI_VERBOSE), -v,) $(if $(WI_WAD_SPATH), --wad-spath $(WI_WAD_SPATH),)
|
||||
wad-image-common:
|
||||
ifndef WI_IMAGES
|
||||
$(error WI_IMAGES must be defined)
|
||||
endif
|
||||
ifndef WI_LEVELS
|
||||
$(error WI_LEVELS must be defined)
|
||||
endif
|
||||
ifndef WI_SCRIPTS
|
||||
$(error WI_SCRIPTS must be defined)
|
||||
endif
|
||||
ifndef WI_HOME
|
||||
$(error WI_HOME must be defined)
|
||||
endif
|
||||
|
||||
# Generating images for WADs in "levels" directory and show the result.
|
||||
WI_LATEST := $(shell ls -1t $(WI_LEVELS)/*.wad | head -n 1)
|
||||
WI_FILES := $(if $(WI_PATT), $(WI_LEVELS)/$(WI_PATT).wad, $(WI_LATEST))
|
||||
wad-image: wad-image-common
|
||||
@echo "Generating images for WADs in \"$(WI_LEVELS)\"."
|
||||
$(WI_HOME)/bin/wad2image.py $(WI_ALL_OPTIONS) $(WI_FILES)
|
||||
|
||||
# Cleanup generated images. Structured this way for safety.
|
||||
wad-image-clean: wad-image-common
|
||||
$(RM) $(WI_IMAGES)/*
|
||||
-rmdir $(WI_IMAGES)
|
||||
|
||||
# Diffing WADs in "levels" using git and show the diff."
|
||||
wad-image-diff: wad-image-common
|
||||
@echo "Diffing WADs in \"$(WI_LEVELS)\" using git."
|
||||
$(WI_HOME)/integration/git-wad-diff.sh "$(WI_COMMIT)" "$(WI_LEVELS)" $(WI_ALL_OPTIONS)
|
||||
|
||||
# Help for wad2image.
|
||||
wad-image-help: wad-image-common
|
||||
@echo "Help for wad-image* targets and WI_* variable which can be used to see"
|
||||
@echo "differences between WAD revisions, or to simply view WADs. The following targets"
|
||||
@echo "depend on wad2image being installed with bin/wad2image.py in it being in the"
|
||||
@echo "path, or alteratively wad2image being copied or symlinked to the \"$(WI_SCRIPTS)\""
|
||||
@echo "directory. Images are created in \"$(WI_IMAGES)\". Each variable's description"
|
||||
@echo "ends with \"Value:\" followed by that variable's current value. If no variables"
|
||||
@echo "have been specified on the make command line then the value shown is the"
|
||||
@echo "default value. Some variables are unset by default. wad2image can be downloaded"
|
||||
@echo "from http://selliott.org/utilities/wad2image."
|
||||
@echo ""
|
||||
@echo " Targets:"
|
||||
@echo ""
|
||||
@echo " wad-image Generate generate images for WAD files that are in the"
|
||||
@echo " workspace."
|
||||
@echo " wad-image-clean Remove \"$(WI_IMAGES)\" as well as all files in it."
|
||||
@echo " wad-image-diff Use git to generate diff image showing the differences"
|
||||
@echo " between two revisions of WAD files. By default the"
|
||||
@echo " difference is between latest HEAD and the workspace, but the"
|
||||
@echo " WI_COMMIT variable can be used to generate other diffs."
|
||||
@echo " wad-image-help This help message."
|
||||
@echo ""
|
||||
@echo " Variables:"
|
||||
@echo ""
|
||||
@echo " WI_BW Make diff images black or white (high contrast) instead of"
|
||||
@echo " full color. This applies to wad-image-diff-only."
|
||||
@echo " Value: $(WI_BW)"
|
||||
@echo " WI_CMD Command used to display images. \"display\" is used if no"
|
||||
@echo " value is specified. \"animate\" works well for animated"
|
||||
@echo " GIFs. Value: $(WI_CMD)"
|
||||
@echo " WI_COMMIT When the wad-image-diff target is invoked this variable"
|
||||
@echo " specifies which revisions are compared. It's similar to"
|
||||
@echo " git's \"commit\" argument. Value: $(WI_COMMIT)"
|
||||
@echo " WI_GIF Create animated GIFs instead of color coded files for the"
|
||||
@echo " diff. Value: $(WI_GIF)"
|
||||
@echo " WI_HOME The location where wad2image is installed. By default PATH"
|
||||
@echo " is searched for \"wad2image.py\". If it's found the"
|
||||
@echo " enclosing installation directory is used. If it's not found"
|
||||
@echo " $(WI_SCRIPTS)/wad2image is used. Value: $(WI_HOME)"
|
||||
@echo " WI_IMAGES The output directory that will contain the images created."
|
||||
@echo " Value: $(WI_IMAGES)"
|
||||
@echo " WI_LEVELS Subdirectory with the level WADs. Value: $(WI_IMAGES)"
|
||||
@echo " WI_OPTIONS Additional command line options for wad2image."
|
||||
@echo " Value: $(WI_OPTIONS)"
|
||||
@echo " WI_SHOW If set then show the images after creating them."
|
||||
@echo " Value: $(WI_SHOW)"
|
||||
@echo " WI_PATT Files patterns that are applied to files in the"
|
||||
@echo " \"$(WI_LEVELS)\" directory without the \".wad\" suffix. For"
|
||||
@echo " example, \"map0*\" to get MAP01 - MAP09. This applies to"
|
||||
@echo " wad-image only. Value: $(WI_PATT)"
|
||||
@echo " WI_VERBOSE If set then make wad2image more verbose."
|
||||
@echo " Value: $(WI_VERBOSE)"
|
||||
@echo " WI_WAD_SPATH The search path for WADs where a fully qualified path was"
|
||||
@echo " not given. This is typically used for the IWAD. By default"
|
||||
@echo " \"wads\" is searched first, so it helps to complete a build"
|
||||
@echo " before generating images. Value: $(WI_WAD_SPATH)"
|
||||
@echo ""
|
||||
@echo " Examples:"
|
||||
@echo ""
|
||||
@echo " Verbosely create and display an image for the most recently modified WAD"
|
||||
@echo " file in \"levels\":"
|
||||
@echo " make wad-image WI_VERBOSE=t"
|
||||
@echo ""
|
||||
@echo " Create and display the image for MAP05:"
|
||||
@echo " make wad-image WI_PATT=map05"
|
||||
@echo ""
|
||||
@echo " Verbosely create color coded diffs for changed files in the workspace:"
|
||||
@echo " make wad-image-diff WI_VERBOSE=t"
|
||||
@echo ""
|
||||
@echo " Same as above but Yadex style (example of WI_OPTIONS):"
|
||||
@echo " make wad-image-diff WI_VERBOSE=t WI_OPTIONS=\"-c yadex\""
|
||||
@echo ""
|
||||
@echo " Same as the above, but with high contrast black or white images, but"
|
||||
@echo " without Yadex style:"
|
||||
@echo " make wad-image-diff WI_VERBOSE=t WI_BW=t"
|
||||
@echo ""
|
||||
@echo " Same as above, but use animated GIFs to illustrate the diff instead of"
|
||||
@echo " colors. Also, once the animated GIFs are created they'll be shown with"
|
||||
@echo " the \"animate\" command:"
|
||||
@echo " make wad-image-diff WI_VERBOSE=t WI_GIF=t WI_SHOW=t WI_CMD=animate"
|
||||
@echo ""
|
||||
@echo " Same as above, but illustrate the diff between two git revisions instead of"
|
||||
@echo " the workspace:"
|
||||
@echo " make wad-image-diff WI_VERBOSE=t WI_GIF=t WI_SHOW=t WI_CMD=animate \
|
||||
WI_COMMIT=\"0c004ce~..0c004ce\""
|
||||
|
||||
# Test targets all of which are a dependency of "test".
|
||||
|
||||
# Test that WAD files have the expected map names.
|
||||
|
|
|
|||
Loading…
Reference in New Issue