From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org, Drew Northup <drew.northup@maine.edu>
Cc: Jonathan Nieder <jrnieder@gmail.com>, Jakub Narebski <jnareb@gmail.com>
Subject: [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages
Date: Sat, 8 Oct 2011 20:31:58 +0200 [thread overview]
Message-ID: <1318098723-12813-2-git-send-email-jnareb@gmail.com> (raw)
In-Reply-To: <1318098723-12813-1-git-send-email-jnareb@gmail.com>
Gitweb documentation currently consists of gitweb/README, gitweb/INSTALL
and comments in gitweb source code. This is harder to find, use and
browse than manpages ("man gitweb" or "git help gitweb") and HTML
documentation ("git help --web gitweb").
The goal of the next two commits is to move documentation out of
gitweb/README to gitweb.txt and gitweb.conf.txt manpages, reducing its
size 10x from around 500 to around 50 lines (two pages), and to move
information not related directly to building and installing gitweb out
of gitweb/INSTALL.
The idea is to have the gitweb manpage sources reside in AsciiDoc
format in the Documentation/ directory, like for gitk and git-gui.
This means that building git documentation (with "make doc") would
also build gitweb manpages.
An alternate solution would be to have gitweb documentation in the
gitweb/ directory, perhaps in POD format (see perlpod(1)).
This patch adds infrastructure for easy generation of only
gitweb-related manpages. It adds a currently empty 'gitweb-doc'
target to Documentation/Makefile, and a 'doc' proxy target to
gitweb/Makefile.
This way to build only gitweb documentation in both 'man' and 'html'
formats one can use
make -C gitweb doc
or
cd gitweb; make doc
This somewhat follows the idea of 'full-svn-test' and 'gitweb-test' in
t/Makefile. Note also that with alternate solution, where source of
gitweb manpages would reside in the gitweb/ directory, "make doc"
would invoke "make -C gitweb doc" to generate formatted docs.
The gitweb.conf(5) and gitweb(1) manpages will be added in subsequent
commits.
[Commit message improved with help of Jonathan Nieder]
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
This commit is not strictly necessary: it only adds "doc" target to
gitweb/Makefile, and "gitweb-doc" target to Documentation/Makefile;
neither is run when e.g. generating RPM.
They are here because they would be here if documentation source was
kept along with gitweb script in the 'gitweb/' subdirectory, and to
make it easier and faster to test the changes.
Documentation/Makefile | 3 +++
gitweb/Makefile | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 6346a75..44be67b 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -170,6 +170,9 @@ info: git.info gitman.info
pdf: user-manual.pdf
+GITWEB_DOC = $(filter gitweb.%,$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7))
+gitweb-doc: $(GITWEB_DOC)
+
install: install-man
install-man: man
diff --git a/gitweb/Makefile b/gitweb/Makefile
index 1c85b5f..3014d80 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -174,6 +174,11 @@ test-installed:
GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \
$(MAKE) -C ../t gitweb-test
+### Documentation
+
+doc:
+ $(MAKE) -C ../Documentation gitweb-doc
+
### Installation rules
install: all
@@ -187,5 +192,5 @@ install: all
clean:
$(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS
-.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE
+.PHONY: all clean install test test-installed doc .FORCE-GIT-VERSION-FILE FORCE
--
1.7.6
next prev parent reply other threads:[~2011-10-08 18:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-08 18:31 [PATCHv5/RFC 0/6] Moving gitweb documentation to manpages Jakub Narebski
2011-10-08 18:31 ` Jakub Narebski [this message]
2011-10-10 18:53 ` [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages Junio C Hamano
2011-10-10 21:52 ` Jakub Narebski
2011-10-10 23:10 ` Junio C Hamano
2011-10-11 15:39 ` Jakub Narebski
2011-10-11 17:49 ` Junio C Hamano
2011-10-11 18:16 ` Jakub Narebski
2011-10-08 18:31 ` [PATCHv5 2/6] gitweb: Add manpage for gitweb configuration files Jakub Narebski
2011-10-08 18:32 ` [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb Jakub Narebski
2011-10-10 18:56 ` Junio C Hamano
2011-10-10 22:02 ` Jakub Narebski
2011-10-10 22:18 ` Jonathan Nieder
2011-10-11 13:02 ` Drew Northup
2011-10-11 13:51 ` Jakub Narebski
2011-10-11 14:01 ` [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb (APPLICATION!!!) Drew Northup
2011-10-11 14:20 ` Jakub Narebski
2011-10-11 16:56 ` Drew Northup
2011-10-08 18:32 ` [PATCHv5 4/6] Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages Jakub Narebski
2011-10-08 18:32 ` [PATCHv5 5/6] Documentation: Add gitweb config variables to git-config(1) Jakub Narebski
2011-10-08 18:32 ` [PATCHv5 6/6] gitweb: Add gitweb manpages to 'gitweb' package in git.spec Jakub Narebski
2011-10-10 18:47 ` [PATCHv5/RFC 0/6] Moving gitweb documentation to manpages Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318098723-12813-2-git-send-email-jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=drew.northup@maine.edu \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).