From 0d4fc143ad39b77af676f0b953f8cbecd71bb8ea Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 11 Nov 2021 00:02:24 -0500 Subject: [PATCH] rename make precommit to make dev --- Makefile | 2 +- docs/src/build.md | 2 +- docs/src/build.md.in | 2 +- docs/src/contributing.md | 2 +- docs/src/contributing.md.in | 2 +- docs/src/manpage.txt | 2 +- man/manpage.txt | 2 +- man/mlr.1 | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0284ee456..c7d012c2b 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ install: # * turns *.md.in into *.md (live code samples), using mlr from the $PATH # * note the man/manpage.txt becomes some of the HTML content # * turns *.md into docs/site HTML and CSS files -precommit: +dev: make -C go fmt make -C go build make -C go check diff --git a/docs/src/build.md b/docs/src/build.md index a8cfc7def..95081aa00 100644 --- a/docs/src/build.md +++ b/docs/src/build.md @@ -70,7 +70,7 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo * Edit `go/src/version/version.go` from `6.1.0-dev` to `6.2.0`. * Edit version in `docs/mkdocs.yml` from `6.1.0` to `6.2.0`. - * Run `make precommit` in the Miller repo base directory + * Run `make dev` in the Miller repo base directory * The ordering in this makefile rule is important: the first build creates `mlr`; the second runs `mlr` to create `manpage.txt`; the third includes `manpage.txt` into one of its outputs. * Commit and push. diff --git a/docs/src/build.md.in b/docs/src/build.md.in index 89f368262..02ccf8cfa 100644 --- a/docs/src/build.md.in +++ b/docs/src/build.md.in @@ -54,7 +54,7 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo * Edit `go/src/version/version.go` from `6.1.0-dev` to `6.2.0`. * Edit version in `docs/mkdocs.yml` from `6.1.0` to `6.2.0`. - * Run `make precommit` in the Miller repo base directory + * Run `make dev` in the Miller repo base directory * The ordering in this makefile rule is important: the first build creates `mlr`; the second runs `mlr` to create `manpage.txt`; the third includes `manpage.txt` into one of its outputs. * Commit and push. diff --git a/docs/src/contributing.md b/docs/src/contributing.md index ef9103cdf..4206eb645 100644 --- a/docs/src/contributing.md +++ b/docs/src/contributing.md @@ -48,6 +48,6 @@ PRs which pass regression test ([https://github.com/johnkerl/miller/blob/main/go Much of Miller's documentation is autogenerated from code. With the `miller/go` directory in your `$PATH` (so it will find the modified `mlr` executable if -you've modified any source code), please do `make precommit` in the Miller base +you've modified any source code), please do `make dev` in the Miller base directory. This runs source build, unit test, regression test, manual-page autogen, document autogen, and document static-build all in the correct order. diff --git a/docs/src/contributing.md.in b/docs/src/contributing.md.in index 73791470d..2cd94a38f 100644 --- a/docs/src/contributing.md.in +++ b/docs/src/contributing.md.in @@ -32,6 +32,6 @@ PRs which pass regression test ([https://github.com/johnkerl/miller/blob/main/go Much of Miller's documentation is autogenerated from code. With the `miller/go` directory in your `$PATH` (so it will find the modified `mlr` executable if -you've modified any source code), please do `make precommit` in the Miller base +you've modified any source code), please do `make dev` in the Miller base directory. This runs source build, unit test, regression test, manual-page autogen, document autogen, and document static-build all in the correct order. diff --git a/docs/src/manpage.txt b/docs/src/manpage.txt index 54a13470e..30ee53cb0 100644 --- a/docs/src/manpage.txt +++ b/docs/src/manpage.txt @@ -2965,4 +2965,4 @@ SEE ALSO - 2021-11-10 MILLER(1) + 2021-11-11 MILLER(1) diff --git a/man/manpage.txt b/man/manpage.txt index 54a13470e..30ee53cb0 100644 --- a/man/manpage.txt +++ b/man/manpage.txt @@ -2965,4 +2965,4 @@ SEE ALSO - 2021-11-10 MILLER(1) + 2021-11-11 MILLER(1) diff --git a/man/mlr.1 b/man/mlr.1 index 456a9321f..d9a7aabd3 100644 --- a/man/mlr.1 +++ b/man/mlr.1 @@ -2,12 +2,12 @@ .\" Title: mlr .\" Author: [see the "AUTHOR" section] .\" Generator: ./mkman.rb -.\" Date: 2021-11-10 +.\" Date: 2021-11-11 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MILLER" "1" "2021-11-10" "\ \&" "\ \&" +.TH "MILLER" "1" "2021-11-11" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Portability definitions .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~