From fbbcd9470867da65b8e7acca88199467c859de78 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Thu, 1 Mar 2018 21:20:05 +0100 Subject: [PATCH] Change extension of AsciiDoc files to .adoc This should make them nicely rendered in the GitHub file tree. --- LICENSE.txt => LICENSE.adoc | 2 +- dev.mk.in | 14 +++++++------- doc/{AUTHORS.txt => AUTHORS.adoc} | 0 doc/{MANUAL.txt => MANUAL.adoc} | 0 doc/{NEWS.txt => NEWS.adoc} | 0 src/ccache.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename LICENSE.txt => LICENSE.adoc (99%) rename doc/{AUTHORS.txt => AUTHORS.adoc} (100%) rename doc/{MANUAL.txt => MANUAL.adoc} (100%) rename doc/{NEWS.txt => NEWS.adoc} (100%) diff --git a/LICENSE.txt b/LICENSE.adoc similarity index 99% rename from LICENSE.txt rename to LICENSE.adoc index 73a452225..ed0d9c688 100644 --- a/LICENSE.txt +++ b/LICENSE.adoc @@ -29,7 +29,7 @@ Copyright and authors --------------------- ccache is a collective work with contributions from many people, listed in -AUTHORS.txt and at https://ccache.samba.org/authors.html. Subsequent additions +AUTHORS.adoc and at https://ccache.samba.org/authors.html. Subsequent additions by contributing authors are implicitly licensed to the public under the same terms (GNU GPL version 3 or later), but the contributing authors retain copyrights on their portions of the work. diff --git a/dev.mk.in b/dev.mk.in index 07e8b6bd9..24ea01d9e 100644 --- a/dev.mk.in +++ b/dev.mk.in @@ -60,7 +60,7 @@ source_dist_files = \ $(test_sources) \ CONTRIBUTING.md \ GPL-3.0.txt \ - LICENSE.txt \ + LICENSE.adoc \ Makefile.in \ README.md \ autogen.sh \ @@ -70,9 +70,9 @@ source_dist_files = \ configure \ configure.ac \ dev.mk.in \ - doc/AUTHORS.txt \ - doc/MANUAL.txt \ - doc/NEWS.txt \ + doc/AUTHORS.adoc \ + doc/MANUAL.adoc \ + doc/NEWS.adoc \ install-sh \ m4 \ src/confitems.gperf \ @@ -151,10 +151,10 @@ distcheck: $(firstword $(dist_archives)) .PHONY: docs docs: $(generated_docs) -%.html: %.txt +%.html: %.adoc $(ASCIIDOC) -a revnumber=$(version) -a toc -b xhtml11 $< -%.xml: %.txt +%.xml: %.adoc $(ASCIIDOC) -a revnumber=$(version) -d manpage -b docbook $< ccache.1: doc/MANUAL.xml @@ -164,7 +164,7 @@ ccache.1: doc/MANUAL.xml update-authors: git log --pretty=format:"* %aN <%aE>" \ | sort -u \ - | perl -00 -p -i -e 's/^\*.*/ . "\n"/es' doc/AUTHORS.txt + | perl -00 -p -i -e 's/^\*.*/ . "\n"/es' doc/AUTHORS.adoc .PHONY: check-syntax check-syntax: diff --git a/doc/AUTHORS.txt b/doc/AUTHORS.adoc similarity index 100% rename from doc/AUTHORS.txt rename to doc/AUTHORS.adoc diff --git a/doc/MANUAL.txt b/doc/MANUAL.adoc similarity index 100% rename from doc/MANUAL.txt rename to doc/MANUAL.adoc diff --git a/doc/NEWS.txt b/doc/NEWS.adoc similarity index 100% rename from doc/NEWS.txt rename to doc/NEWS.adoc diff --git a/src/ccache.c b/src/ccache.c index 950317414..860929cb3 100644 --- a/src/ccache.c +++ b/src/ccache.c @@ -618,7 +618,7 @@ remember_include_file(char *path, struct mdfour *cpp_hash, bool system) // The comparison using >= is intentional, due to a possible race between // starting compilation and writing the include file. See also the notes - // under "Performance" in MANUAL.txt. + // under "Performance" in doc/MANUAL.adoc. if (!(conf->sloppiness & SLOPPY_INCLUDE_FILE_MTIME) && st.st_mtime >= time_of_compilation) { cc_log("Include file %s too new", path); -- 2.47.2