about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Makefile66
-rw-r--r--cgit.css14
-rw-r--r--cgitrc.5.txt10
m---------git0
-rw-r--r--ui-stats.c2
5 files changed, 77 insertions, 15 deletions
diff --git a/Makefile b/Makefile index 31d88ef..a988751 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.4
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#
@@ -111,7 +123,8 @@ endif
111 123
112 124
113.PHONY: all libgit test install uninstall clean force-version get-git \ 125.PHONY: all libgit test install uninstall clean force-version get-git \
114 doc man-doc html-doc clean-doc 126 doc clean-doc install-doc install-man install-html install-pdf \
127 uninstall-doc uninstall-man uninstall-html uninstall-pdf
115 128
116all: cgit 129all: cgit
117 130
@@ -167,21 +180,58 @@ install: all
167 $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) 180 $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
168 $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css 181 $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
169 $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png 182 $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
183 $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
184 $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
185
186install-doc: install-man install-html install-pdf
187
188install-man: doc-man
189 $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5
190 $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5
191
192install-html: doc-html
193 $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir)
194 $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir)
195
196install-pdf: doc-pdf
197 $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir)
198 $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
170 199
171uninstall: 200uninstall:
172 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 201 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
173 rm -f $(CGIT_DATA_PATH)/cgit.css 202 rm -f $(CGIT_DATA_PATH)/cgit.css
174 rm -f $(CGIT_DATA_PATH)/cgit.png 203 rm -f $(CGIT_DATA_PATH)/cgit.png
175 204
176doc: man-doc html-doc pdf-doc 205uninstall-doc: uninstall-man uninstall-html uninstall-pdf
206
207uninstall-man:
208 @for i in $(DOC_MAN5); do \
209 rm -fv $(DESTDIR)$(mandir)/man5/$$i; \
210 done
211
212uninstall-html:
213 @for i in $(DOC_HTML); do \
214 rm -fv $(DESTDIR)$(htmldir)/$$i; \
215 done
216
217uninstall-pdf:
218 @for i in $(DOC_PDF); do \
219 rm -fv $(DESTDIR)$(pdfdir)/$$i; \
220 done
221
222doc: doc-man doc-html doc-pdf
223doc-man: doc-man5
224doc-man5: $(DOC_MAN5)
225doc-html: $(DOC_HTML)
226doc-pdf: $(DOC_PDF)
177 227
178man-doc: cgitrc.5.txt 228%.5 : %.5.txt
179 a2x -f manpage cgitrc.5.txt 229 a2x -f manpage $<
180 230
181html-doc: cgitrc.5.txt 231$(DOC_HTML): %.html : %.txt
182 a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt 232 a2x -f xhtml --stylesheet=cgit-doc.css $<
183 233
184pdf-doc: cgitrc.5.txt 234$(DOC_PDF): %.pdf : %.txt
185 a2x -f pdf cgitrc.5.txt 235 a2x -f pdf cgitrc.5.txt
186 236
187clean: clean-doc 237clean: clean-doc
diff --git a/cgit.css b/cgit.css index 1ebef55..008cff8 100644 --- a/cgit.css +++ b/cgit.css
@@ -761,3 +761,17 @@ table.ssdiff td.space {
761table.ssdiff td.space div { 761table.ssdiff td.space div {
762 min-height: 3em; 762 min-height: 3em;
763} 763}
764
765/* Syntax highlighting */
766table.blob .num { color:#2928ff; }
767table.blob .esc { color:#ff00ff; }
768table.blob .str { color:#ff0000; }
769table.blob .dstr { color:#818100; }
770table.blob .slc { color:#838183; font-style:italic; }
771table.blob .com { color:#838183; font-style:italic; }
772table.blob .dir { color:#008200; }
773table.blob .sym { color:#000000; }
774table.blob .kwa { color:#000000; font-weight:bold; }
775table.blob .kwb { color:#830000; }
776table.blob .kwc { color:#000000; font-weight:bold; }
777table.blob .kwd { color:#010181; }
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index b45c46b..3c20fe1 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt
@@ -440,7 +440,7 @@ cache-size=1000
440 440
441 441
442# Specify some default clone prefixes 442# Specify some default clone prefixes
443clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git 443clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git
444 444
445# Specify the css url 445# Specify the css url
446css=/css/cgit.css 446css=/css/cgit.css
@@ -475,14 +475,14 @@ max-stats=quarter
475 475
476 476
477# Set the title and heading of the repository index page 477# Set the title and heading of the repository index page
478root-title=foobar.com git repositories 478root-title=example.com git repositories
479 479
480 480
481# Set a subheading for the repository index page 481# Set a subheading for the repository index page
482root-desc=tracking the foobar development 482root-desc=tracking the foobar development
483 483
484 484
485# Include some more info about foobar.com on the index page 485# Include some more info about example.com on the index page
486root-readme=/var/www/htdocs/about.html 486root-readme=/var/www/htdocs/about.html
487 487
488 488
@@ -516,14 +516,14 @@ mimetype.svg=image/svg+xml
516repo.url=foo 516repo.url=foo
517repo.path=/pub/git/foo.git 517repo.path=/pub/git/foo.git
518repo.desc=the master foo repository 518repo.desc=the master foo repository
519repo.owner=fooman@foobar.com 519repo.owner=fooman@example.com
520repo.readme=info/web/about.html 520repo.readme=info/web/about.html
521 521
522 522
523repo.url=bar 523repo.url=bar
524repo.path=/pub/git/bar.git 524repo.path=/pub/git/bar.git
525repo.desc=the bars for your foo 525repo.desc=the bars for your foo
526repo.owner=barman@foobar.com 526repo.owner=barman@example.com
527repo.readme=info/web/about.html 527repo.readme=info/web/about.html
528 528
529 529
diff --git a/git b/git
Subproject 87b50542a08ac6caa083ddc376e674424e37940 Subproject 7ed863a85a6ce2c4ac4476848310b8f917ab41f
diff --git a/ui-stats.c b/ui-stats.c index 946a6ea..2a0c174 100644 --- a/ui-stats.c +++ b/ui-stats.c
@@ -1,5 +1,3 @@
1#include <string-list.h>
2
3#include "cgit.h" 1#include "cgit.h"
4#include "html.h" 2#include "html.h"
5#include "ui-shared.h" 3#include "ui-shared.h"