about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2010-11-10 00:28:56 +0100
committerLars Hjemli2010-11-10 00:28:56 +0100
commit7618cac1ee3bf83424d9237c3c362a43c5b246e9 (patch)
tree93fe8563b0466784394b9f7c0bf820a5cc9ba6d5
parentui-log: Prevent crash when given empty range search (diff)
parentUse example.com in documentation, per RFC 2606 (diff)
downloadcgit-7618cac1ee3bf83424d9237c3c362a43c5b246e9.tar.gz
cgit-7618cac1ee3bf83424d9237c3c362a43c5b246e9.zip
Merge branch 'tz/make-improvements'
-rw-r--r--Makefile64
-rw-r--r--cgit.css16
-rw-r--r--cgitrc.5.txt10
3 files changed, 77 insertions, 13 deletions
diff --git a/Makefile b/Makefile index be1d796..fe4b10e 100644 --- a/Makefile +++ b/Makefile
@@ -4,10 +4,22 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) 4CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
5CGIT_CONFIG = /etc/cgitrc 5CGIT_CONFIG = /etc/cgitrc
6CACHE_ROOT = /var/cache/cgit 6CACHE_ROOT = /var/cache/cgit
7prefix = /usr
8libdir = $(prefix)/lib
9filterdir = $(libdir)/cgit/filters
10docdir = $(prefix)/share/doc/cgit
11htmldir = $(docdir)
12pdfdir = $(docdir)
13mandir = $(prefix)/share/man
7SHA1_HEADER = <openssl/sha.h> 14SHA1_HEADER = <openssl/sha.h>
8GIT_VER = 1.7.3 15GIT_VER = 1.7.3
9GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 16GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
10INSTALL = install 17INSTALL = install
18MAN5_TXT = $(wildcard *.5.txt)
19MAN_TXT = $(MAN5_TXT)
20DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
21DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
22DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT))
11 23
12# Define NO_STRCASESTR if you don't have strcasestr. 24# Define NO_STRCASESTR if you don't have strcasestr.
13# 25#
@@ -110,7 +122,8 @@ endif
110 122
111 123
112.PHONY: all libgit test install uninstall clean force-version get-git \ 124.PHONY: all libgit test install uninstall clean force-version get-git \
113 doc man-doc html-doc clean-doc 125 doc clean-doc install-doc install-man install-html install-pdf \
126 uninstall-doc uninstall-man uninstall-html uninstall-pdf
114 127
115all: cgit 128all: cgit
116 129
@@ -166,21 +179,58 @@ install: all
166 $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) 179 $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
167 $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css 180 $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
168 $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png 181 $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
182 $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
183 $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
184
185install-doc: install-man install-html install-pdf
186
187install-man: doc-man
188 $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5
189 $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5
190
191install-html: doc-html
192 $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir)
193 $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir)
194
195install-pdf: doc-pdf
196 $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir)
197 $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
169 198
170uninstall: 199uninstall:
171 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 200 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
172 rm -f $(CGIT_DATA_PATH)/cgit.css 201 rm -f $(CGIT_DATA_PATH)/cgit.css
173 rm -f $(CGIT_DATA_PATH)/cgit.png 202 rm -f $(CGIT_DATA_PATH)/cgit.png
174 203
175doc: man-doc html-doc pdf-doc 204uninstall-doc: uninstall-man uninstall-html uninstall-pdf
205
206uninstall-man:
207 @for i in $(DOC_MAN5); do \
208 rm -fv $(DESTDIR)$(mandir)/man5/$$i; \
209 done
210
211uninstall-html:
212 @for i in $(DOC_HTML); do \
213 rm -fv $(DESTDIR)$(htmldir)/$$i; \
214 done
215
216uninstall-pdf:
217 @for i in $(DOC_PDF); do \
218 rm -fv $(DESTDIR)$(pdfdir)/$$i; \
219 done
220
221doc: doc-man doc-html doc-pdf
222doc-man: doc-man5
223doc-man5: $(DOC_MAN5)
224doc-html: $(DOC_HTML)
225doc-pdf: $(DOC_PDF)
176 226
177man-doc: cgitrc.5.txt 227%.5 : %.5.txt
178 a2x -f manpage cgitrc.5.txt 228 a2x -f manpage $<
179 229
180html-doc: cgitrc.5.txt 230$(DOC_HTML): %.html : %.txt
181 a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt 231 a2x -f xhtml --stylesheet=cgit-doc.css $<
182 232
183pdf-doc: cgitrc.5.txt 233$(DOC_PDF): %.pdf : %.txt
184 a2x -f pdf cgitrc.5.txt 234 a2x -f pdf cgitrc.5.txt
185 235
186clean: clean-doc 236clean: clean-doc
diff --git a/cgit.css b/cgit.css index 0c88b65..a2a685b 100644 --- a/cgit.css +++ b/cgit.css
@@ -742,4 +742,18 @@ table.ssdiff td.space {
742 742
743table.ssdiff td.space div { 743table.ssdiff td.space div {
744 min-height: 3em; 744 min-height: 3em;
745} \ No newline at end of file 745}
746
747/* Syntax highlighting */
748table.blob .num { color:#2928ff; }
749table.blob .esc { color:#ff00ff; }
750table.blob .str { color:#ff0000; }
751table.blob .dstr { color:#818100; }
752table.blob .slc { color:#838183; font-style:italic; }
753table.blob .com { color:#838183; font-style:italic; }
754table.blob .dir { color:#008200; }
755table.blob .sym { color:#000000; }
756table.blob .kwa { color:#000000; font-weight:bold; }
757table.blob .kwb { color:#830000; }
758table.blob .kwc { color:#000000; font-weight:bold; }
759table.blob .kwd { color:#010181; }
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 75b6584..8e51ca5 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt
@@ -431,7 +431,7 @@ cache-size=1000
431 431
432 432
433# Specify some default clone prefixes 433# Specify some default clone prefixes
434clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git 434clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git
435 435
436# Specify the css url 436# Specify the css url
437css=/css/cgit.css 437css=/css/cgit.css
@@ -462,14 +462,14 @@ max-stats=quarter
462 462
463 463
464# Set the title and heading of the repository index page 464# Set the title and heading of the repository index page
465root-title=foobar.com git repositories 465root-title=example.com git repositories
466 466
467 467
468# Set a subheading for the repository index page 468# Set a subheading for the repository index page
469root-desc=tracking the foobar development 469root-desc=tracking the foobar development
470 470
471 471
472# Include some more info about foobar.com on the index page 472# Include some more info about example.com on the index page
473root-readme=/var/www/htdocs/about.html 473root-readme=/var/www/htdocs/about.html
474 474
475 475
@@ -503,14 +503,14 @@ mimetype.svg=image/svg+xml
503repo.url=foo 503repo.url=foo
504repo.path=/pub/git/foo.git 504repo.path=/pub/git/foo.git
505repo.desc=the master foo repository 505repo.desc=the master foo repository
506repo.owner=fooman@foobar.com 506repo.owner=fooman@example.com
507repo.readme=info/web/about.html 507repo.readme=info/web/about.html
508 508
509 509
510repo.url=bar 510repo.url=bar
511repo.path=/pub/git/bar.git 511repo.path=/pub/git/bar.git
512repo.desc=the bars for your foo 512repo.desc=the bars for your foo
513repo.owner=barman@foobar.com 513repo.owner=barman@example.com
514repo.readme=info/web/about.html 514repo.readme=info/web/about.html
515 515
516 516