-rw-r--r-- | Makefile | 15 | ||||
-rw-r--r-- | cgitrc.5.txt | 4 |
2 files changed, 11 insertions, 8 deletions
@@ -1,56 +1,58 @@ | |||
1 | CGIT_VERSION = v0.8.1 | 1 | CGIT_VERSION = v0.8.1 |
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_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.6.1 | 8 | GIT_VER = 1.6.1 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | ||
9 | 11 | ||
10 | # Define NO_STRCASESTR if you don't have strcasestr. | 12 | # Define NO_STRCASESTR if you don't have strcasestr. |
11 | # | 13 | # |
12 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 14 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
13 | # | 15 | # |
14 | 16 | ||
15 | #-include config.mak | 17 | #-include config.mak |
16 | 18 | ||
17 | # | 19 | # |
18 | # Platform specific tweaks | 20 | # Platform specific tweaks |
19 | # | 21 | # |
20 | 22 | ||
21 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | 23 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
22 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | 24 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
23 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | 25 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
24 | 26 | ||
25 | ifeq ($(uname_O),Cygwin) | 27 | ifeq ($(uname_O),Cygwin) |
26 | NO_STRCASESTR = YesPlease | 28 | NO_STRCASESTR = YesPlease |
27 | NEEDS_LIBICONV = YesPlease | 29 | NEEDS_LIBICONV = YesPlease |
28 | endif | 30 | endif |
29 | 31 | ||
30 | # | 32 | # |
31 | # Let the user override the above settings. | 33 | # Let the user override the above settings. |
32 | # | 34 | # |
33 | -include cgit.conf | 35 | -include cgit.conf |
34 | 36 | ||
35 | # | 37 | # |
36 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 38 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
37 | # from git.git | 39 | # from git.git |
38 | # | 40 | # |
39 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 41 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
40 | QUIET_SUBDIR1 = | 42 | QUIET_SUBDIR1 = |
41 | 43 | ||
42 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 44 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
43 | PRINT_DIR = --no-print-directory | 45 | PRINT_DIR = --no-print-directory |
44 | else # "make -w" | 46 | else # "make -w" |
45 | NO_SUBDIR = : | 47 | NO_SUBDIR = : |
46 | endif | 48 | endif |
47 | 49 | ||
48 | ifndef V | 50 | ifndef V |
49 | QUIET_CC = @echo ' ' CC $@; | 51 | QUIET_CC = @echo ' ' CC $@; |
50 | QUIET_MM = @echo ' ' MM $@; | 52 | QUIET_MM = @echo ' ' MM $@; |
51 | QUIET_SUBDIR0 = +@subdir= | 53 | QUIET_SUBDIR0 = +@subdir= |
52 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | 54 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
53 | $(MAKE) $(PRINT_DIR) -C $$subdir | 55 | $(MAKE) $(PRINT_DIR) -C $$subdir |
54 | endif | 56 | endif |
55 | 57 | ||
56 | # | 58 | # |
@@ -90,63 +92,64 @@ OBJECTS += ui-shared.o | |||
90 | OBJECTS += ui-snapshot.o | 92 | OBJECTS += ui-snapshot.o |
91 | OBJECTS += ui-summary.o | 93 | OBJECTS += ui-summary.o |
92 | OBJECTS += ui-tag.o | 94 | OBJECTS += ui-tag.o |
93 | OBJECTS += ui-tree.o | 95 | OBJECTS += ui-tree.o |
94 | 96 | ||
95 | ifdef NEEDS_LIBICONV | 97 | ifdef NEEDS_LIBICONV |
96 | EXTLIBS += -liconv | 98 | EXTLIBS += -liconv |
97 | endif | 99 | endif |
98 | 100 | ||
99 | 101 | ||
100 | .PHONY: all libgit test install uninstall clean force-version get-git | 102 | .PHONY: all libgit test install uninstall clean force-version get-git |
101 | 103 | ||
102 | all: cgit | 104 | all: cgit |
103 | 105 | ||
104 | VERSION: force-version | 106 | VERSION: force-version |
105 | @./gen-version.sh "$(CGIT_VERSION)" | 107 | @./gen-version.sh "$(CGIT_VERSION)" |
106 | -include VERSION | 108 | -include VERSION |
107 | 109 | ||
108 | 110 | ||
109 | CFLAGS += -g -Wall -Igit | 111 | CFLAGS += -g -Wall -Igit |
110 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 112 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
111 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 113 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
112 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 114 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
113 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 115 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
114 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 116 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
115 | 117 | ||
116 | ifdef NO_ICONV | 118 | ifdef NO_ICONV |
117 | CFLAGS += -DNO_ICONV | 119 | CFLAGS += -DNO_ICONV |
118 | endif | 120 | endif |
119 | ifdef NO_STRCASESTR | 121 | ifdef NO_STRCASESTR |
120 | CFLAGS += -DNO_STRCASESTR | 122 | CFLAGS += -DNO_STRCASESTR |
121 | endif | 123 | endif |
122 | 124 | ||
123 | cgit: $(OBJECTS) libgit | 125 | cgit: $(OBJECTS) libgit |
124 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 126 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
125 | 127 | ||
126 | cgit.o: VERSION | 128 | cgit.o: VERSION |
127 | 129 | ||
128 | -include $(OBJECTS:.o=.d) | 130 | -include $(OBJECTS:.o=.d) |
129 | 131 | ||
130 | libgit: | 132 | libgit: |
131 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a | 133 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
132 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a | 134 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
133 | 135 | ||
134 | test: all | 136 | test: all |
135 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 137 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
136 | 138 | ||
137 | install: all | 139 | install: all |
138 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 140 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
139 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 141 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
140 | install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 142 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
141 | install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 143 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
144 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png | ||
142 | 145 | ||
143 | uninstall: | 146 | uninstall: |
144 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 147 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
145 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 148 | rm -f $(CGIT_DATA_PATH)/cgit.css |
146 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 149 | rm -f $(CGIT_DATA_PATH)/cgit.png |
147 | 150 | ||
148 | clean: | 151 | clean: |
149 | rm -f cgit VERSION *.o *.d | 152 | rm -f cgit VERSION *.o *.d |
150 | 153 | ||
151 | get-git: | 154 | get-git: |
152 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git | 155 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 7887b02..ab9ab66 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -243,98 +243,98 @@ repo.url | |||
243 | 243 | ||
244 | 244 | ||
245 | EXAMPLE CGITRC FILE | 245 | EXAMPLE CGITRC FILE |
246 | ------------------- | 246 | ------------------- |
247 | 247 | ||
248 | # Enable caching of up to 1000 output entriess | 248 | # Enable caching of up to 1000 output entriess |
249 | cache-size=1000 | 249 | cache-size=1000 |
250 | 250 | ||
251 | 251 | ||
252 | # Specify some default clone prefixes | 252 | # Specify some default clone prefixes |
253 | clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git | 253 | clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git |
254 | 254 | ||
255 | # Specify the css url | 255 | # Specify the css url |
256 | css=/css/cgit.css | 256 | css=/css/cgit.css |
257 | 257 | ||
258 | 258 | ||
259 | # Show extra links for each repository on the index page | 259 | # Show extra links for each repository on the index page |
260 | enable-index-links=1 | 260 | enable-index-links=1 |
261 | 261 | ||
262 | 262 | ||
263 | # Show number of affected files per commit on the log pages | 263 | # Show number of affected files per commit on the log pages |
264 | enable-log-filecount=1 | 264 | enable-log-filecount=1 |
265 | 265 | ||
266 | 266 | ||
267 | # Show number of added/removed lines per commit on the log pages | 267 | # Show number of added/removed lines per commit on the log pages |
268 | enable-log-linecount=1 | 268 | enable-log-linecount=1 |
269 | 269 | ||
270 | 270 | ||
271 | # Add a cgit favicon | 271 | # Add a cgit favicon |
272 | favicon=/favicon.ico | 272 | favicon=/favicon.ico |
273 | 273 | ||
274 | 274 | ||
275 | # Use a custom logo | 275 | # Use a custom logo |
276 | logo=/img/mylogo.png | 276 | logo=/img/mylogo.png |
277 | 277 | ||
278 | 278 | ||
279 | # Set the title and heading of the repository index page | 279 | # Set the title and heading of the repository index page |
280 | root-title=foobar.com git repositories | 280 | root-title=foobar.com git repositories |
281 | 281 | ||
282 | 282 | ||
283 | # Set a subheading for the repository index page | 283 | # Set a subheading for the repository index page |
284 | root-desc=tracking the foobar development | 284 | root-desc=tracking the foobar development |
285 | 285 | ||
286 | 286 | ||
287 | # Include some more info about foobar.com on the index page | 287 | # Include some more info about foobar.com on the index page |
288 | root-readme=/var/www/htdocs/about.html | 288 | root-readme=/var/www/htdocs/about.html |
289 | 289 | ||
290 | 290 | ||
291 | # Allow download of tar.gz, tar.bz and zip-files | 291 | # Allow download of tar.gz, tar.bz2 and zip-files |
292 | snapshots=tar.gz tar.bz zip | 292 | snapshots=tar.gz tar.bz2 zip |
293 | 293 | ||
294 | 294 | ||
295 | ## | 295 | ## |
296 | ## List of repositories. | 296 | ## List of repositories. |
297 | ## PS: Any repositories listed when repo.group is unset will not be | 297 | ## PS: Any repositories listed when repo.group is unset will not be |
298 | ## displayed under a group heading | 298 | ## displayed under a group heading |
299 | ## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') | 299 | ## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') |
300 | ## and included like this: | 300 | ## and included like this: |
301 | ## include=/etc/cgitrepos | 301 | ## include=/etc/cgitrepos |
302 | ## | 302 | ## |
303 | 303 | ||
304 | 304 | ||
305 | repo.url=foo | 305 | repo.url=foo |
306 | repo.path=/pub/git/foo.git | 306 | repo.path=/pub/git/foo.git |
307 | repo.desc=the master foo repository | 307 | repo.desc=the master foo repository |
308 | repo.owner=fooman@foobar.com | 308 | repo.owner=fooman@foobar.com |
309 | repo.readme=info/web/about.html | 309 | repo.readme=info/web/about.html |
310 | 310 | ||
311 | 311 | ||
312 | repo.url=bar | 312 | repo.url=bar |
313 | repo.path=/pub/git/bar.git | 313 | repo.path=/pub/git/bar.git |
314 | repo.desc=the bars for your foo | 314 | repo.desc=the bars for your foo |
315 | repo.owner=barman@foobar.com | 315 | repo.owner=barman@foobar.com |
316 | repo.readme=info/web/about.html | 316 | repo.readme=info/web/about.html |
317 | 317 | ||
318 | 318 | ||
319 | # The next repositories will be displayed under the 'extras' heading | 319 | # The next repositories will be displayed under the 'extras' heading |
320 | repo.group=extras | 320 | repo.group=extras |
321 | 321 | ||
322 | 322 | ||
323 | repo.url=baz | 323 | repo.url=baz |
324 | repo.path=/pub/git/baz.git | 324 | repo.path=/pub/git/baz.git |
325 | repo.desc=a set of extensions for bar users | 325 | repo.desc=a set of extensions for bar users |
326 | 326 | ||
327 | repo.url=wiz | 327 | repo.url=wiz |
328 | repo.path=/pub/git/wiz.git | 328 | repo.path=/pub/git/wiz.git |
329 | repo.desc=the wizard of foo | 329 | repo.desc=the wizard of foo |
330 | 330 | ||
331 | 331 | ||
332 | # Add some mirrored repositories | 332 | # Add some mirrored repositories |
333 | repo.group=mirrors | 333 | repo.group=mirrors |
334 | 334 | ||
335 | 335 | ||
336 | repo.url=git | 336 | repo.url=git |
337 | repo.path=/pub/git/git.git | 337 | repo.path=/pub/git/git.git |
338 | repo.desc=the dscm | 338 | repo.desc=the dscm |
339 | 339 | ||
340 | 340 | ||