Disallow filenames which end in a cloparen

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index a0f6983b54602a2c53d8dde0bd2b069cba460a01..1bdc8b76fde13491b92c3c5399b9d27e313a2337 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -22,6 +22,7 @@ override define makefileinfo
 ║│ • file                                                     │║
 ║│ • find                                                     │║
 ║│ • git (optional)                                           │║
 ║│ • file                                                     │║
 ║│ • find                                                     │║
 ║│ • git (optional)                                           │║

+║│ • ln                                                       │║

 ║│ • mkdir (requires support for `-p´)                        │║
 ║│ • mv                                                       │║
 ║│ • od (requires support for `-t x1´)                        │║
 ║│ • mkdir (requires support for `-p´)                        │║
 ║│ • mv                                                       │║
 ║│ • od (requires support for `-t x1´)                        │║


@@ -93,6 +94,7 @@ ECHO := echo
 FILE := file
 FIND := find
 GIT := git
 FILE := file
 FIND := find
 GIT := git

+LN := ln

 MKDIR := mkdir
 MV := mv
 OD := od
 MKDIR := mkdir
 MV := mv
 OD := od


@@ -134,27 +136,31 @@ DESTDIR := public
 # By default, this is inferred from the variable `MAKEFILE_LIST´.
 THISDIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
 
 # By default, this is inferred from the variable `MAKEFILE_LIST´.
 THISDIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
 

-# The location of the magic files to use when determining media types.
-#
-# One is provided as part of this repository, but you can override it if you need different media type detection.
+# Configuration of `find´.

 #
 #

-# Your computer probably has a more comprehensive one installed at `/usr/share/file/magic´, but it is not recommended that you use this directly.
-# Instead, link or copy just the files you expect to need for your project.
-MAGICDIR := $(patsubst ./%,%,$(THISDIR)/magic)
+# By default, `find´ will ignore files which begin with a period and those which are likely to cause problems for `make´.
+EXTRAFINDRULES :=
+EXTRAFINDINCLUDERULES :=
+FINDRULES := ! '(' '(' -name '[.-]*' -o -name '*[][*?:|$$%\#\\; ]*' -o -name '*[)]' ')' -a -prune ')'$(if $(EXTRAFINDRULES), -a $(EXTRAFINDRULES),)
+FINDINCLUDERULES := $(FINDRULES)$(if $(EXTRAFINDINCLUDERULES), -a $(EXTRAFINDINCLUDERULES),)

 
 

-# Configuration of `find´.
+# The list of magic files to use when determining media types.

 #
 #

