empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Declare subjects instead of picking them up automatically

Browse source 
Since subjects were added in Empire 2, we've always picked them up
from .SA requests.  If you mistype a subject there, you get a "is a
NEW subject" warning, and incorrect subject pages.  When building a
pristine tree, you get bogus "is a NEW subject" warnings for all
subjects.  If you somehow delete the generated subjects.mk, but not
the generated subject files, the build breaks.

Declare subjects in Make variable subjects.  Drop generated makefile
subject.mk.

Treat unknown topics in .SA arguments as errors.  This replaces the
"$subj is a NEW subject" warning.

Treat subjects without member pages as errors.  This replaces the "The
subject $subj has been removed" warning.

Safer and simpler.
This commit is contained in:
Markus Armbruster 2013-04-28 14:38:50 +02:00
parent cbed134d81
commit 890e88d149
5 changed files with 38 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Make.mk
View file

@ -56,8 +56,8 @@ tsrc := $(filter %.t, $(src))
man6 := $(filter man/%.6, $(src))
builtins := $(filter src/lib/global/%.config, $(src))
# Info subjects (automatically generated)
-include subjects.mk
# Info subjects
include $(srcdir)/info/subjects.mk
# Abbreviations
topics := $(patsubst %.t,%,$(notdir $(tsrc)))
@ -102,7 +102,7 @@ subst.in = sed \
# Generated files
# See `Cleanliness' below
mk := subjects.mk
mk :=
ifeq ($(revctrl),git)
mk += $(srcdir)/sources.mk
endif
@ -322,19 +322,18 @@ $(libs) $(empth_lib):
# Info formatting
# mksubj.pl reads $(tsrc) and writes subjects.mk $(tsubj). The naive
# rule
# subjects.mk $(ttop) $(tsubj): $(tsrc)
# mksubj.pl reads $(tsrc) and writes $(tsubj). The naive rule
# $(ttop) $(tsubj): $(tsrc)
# COMMAND
# runs COMMAND once for each target. That's because multiple targets
# in an explicit rule is just a shorthand for one rule per target,
# each with the same prerequisites and commands. Use a stamp file.
subjects.mk $(tsubj): info/stamp-subj ;
$(tsubj): info/stamp-subj ;
info/stamp-subj: info/mksubj.pl $(tsrc)
$(call quiet-command,perl $(srcdir)/info/mksubj.pl $(filter %.t, $^),GEN '$$(subjects)')
$(call quiet-command,perl $(srcdir)/info/mksubj.pl $(subjects) $(filter %.t, $^),GEN '$$(subjects)')
>$@
$(ttop): info/mktop.pl $(tsrc)
$(ttop): info/mktop.pl info/subjects.mk
$(call quiet-command,perl $(srcdir)/info/mktop.pl $@ $(subjects),GEN $@)
info.nr/all: $(filter-out info.nr/all, $(info.nr))