-rw-r--r-- | Makefile | 66 | ||||
-rw-r--r-- | cgit.css | 14 | ||||
-rw-r--r-- | cgitrc.5.txt | 10 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | ui-stats.c | 2 |
5 files changed, 77 insertions, 15 deletions
@@ -1,18 +1,30 @@ | |||
1 | CGIT_VERSION = v0.8.3.4 | 1 | CGIT_VERSION = v0.8.3.4 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | 4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) |
5 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | prefix = /usr | ||
8 | libdir = $(prefix)/lib | ||
9 | filterdir = $(libdir)/cgit/filters | ||
10 | docdir = $(prefix)/share/doc/cgit | ||
11 | htmldir = $(docdir) | ||
12 | pdfdir = $(docdir) | ||
13 | mandir = $(prefix)/share/man | ||
7 | SHA1_HEADER = <openssl/sha.h> | 14 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.7.3 | 15 | GIT_VER = 1.7.4 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | 17 | INSTALL = install |
18 | MAN5_TXT = $(wildcard *.5.txt) | ||
19 | MAN_TXT = $(MAN5_TXT) | ||
20 | DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) | ||
21 | DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) | ||
22 | DOC_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 | # |
14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 | 26 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
15 | # implementation (slower). | 27 | # implementation (slower). |
16 | # | 28 | # |
17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 29 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
18 | # | 30 | # |
@@ -106,17 +118,18 @@ OBJECTS += ui-tree.o | |||
106 | OBJECTS += vector.o | 118 | OBJECTS += vector.o |
107 | 119 | ||
108 | ifdef NEEDS_LIBICONV | 120 | ifdef NEEDS_LIBICONV |
109 | EXTLIBS += -liconv | 121 | EXTLIBS += -liconv |
110 | endif | 122 | 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 | ||
116 | all: cgit | 129 | all: cgit |
117 | 130 | ||
118 | VERSION: force-version | 131 | VERSION: force-version |
119 | @./gen-version.sh "$(CGIT_VERSION)" | 132 | @./gen-version.sh "$(CGIT_VERSION)" |
120 | -include VERSION | 133 | -include VERSION |
121 | 134 | ||
122 | 135 | ||
@@ -162,31 +175,68 @@ test: all | |||
162 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 175 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
163 | 176 | ||
164 | install: all | 177 | install: all |
165 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) | 178 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
166 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 179 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
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 | |||
186 | install-doc: install-man install-html install-pdf | ||
187 | |||
188 | install-man: doc-man | ||
189 | $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5 | ||
190 | $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5 | ||
191 | |||
192 | install-html: doc-html | ||
193 | $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir) | ||
194 | $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir) | ||
195 | |||
196 | install-pdf: doc-pdf | ||
197 | $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir) | ||
198 | $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir) | ||
170 | 199 | ||
171 | uninstall: | 200 | uninstall: |
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 | ||
176 | doc: man-doc html-doc pdf-doc | 205 | uninstall-doc: uninstall-man uninstall-html uninstall-pdf |
206 | |||
207 | uninstall-man: | ||
208 | @for i in $(DOC_MAN5); do \ | ||
209 | rm -fv $(DESTDIR)$(mandir)/man5/$$i; \ | ||
210 | done | ||
211 | |||
212 | uninstall-html: | ||
213 | @for i in $(DOC_HTML); do \ | ||
214 | rm -fv $(DESTDIR)$(htmldir)/$$i; \ | ||
215 | done | ||
216 | |||
217 | uninstall-pdf: | ||
218 | @for i in $(DOC_PDF); do \ | ||
219 | rm -fv $(DESTDIR)$(pdfdir)/$$i; \ | ||
220 | done | ||
221 | |||
222 | doc: doc-man doc-html doc-pdf | ||
223 | doc-man: doc-man5 | ||
224 | doc-man5: $(DOC_MAN5) | ||
225 | doc-html: $(DOC_HTML) | ||
226 | doc-pdf: $(DOC_PDF) | ||
177 | 227 | ||
178 | man-doc: cgitrc.5.txt | 228 | %.5 : %.5.txt |
179 | a2x -f manpage cgitrc.5.txt | 229 | a2x -f manpage $< |
180 | 230 | ||
181 | html-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 | ||
184 | pdf-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 | ||
187 | clean: clean-doc | 237 | clean: clean-doc |
188 | rm -f cgit VERSION *.o *.d | 238 | rm -f cgit VERSION *.o *.d |
189 | 239 | ||
190 | clean-doc: | 240 | clean-doc: |
191 | rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo | 241 | rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo |
192 | 242 | ||
@@ -738,8 +738,22 @@ table.ssdiff td.foot { | |||
738 | 738 | ||
739 | table.ssdiff td.space { | 739 | table.ssdiff td.space { |
740 | border: none; | 740 | border: none; |
741 | } | 741 | } |
742 | 742 | ||
743 | table.ssdiff td.space div { | 743 | table.ssdiff td.space div { |
744 | min-height: 3em; | 744 | min-height: 3em; |
745 | } \ No newline at end of file | 745 | } \ No newline at end of file |
746 | |||
747 | /* Syntax highlighting */ | ||
748 | table.blob .num { color:#2928ff; } | ||
749 | table.blob .esc { color:#ff00ff; } | ||
750 | table.blob .str { color:#ff0000; } | ||
751 | table.blob .dstr { color:#818100; } | ||
752 | table.blob .slc { color:#838183; font-style:italic; } | ||
753 | table.blob .com { color:#838183; font-style:italic; } | ||
754 | table.blob .dir { color:#008200; } | ||
755 | table.blob .sym { color:#000000; } | ||
756 | table.blob .kwa { color:#000000; font-weight:bold; } | ||
757 | table.blob .kwb { color:#830000; } | ||
758 | table.blob .kwc { color:#000000; font-weight:bold; } | ||
759 | table.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 | |||
@@ -426,17 +426,17 @@ EXAMPLE CGITRC FILE | |||
426 | ------------------- | 426 | ------------------- |
427 | 427 | ||
428 | .... | 428 | .... |
429 | # Enable caching of up to 1000 output entriess | 429 | # Enable caching of up to 1000 output entriess |
430 | cache-size=1000 | 430 | cache-size=1000 |
431 | 431 | ||
432 | 432 | ||
433 | # Specify some default clone prefixes | 433 | # Specify some default clone prefixes |
434 | clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git | 434 | clone-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 |
437 | css=/css/cgit.css | 437 | css=/css/cgit.css |
438 | 438 | ||
439 | 439 | ||
440 | # Show extra links for each repository on the index page | 440 | # Show extra links for each repository on the index page |
441 | enable-index-links=1 | 441 | enable-index-links=1 |
442 | 442 | ||
@@ -457,24 +457,24 @@ favicon=/favicon.ico | |||
457 | logo=/img/mylogo.png | 457 | logo=/img/mylogo.png |
458 | 458 | ||
459 | 459 | ||
460 | # Enable statistics per week, month and quarter | 460 | # Enable statistics per week, month and quarter |
461 | max-stats=quarter | 461 | 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 |
465 | root-title=foobar.com git repositories | 465 | root-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 |
469 | root-desc=tracking the foobar development | 469 | root-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 |
473 | root-readme=/var/www/htdocs/about.html | 473 | root-readme=/var/www/htdocs/about.html |
474 | 474 | ||
475 | 475 | ||
476 | # Allow download of tar.gz, tar.bz2 and zip-files | 476 | # Allow download of tar.gz, tar.bz2 and zip-files |
477 | snapshots=tar.gz tar.bz2 zip | 477 | snapshots=tar.gz tar.bz2 zip |
478 | 478 | ||
479 | 479 | ||
480 | ## | 480 | ## |
@@ -498,24 +498,24 @@ mimetype.svg=image/svg+xml | |||
498 | ## and included like this: | 498 | ## and included like this: |
499 | ## include=/etc/cgitrepos | 499 | ## include=/etc/cgitrepos |
500 | ## | 500 | ## |
501 | 501 | ||
502 | 502 | ||
503 | repo.url=foo | 503 | repo.url=foo |
504 | repo.path=/pub/git/foo.git | 504 | repo.path=/pub/git/foo.git |
505 | repo.desc=the master foo repository | 505 | repo.desc=the master foo repository |
506 | repo.owner=fooman@foobar.com | 506 | repo.owner=fooman@example.com |
507 | repo.readme=info/web/about.html | 507 | repo.readme=info/web/about.html |
508 | 508 | ||
509 | 509 | ||
510 | repo.url=bar | 510 | repo.url=bar |
511 | repo.path=/pub/git/bar.git | 511 | repo.path=/pub/git/bar.git |
512 | repo.desc=the bars for your foo | 512 | repo.desc=the bars for your foo |
513 | repo.owner=barman@foobar.com | 513 | repo.owner=barman@example.com |
514 | repo.readme=info/web/about.html | 514 | repo.readme=info/web/about.html |
515 | 515 | ||
516 | 516 | ||
517 | # The next repositories will be displayed under the 'extras' heading | 517 | # The next repositories will be displayed under the 'extras' heading |
518 | section=extras | 518 | section=extras |
519 | 519 | ||
520 | 520 | ||
521 | repo.url=baz | 521 | repo.url=baz |
diff --git a/git b/git | |||
Subproject 87b50542a08ac6caa083ddc376e674424e37940 | Subproject 7ed863a85a6ce2c4ac4476848310b8f917ab41f | ||
@@ -1,10 +1,8 @@ | |||
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" |
6 | #include "ui-stats.h" | 4 | #include "ui-stats.h" |
7 | 5 | ||
8 | #ifdef NO_C99_FORMAT | 6 | #ifdef NO_C99_FORMAT |
9 | #define SZ_FMT "%u" | 7 | #define SZ_FMT "%u" |
10 | #else | 8 | #else |