You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@annotator.apache.org by ra...@apache.org on 2022/04/24 04:23:35 UTC
[incubator-annotator] 02/07: Consistently use tabs in Makefile
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit d78f69d2f63bcd3330a26487d6d5f963f6b65e92
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Fri Apr 15 14:54:32 2022 -0700
Consistently use tabs in Makefile
---
.editorconfig | 4 ++++
Makefile | 24 ++++++++++++------------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 1597c18..1bc1d35 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,3 +8,7 @@ indent_style = space
insert_final_newline = true
max_line_length = 80
trim_trailing_whitespace = true
+
+[Makefile]
+indent_size = 8
+indent_style = tab
diff --git a/Makefile b/Makefile
index 7d6bfdd..791350c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,19 +14,19 @@
# What is the prerelease version?
vsn_pre = $(shell git describe --tags --always --first-parent \
- | grep -Eo -- '(-rc\.[0-9]+)?$$' \
- 2>/dev/null)
+ | grep -Eo -- '(-rc\.[0-9]+)?$$' \
+ 2>/dev/null)
# What is the release version?
vsn_rel = $(shell git describe --tags --always --first-parent \
- | grep -Eo -- '^v[0-9]+\.[0-9]\.[0-9]+' \
- | tail -c +2 \
- 2>/dev/null)
+ | grep -Eo -- '^v[0-9]+\.[0-9]\.[0-9]+' \
+ | tail -c +2 \
+ 2>/dev/null)
# What is the release tag?
vsn_tag = $(shell git describe --tags --always --first-parent \
- | grep -Eo -- '^v[0-9]+\.[0-9]\.[0-9]+(-rc.[0-9]+)?$$' \
- 2>/dev/null)
+ | grep -Eo -- '^v[0-9]+\.[0-9]\.[0-9]+(-rc.[0-9]+)?$$' \
+ 2>/dev/null)
annotator_vsn = $(vsn_rel)
@@ -64,9 +64,9 @@ else
dist:
@rm -rf apache-annotator-$(annotator_vsn)-incubating
@git archive \
- --output apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz \
- --prefix apache-annotator-$(annotator_vsn)-incubating/ \
- $(vsn_tag)
+ --output apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz \
+ --prefix apache-annotator-$(annotator_vsn)-incubating/ \
+ $(vsn_tag)
@echo "Done: apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz"
endif
@@ -80,6 +80,6 @@ distcheck: dist
distsign: dist
@gpg -ab apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz
@sha256sum apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz \
- > apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz.sha256
+ > apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz.sha256
@sha512sum apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz \
- > apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz.sha512
+ > apache-annotator-$(annotator_vsn)$(vsn_pre)-incubating.tar.gz.sha512