simon-git: utils (master): utils.git
Commits to Tartarus hosted VCS
tartarus-commits at lists.tartarus.org
Sat Oct 8 08:09:56 BST 2016
TL;DR:
da24411 Support additional utility subdirs.
e2c8fc4 Provide a 'make git-pull' top-level target.
cee2882 New system for iterating over subdirectories.
Repository: https://git.tartarus.org/simon/utils.git
On the web: https://git.tartarus.org/?p=simon/utils.git
Branch updated: master
Committer: utils.git
Date: 2016-10-08 08:09:56
commit da24411e37c20ccc56efa2ab61a69cbc921eb669
web diff https://git.tartarus.org/?p=simon/utils.git;a=commitdiff;h=da24411e37c20ccc56efa2ab61a69cbc921eb669;hp=76b1171f1a0745d733f7248a600132101b7ced3f
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Oct 8 07:21:14 2016 +0100
Support additional utility subdirs.
Instead of this top-level umbrella Makefile containing a fixed list of
all the subdirectories over which it will ever iterate to run commands
like 'make' and 'make install', we now identify our set of utilities
using GNU make wildcards to find any subdir containing a Makefile.
This means we can no longer handle the need to distinguish X from
non-X utilities by having an exhaustive list of each; instead, we now
expect each X-requiring utility to have a .need_x11 file in it.
The fixed list of utilities in the top-level Makefile still exists,
but now it's _only_ used for 'make checkout' to check out the default
set.
This will make it easier for me to prepare new utilities for
publication, and will also allow me to drop more idiosyncratic things
(stuff so tailored to my own preferences that it would be
unpublishable anyway) into my own checkout of this repo and have the
same top-level 'make install' targets apply equally to those and the
published utilities in one easy step.
Makefile | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
commit e2c8fc451e10964661282b7a4b8cc6638c3141c3
web diff https://git.tartarus.org/?p=simon/utils.git;a=commitdiff;h=e2c8fc451e10964661282b7a4b8cc6638c3141c3;hp=da24411e37c20ccc56efa2ab61a69cbc921eb669
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Oct 8 07:25:03 2016 +0100
Provide a 'make git-pull' top-level target.
For safety, it pulls in --ff-only mode; but this means that if I have
a long-standing checkout of this system I can update it all easily,
rather than having to remember which subdirectories might have had
upstream changes.
Makefile | 3 +++
1 file changed, 3 insertions(+)
commit cee2882effb7f16fc0839c75cb1f0766fb953e33
web diff https://git.tartarus.org/?p=simon/utils.git;a=commitdiff;h=cee2882effb7f16fc0839c75cb1f0766fb953e33;hp=e2c8fc451e10964661282b7a4b8cc6638c3141c3
Author: Simon Tatham <anakin at pobox.com>
Date: Sat Oct 8 07:55:35 2016 +0100
New system for iterating over subdirectories.
This is a more make-like approach, by defining a make target for each
sub-make invocation. In particular, it should permit parallel make of
the subdirectories, and also arrange reliable error tracking so that
if any sub-make fails at all, the top-level make will fail.
(Previously, the shell for-loops happened to work out that the
top-level make would fail only if the _last_ utility built - typically
xcopy - had a problem.)
Makefile | 70 ++++++++++++++++++++++------------------------------------------
1 file changed, 24 insertions(+), 46 deletions(-)
More information about the tartarus-commits
mailing list