-# By default, `find´ will ignore hidden files, those which begin with a period, and those which are likely to cause problems for `make´.
-FINDRULES := -flags -nohidden -and ! '(' '(' -name '[.-]*' -or -name '*[][*?:|$$%\#;]*' ')' -and -prune ')'
-FINDINCLUDERULES := $(FINDRULES)
+# Some are provided as part of this repository, but you can add more if you need different media type detection.
+#
+# Your computer probably has several already installed at `/usr/share/file/magic´.
+EXTRAMAGIC :=
+MAGIC := $(sort $(patsubst ./%,%,$(wildcard $(THISDIR)/magic/*)) $(EXTRAMAGIC))

 
 # The list of parsers for plaintext file types.
 #
 # Which parsers are provided will influence which kinds of files are recognized as plaintext.
 
 # The list of parsers for plaintext file types.
 #
 # Which parsers are provided will influence which kinds of files are recognized as plaintext.

-PARSERS := $(patsubst ./%,%,$(wildcard $(THISDIR)/parsers/*.xslt))
+EXTRAPARSERS :=
+PARSERS := $(sort $(patsubst ./%,%,$(wildcard $(THISDIR)/parsers/*.xslt)) $(EXTRAPARSERS))

 
 # The list of transforms.
 
 # The list of transforms.

-TRANSFORMS := $(patsubst ./%,%,$(wildcard $(THISDIR)/transforms/*.xslt))
+EXTRATRANSFORMS :=
+TRANSFORMS := $(sort $(patsubst ./%,%,$(wildcard $(THISDIR)/transforms/*.xslt)) $(EXTRATRANSFORMS))

 
 # List of types which should be treated as X·M·L.
 XMLTYPES := application/xml text/xml
 
 # List of types which should be treated as X·M·L.
 XMLTYPES := application/xml text/xml


@@ -210,10 +216,10 @@ override perenc = $(foreach unencoded,$1,$(call perdec,$(shell $(PRINTF) '%s' $(
 override pathenc = $(foreach path,$1,$(subst $(space),/,$(call perenc,$(subst /, ,$(path)))))
 
 # (overridable) Collect all of the applicable includes from the includes directory.
 override pathenc = $(foreach path,$1,$(subst $(space),/,$(call perenc,$(subst /, ,$(path)))))
 
 # (overridable) Collect all of the applicable includes from the includes directory.

-sourceincludes := $(shell $(FIND) $(foreach dir,$(INCLUDEDIR),$(call quote,$(dir))) -type f '(' $(FINDRULES) ')')
+sourceincludes := $(shell $(FIND) $(foreach dir,$(INCLUDEDIR),$(call quote,$(dir))) '(' $(FINDRULES) ')' -a -type f)

 
 # (overridable) Collect all of the applicable source files from the source directory, removing any which are also includes.
 
 # (overridable) Collect all of the applicable source files from the source directory, removing any which are also includes.

-sourcefiles := $(filter-out $(sourceincludes),$(shell $(FIND) $(foreach dir,$(SRCDIR),$(call quote,$(dir))) -type f '(' $(FINDRULES) ')'))
+sourcefiles := $(filter-out $(sourceincludes),$(shell $(FIND) $(foreach dir,$(SRCDIR),$(call quote,$(dir))) '(' $(FINDRULES) ')' -a -type f))

 
 ifdef GIT
 ifneq ($(wildcard $(THISDIR)/.git),)
 
 ifdef GIT
 ifneq ($(wildcard $(THISDIR)/.git),)


@@ -251,6 +257,15 @@ override typeoffile = $(patsubst $(foreach file,$1,$(file)|%),%,$(filter $(forea
 # (callable) Get the identifier for the given parser or transform.
 override id = $(or $(shell $(XMLLINT) --xpath '/*/*[local-name()="id" and namespace-uri()="urn:fdc:ladys.computer:20231231:Shu1She4"]/text()[1]' $1 2> /dev/null),about:shushe?$(or $2,unknown)=$(call pathenc,$(basename $(notdir $1))))
 
 # (callable) Get the identifier for the given parser or transform.
 override id = $(or $(shell $(XMLLINT) --xpath '/*/*[local-name()="id" and namespace-uri()="urn:fdc:ladys.computer:20231231:Shu1She4"]/text()[1]' $1 2> /dev/null),about:shushe?$(or $2,unknown)=$(call pathenc,$(basename $(notdir $1))))
 

+# Pair each source magic file with its location in the build directory.
+override magicpair := $(foreach magicfile,$(MAGIC),$(magicfile)|$(BUILDDIR)/magic/$(notdir $(magicfile)))
+
+# (callable) Get the source file for the given magic files.
+override magicsource = $(foreach magicpath,$1,$(patsubst %|$(magicpath),%,$(firstword $(filter %|$(magicpath),$(magicpair)))))
+
+# (callable) Get the build file for the given magic files.
+override magicfile = $(foreach file,$1,$(patsubst $(file)|%,%,$(filter $(file)|%,$(magicpair))))
+

 # (callable) Get the local path for the given source file.
 override sourcepath = $(firstword $(foreach directory,$(SRCDIR),$(if $(filter $(directory)/%,$1),$(patsubst $(directory)/%,%,$1),)))
 
 # (callable) Get the local path for the given source file.
 override sourcepath = $(firstword $(foreach directory,$(SRCDIR),$(if $(filter $(directory)/%,$1),$(patsubst $(directory)/%,%,$1),)))
 


@@ -386,12 +401,12 @@ $(call compiled,$(recursivefiles)):
 # Phony rules; always consider these out·of·date.
 .PHONY: all default clean gone info install list uninstall $(call compiled,$(recursivefiles));
 
 # Phony rules; always consider these out·of·date.
 .PHONY: all default clean gone info install list uninstall $(call compiled,$(recursivefiles));
 

-ifneq ($(wildcard $(BUILDDIR)/.update-types)$(wildcard $(BUILDDIR)/dependencies),)
-# Reload this make·file if the dependency graph has changed.
+ifneq ($(wildcard $(BUILDDIR)/.update-types)$(wildcard $(BUILDDIR)/dependencies)$(wildcard $(BUILDDIR)/destinations),)
+# Reload this make·file if the dependency graph or output destinations have changed.

 #
 # The dependency graph and output destinations are used to set the values of variables in this make·file, so it’s important to ensure that they are actually up·to·date prior to executing any later rules.
 #
 #
 # The dependency graph and output destinations are used to set the values of variables in this make·file, so it’s important to ensure that they are actually up·to·date prior to executing any later rules.
 #

-# This recipe only exists after types have been updated or when the dependency graph already exists.
+# This recipe only exists after types have been updated or when the dependency graph or destinations file already exists.

 $(THISDIR)/GNUmakefile:: $(BUILDDIR)/dependencies $(BUILDDIR)/destinations
        $(silent)$(TOUCH) $(THISDIR)/GNUmakefile
        $(silent)$(RM) -f $(BUILDDIR)/.update-types
 $(THISDIR)/GNUmakefile:: $(BUILDDIR)/dependencies $(BUILDDIR)/destinations
        $(silent)$(TOUCH) $(THISDIR)/GNUmakefile
        $(silent)$(RM) -f $(BUILDDIR)/.update-types


@@ -406,7 +421,7 @@ ifeq ($(wildcard $(BUILDDIR)/.update-types),)
 # This recipe sleeps for one second to ensure that files built after the restart have a more current time·stamp.
 $(THISDIR)/GNUmakefile:: $(BUILDDIR)/magic.mgc $(BUILDDIR)/parser.xslt
        $(silent)$(TOUCH) $(THISDIR)/GNUmakefile
 # This recipe sleeps for one second to ensure that files built after the restart have a more current time·stamp.
 $(THISDIR)/GNUmakefile:: $(BUILDDIR)/magic.mgc $(BUILDDIR)/parser.xslt
        $(silent)$(TOUCH) $(THISDIR)/GNUmakefile

-       $(silent)$(RM) -f $(call quote,$(BUILDDIR)/dependencies)
+       $(silent)$(RM) -f $(call quote,$(BUILDDIR)/dependencies) $(call quote,$(BUILDDIR)/destinations)

        @$(PRINTF) '%b\n' '\0033[1mMagic file or parsers have updated. Restarting…\0033[22m'
        $(silent)$(SLEEP) 1
        $(silent)$(TOUCH) $(call quote,$(BUILDDIR)/.update-types)
        @$(PRINTF) '%b\n' '\0033[1mMagic file or parsers have updated. Restarting…\0033[22m'
        $(silent)$(SLEEP) 1
        $(silent)$(TOUCH) $(call quote,$(BUILDDIR)/.update-types)


@@ -414,14 +429,21 @@ endif
 
 # ─ ¶ Build Targets ───────────────────────────────────────────────────
 
 
 # ─ ¶ Build Targets ───────────────────────────────────────────────────
 

+# Create symbolic links from the build directory’s store of magic files
+# to their corresponding sources.
+$(call magicfile,$(MAGIC)): $(BUILDDIR)/magic/%: $$(call magicsource,$$@)
+       $(silent)$(call ensuredirectory,$(dir $@))
+       $(silent)$(LN) -sf $(call quote,$(realpath $<)) $(call quote,$@)
+

 # Generate the compiled magic file from its sources.
 #
 # It must be updated if any of the files in the magic directory change.
 # It ⁜also⁜ should be updated if any of the files in the magic directory are deleted, but this isn’t tracked presently.
 # Generate the compiled magic file from its sources.
 #
 # It must be updated if any of the files in the magic directory change.
 # It ⁜also⁜ should be updated if any of the files in the magic directory are deleted, but this isn’t tracked presently.

-$(BUILDDIR)/magic.mgc: $(wildcard $(MAGICDIR)/*)
+$(BUILDDIR)/magic.mgc: $(call magicfile,$(MAGIC))
+       $(foreach outdated,$(filter-out $^,$(wildcard $(BUILDDIR)/magic/*)),$(silent)$(RM) $(call quote,$(outdated))$(newline))

        @$(ECHO) "Compiling new magic…"
        $(silent)$(call ensuredirectory,$(dir $@))
        @$(ECHO) "Compiling new magic…"
        $(silent)$(call ensuredirectory,$(dir $@))

-       $(silent)cd $(call quote,$(BUILDDIR)) && $(FILE) -C -m $(call quote,$(realpath $(MAGICDIR)))
+       $(silent)cd $(call quote,$(BUILDDIR)) && $(FILE) -C -m $(call quote,$(realpath $(BUILDDIR)/magic))

 
 # Generate the main parser.
 $(BUILDDIR)/parser.catalog: $(PARSERS)
 
 # Generate the main parser.
 $(BUILDDIR)/parser.catalog: $(PARSERS)