author | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 22:10:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 22:27:16 (UTC) |
commit | 92908af4558d7362c7deeb05254343a5a5f11a05 (patch) (unidiff) | |
tree | 6913a6f567375446fb680bc7e94dbabb5d8e496d | |
parent | df90b51bafec24336cf30339b2978ff6df22b075 (diff) | |
download | cgit-92908af4558d7362c7deeb05254343a5a5f11a05.zip cgit-92908af4558d7362c7deeb05254343a5a5f11a05.tar.gz cgit-92908af4558d7362c7deeb05254343a5a5f11a05.tar.bz2 |
Move cgit_version from shared.c to cgit.c
With the matching Makefile change, this makes sure that only cgit.o and cgit
proper needs to be rebuildt when VERSION has been modified.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | shared.c | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -5,103 +5,105 @@ CGIT_CONFIG = /etc/cgitrc | |||
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.5.4.1 | 7 | GIT_VER = 1.5.4.1 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | 9 | ||
10 | # | 10 | # |
11 | # Let the user override the above settings. | 11 | # Let the user override the above settings. |
12 | # | 12 | # |
13 | -include cgit.conf | 13 | -include cgit.conf |
14 | 14 | ||
15 | 15 | ||
16 | # | 16 | # |
17 | # Define a pattern rule for automatic dependency building | 17 | # Define a pattern rule for automatic dependency building |
18 | # | 18 | # |
19 | %.d: %.c | 19 | %.d: %.c |
20 | $(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ | 20 | $(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
21 | 21 | ||
22 | 22 | ||
23 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 23 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
24 | OBJECTS = | 24 | OBJECTS = |
25 | OBJECTS += cache.o | 25 | OBJECTS += cache.o |
26 | OBJECTS += cgit.o | 26 | OBJECTS += cgit.o |
27 | OBJECTS += cmd.o | 27 | OBJECTS += cmd.o |
28 | OBJECTS += html.o | 28 | OBJECTS += html.o |
29 | OBJECTS += parsing.o | 29 | OBJECTS += parsing.o |
30 | OBJECTS += shared.o | 30 | OBJECTS += shared.o |
31 | OBJECTS += ui-blob.o | 31 | OBJECTS += ui-blob.o |
32 | OBJECTS += ui-commit.o | 32 | OBJECTS += ui-commit.o |
33 | OBJECTS += ui-diff.o | 33 | OBJECTS += ui-diff.o |
34 | OBJECTS += ui-log.o | 34 | OBJECTS += ui-log.o |
35 | OBJECTS += ui-patch.o | 35 | OBJECTS += ui-patch.o |
36 | OBJECTS += ui-refs.o | 36 | OBJECTS += ui-refs.o |
37 | OBJECTS += ui-repolist.o | 37 | OBJECTS += ui-repolist.o |
38 | OBJECTS += ui-shared.o | 38 | OBJECTS += ui-shared.o |
39 | OBJECTS += ui-snapshot.o | 39 | OBJECTS += ui-snapshot.o |
40 | OBJECTS += ui-summary.o | 40 | OBJECTS += ui-summary.o |
41 | OBJECTS += ui-tag.o | 41 | OBJECTS += ui-tag.o |
42 | OBJECTS += ui-tree.o | 42 | OBJECTS += ui-tree.o |
43 | 43 | ||
44 | ifdef NEEDS_LIBICONV | 44 | ifdef NEEDS_LIBICONV |
45 | EXTLIBS += -liconv | 45 | EXTLIBS += -liconv |
46 | endif | 46 | endif |
47 | 47 | ||
48 | 48 | ||
49 | .PHONY: all git test install clean distclean emptycache force-version get-git | 49 | .PHONY: all git test install clean distclean emptycache force-version get-git |
50 | 50 | ||
51 | all: cgit git | 51 | all: cgit git |
52 | 52 | ||
53 | VERSION: force-version | 53 | VERSION: force-version |
54 | @./gen-version.sh "$(CGIT_VERSION)" | 54 | @./gen-version.sh "$(CGIT_VERSION)" |
55 | -include VERSION | 55 | -include VERSION |
56 | 56 | ||
57 | 57 | ||
58 | CFLAGS += -g -Wall -Igit | 58 | CFLAGS += -g -Wall -Igit |
59 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 59 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
60 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 60 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
61 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 61 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
62 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 62 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
63 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 63 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
64 | 64 | ||
65 | 65 | ||
66 | cgit: $(OBJECTS) | 66 | cgit: $(OBJECTS) |
67 | $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 67 | $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
68 | 68 | ||
69 | $(OBJECTS): git/xdiff/lib.a git/libgit.a VERSION | 69 | $(OBJECTS): git/xdiff/lib.a git/libgit.a |
70 | |||
71 | cgit.o: VERSION | ||
70 | 72 | ||
71 | -include $(OBJECTS:.o=.d) | 73 | -include $(OBJECTS:.o=.d) |
72 | 74 | ||
73 | git/xdiff/lib.a: | git | 75 | git/xdiff/lib.a: | git |
74 | 76 | ||
75 | git/libgit.a: | git | 77 | git/libgit.a: | git |
76 | 78 | ||
77 | git: | 79 | git: |
78 | cd git && $(MAKE) xdiff/lib.a | 80 | cd git && $(MAKE) xdiff/lib.a |
79 | cd git && $(MAKE) libgit.a | 81 | cd git && $(MAKE) libgit.a |
80 | 82 | ||
81 | test: all | 83 | test: all |
82 | $(MAKE) -C tests | 84 | $(MAKE) -C tests |
83 | 85 | ||
84 | install: all | 86 | install: all |
85 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 87 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |
86 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 88 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
87 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 89 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css |
88 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 90 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
89 | 91 | ||
90 | uninstall: | 92 | uninstall: |
91 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 93 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
92 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 94 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css |
93 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 95 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png |
94 | 96 | ||
95 | clean: | 97 | clean: |
96 | rm -f cgit VERSION *.o *.d | 98 | rm -f cgit VERSION *.o *.d |
97 | cd git && $(MAKE) clean | 99 | cd git && $(MAKE) clean |
98 | 100 | ||
99 | distclean: clean | 101 | distclean: clean |
100 | git clean -d -x | 102 | git clean -d -x |
101 | cd git && git clean -d -x | 103 | cd git && git clean -d -x |
102 | 104 | ||
103 | emptycache: | 105 | emptycache: |
104 | rm -rf $(DESTDIR)$(CACHE_ROOT)/* | 106 | rm -rf $(DESTDIR)$(CACHE_ROOT)/* |
105 | 107 | ||
106 | get-git: | 108 | get-git: |
107 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git | 109 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
@@ -1,76 +1,78 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cmd.h" | 10 | #include "cmd.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | const char *cgit_version = CGIT_VERSION; | ||
14 | |||
13 | void config_cb(const char *name, const char *value) | 15 | void config_cb(const char *name, const char *value) |
14 | { | 16 | { |
15 | if (!strcmp(name, "root-title")) | 17 | if (!strcmp(name, "root-title")) |
16 | ctx.cfg.root_title = xstrdup(value); | 18 | ctx.cfg.root_title = xstrdup(value); |
17 | else if (!strcmp(name, "css")) | 19 | else if (!strcmp(name, "css")) |
18 | ctx.cfg.css = xstrdup(value); | 20 | ctx.cfg.css = xstrdup(value); |
19 | else if (!strcmp(name, "logo")) | 21 | else if (!strcmp(name, "logo")) |
20 | ctx.cfg.logo = xstrdup(value); | 22 | ctx.cfg.logo = xstrdup(value); |
21 | else if (!strcmp(name, "index-header")) | 23 | else if (!strcmp(name, "index-header")) |
22 | ctx.cfg.index_header = xstrdup(value); | 24 | ctx.cfg.index_header = xstrdup(value); |
23 | else if (!strcmp(name, "index-info")) | 25 | else if (!strcmp(name, "index-info")) |
24 | ctx.cfg.index_info = xstrdup(value); | 26 | ctx.cfg.index_info = xstrdup(value); |
25 | else if (!strcmp(name, "logo-link")) | 27 | else if (!strcmp(name, "logo-link")) |
26 | ctx.cfg.logo_link = xstrdup(value); | 28 | ctx.cfg.logo_link = xstrdup(value); |
27 | else if (!strcmp(name, "module-link")) | 29 | else if (!strcmp(name, "module-link")) |
28 | ctx.cfg.module_link = xstrdup(value); | 30 | ctx.cfg.module_link = xstrdup(value); |
29 | else if (!strcmp(name, "virtual-root")) { | 31 | else if (!strcmp(name, "virtual-root")) { |
30 | ctx.cfg.virtual_root = trim_end(value, '/'); | 32 | ctx.cfg.virtual_root = trim_end(value, '/'); |
31 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 33 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
32 | ctx.cfg.virtual_root = ""; | 34 | ctx.cfg.virtual_root = ""; |
33 | } else if (!strcmp(name, "nocache")) | 35 | } else if (!strcmp(name, "nocache")) |
34 | ctx.cfg.nocache = atoi(value); | 36 | ctx.cfg.nocache = atoi(value); |
35 | else if (!strcmp(name, "snapshots")) | 37 | else if (!strcmp(name, "snapshots")) |
36 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 38 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
37 | else if (!strcmp(name, "enable-index-links")) | 39 | else if (!strcmp(name, "enable-index-links")) |
38 | ctx.cfg.enable_index_links = atoi(value); | 40 | ctx.cfg.enable_index_links = atoi(value); |
39 | else if (!strcmp(name, "enable-log-filecount")) | 41 | else if (!strcmp(name, "enable-log-filecount")) |
40 | ctx.cfg.enable_log_filecount = atoi(value); | 42 | ctx.cfg.enable_log_filecount = atoi(value); |
41 | else if (!strcmp(name, "enable-log-linecount")) | 43 | else if (!strcmp(name, "enable-log-linecount")) |
42 | ctx.cfg.enable_log_linecount = atoi(value); | 44 | ctx.cfg.enable_log_linecount = atoi(value); |
43 | else if (!strcmp(name, "cache-root")) | 45 | else if (!strcmp(name, "cache-root")) |
44 | ctx.cfg.cache_root = xstrdup(value); | 46 | ctx.cfg.cache_root = xstrdup(value); |
45 | else if (!strcmp(name, "cache-root-ttl")) | 47 | else if (!strcmp(name, "cache-root-ttl")) |
46 | ctx.cfg.cache_root_ttl = atoi(value); | 48 | ctx.cfg.cache_root_ttl = atoi(value); |
47 | else if (!strcmp(name, "cache-repo-ttl")) | 49 | else if (!strcmp(name, "cache-repo-ttl")) |
48 | ctx.cfg.cache_repo_ttl = atoi(value); | 50 | ctx.cfg.cache_repo_ttl = atoi(value); |
49 | else if (!strcmp(name, "cache-static-ttl")) | 51 | else if (!strcmp(name, "cache-static-ttl")) |
50 | ctx.cfg.cache_static_ttl = atoi(value); | 52 | ctx.cfg.cache_static_ttl = atoi(value); |
51 | else if (!strcmp(name, "cache-dynamic-ttl")) | 53 | else if (!strcmp(name, "cache-dynamic-ttl")) |
52 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 54 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
53 | else if (!strcmp(name, "max-message-length")) | 55 | else if (!strcmp(name, "max-message-length")) |
54 | ctx.cfg.max_msg_len = atoi(value); | 56 | ctx.cfg.max_msg_len = atoi(value); |
55 | else if (!strcmp(name, "max-repodesc-length")) | 57 | else if (!strcmp(name, "max-repodesc-length")) |
56 | ctx.cfg.max_repodesc_len = atoi(value); | 58 | ctx.cfg.max_repodesc_len = atoi(value); |
57 | else if (!strcmp(name, "max-commit-count")) | 59 | else if (!strcmp(name, "max-commit-count")) |
58 | ctx.cfg.max_commit_count = atoi(value); | 60 | ctx.cfg.max_commit_count = atoi(value); |
59 | else if (!strcmp(name, "summary-log")) | 61 | else if (!strcmp(name, "summary-log")) |
60 | ctx.cfg.summary_log = atoi(value); | 62 | ctx.cfg.summary_log = atoi(value); |
61 | else if (!strcmp(name, "summary-branches")) | 63 | else if (!strcmp(name, "summary-branches")) |
62 | ctx.cfg.summary_branches = atoi(value); | 64 | ctx.cfg.summary_branches = atoi(value); |
63 | else if (!strcmp(name, "summary-tags")) | 65 | else if (!strcmp(name, "summary-tags")) |
64 | ctx.cfg.summary_tags = atoi(value); | 66 | ctx.cfg.summary_tags = atoi(value); |
65 | else if (!strcmp(name, "agefile")) | 67 | else if (!strcmp(name, "agefile")) |
66 | ctx.cfg.agefile = xstrdup(value); | 68 | ctx.cfg.agefile = xstrdup(value); |
67 | else if (!strcmp(name, "renamelimit")) | 69 | else if (!strcmp(name, "renamelimit")) |
68 | ctx.cfg.renamelimit = atoi(value); | 70 | ctx.cfg.renamelimit = atoi(value); |
69 | else if (!strcmp(name, "robots")) | 71 | else if (!strcmp(name, "robots")) |
70 | ctx.cfg.robots = xstrdup(value); | 72 | ctx.cfg.robots = xstrdup(value); |
71 | else if (!strcmp(name, "clone-prefix")) | 73 | else if (!strcmp(name, "clone-prefix")) |
72 | ctx.cfg.clone_prefix = xstrdup(value); | 74 | ctx.cfg.clone_prefix = xstrdup(value); |
73 | else if (!strcmp(name, "repo.group")) | 75 | else if (!strcmp(name, "repo.group")) |
74 | ctx.cfg.repo_group = xstrdup(value); | 76 | ctx.cfg.repo_group = xstrdup(value); |
75 | else if (!strcmp(name, "repo.url")) | 77 | else if (!strcmp(name, "repo.url")) |
76 | ctx.repo = cgit_add_repo(value); | 78 | ctx.repo = cgit_add_repo(value); |
@@ -1,80 +1,78 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | struct cgit_repolist cgit_repolist; | 11 | struct cgit_repolist cgit_repolist; |
12 | struct cgit_context ctx; | 12 | struct cgit_context ctx; |
13 | int cgit_cmd; | 13 | int cgit_cmd; |
14 | 14 | ||
15 | const char *cgit_version = CGIT_VERSION; | ||
16 | |||
17 | int chk_zero(int result, char *msg) | 15 | int chk_zero(int result, char *msg) |
18 | { | 16 | { |
19 | if (result != 0) | 17 | if (result != 0) |
20 | die("%s: %s", msg, strerror(errno)); | 18 | die("%s: %s", msg, strerror(errno)); |
21 | return result; | 19 | return result; |
22 | } | 20 | } |
23 | 21 | ||
24 | int chk_positive(int result, char *msg) | 22 | int chk_positive(int result, char *msg) |
25 | { | 23 | { |
26 | if (result <= 0) | 24 | if (result <= 0) |
27 | die("%s: %s", msg, strerror(errno)); | 25 | die("%s: %s", msg, strerror(errno)); |
28 | return result; | 26 | return result; |
29 | } | 27 | } |
30 | 28 | ||
31 | int chk_non_negative(int result, char *msg) | 29 | int chk_non_negative(int result, char *msg) |
32 | { | 30 | { |
33 | if (result < 0) | 31 | if (result < 0) |
34 | die("%s: %s",msg, strerror(errno)); | 32 | die("%s: %s",msg, strerror(errno)); |
35 | return result; | 33 | return result; |
36 | } | 34 | } |
37 | 35 | ||
38 | struct cgit_repo *cgit_add_repo(const char *url) | 36 | struct cgit_repo *cgit_add_repo(const char *url) |
39 | { | 37 | { |
40 | struct cgit_repo *ret; | 38 | struct cgit_repo *ret; |
41 | 39 | ||
42 | if (++cgit_repolist.count > cgit_repolist.length) { | 40 | if (++cgit_repolist.count > cgit_repolist.length) { |
43 | if (cgit_repolist.length == 0) | 41 | if (cgit_repolist.length == 0) |
44 | cgit_repolist.length = 8; | 42 | cgit_repolist.length = 8; |
45 | else | 43 | else |
46 | cgit_repolist.length *= 2; | 44 | cgit_repolist.length *= 2; |
47 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
48 | cgit_repolist.length * | 46 | cgit_repolist.length * |
49 | sizeof(struct cgit_repo)); | 47 | sizeof(struct cgit_repo)); |
50 | } | 48 | } |
51 | 49 | ||
52 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
53 | ret->url = trim_end(url, '/'); | 51 | ret->url = trim_end(url, '/'); |
54 | ret->name = ret->url; | 52 | ret->name = ret->url; |
55 | ret->path = NULL; | 53 | ret->path = NULL; |
56 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
57 | ret->owner = NULL; | 55 | ret->owner = NULL; |
58 | ret->group = ctx.cfg.repo_group; | 56 | ret->group = ctx.cfg.repo_group; |
59 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
60 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
61 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
62 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
63 | ret->module_link = ctx.cfg.module_link; | 61 | ret->module_link = ctx.cfg.module_link; |
64 | ret->readme = NULL; | 62 | ret->readme = NULL; |
65 | return ret; | 63 | return ret; |
66 | } | 64 | } |
67 | 65 | ||
68 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 66 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
69 | { | 67 | { |
70 | int i; | 68 | int i; |
71 | struct cgit_repo *repo; | 69 | struct cgit_repo *repo; |
72 | 70 | ||
73 | for (i=0; i<cgit_repolist.count; i++) { | 71 | for (i=0; i<cgit_repolist.count; i++) { |
74 | repo = &cgit_repolist.repos[i]; | 72 | repo = &cgit_repolist.repos[i]; |
75 | if (!strcmp(repo->url, url)) | 73 | if (!strcmp(repo->url, url)) |
76 | return repo; | 74 | return repo; |
77 | } | 75 | } |
78 | return NULL; | 76 | return NULL; |
79 | } | 77 | } |
80 | 78 | ||