diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 29 | ||||
| -rw-r--r-- | cgit.c | 3 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| -rwxr-xr-x | gen-version.sh | 4 | ||||
| -rw-r--r-- | shared.c | 2 | ||||
| -rw-r--r-- | ui-shared.c | 2 |
7 files changed, 27 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore index c4c9ac3..5664962 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # Files I don't care to see in git-status/commit cgit +VERSION *.o *~ diff --git a/Makefile b/Makefile index c2a5736..e69ad7e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,4 @@ -CGIT_VERSION = 0.5 - prefix = /var/www/htdocs/cgit - SHA1_HEADER = <openssl/sha.h> CACHE_ROOT = /var/cache/cgit CGIT_CONFIG = /etc/cgitrc @@ -12,6 +9,17 @@ CGIT_SCRIPT_NAME = cgit.cgi # -include cgit.conf + +CGIT_VERSION = 0.5 + +all: cgit + +VERSION: + gen-version.sh + +-include VERSION + + EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ @@ -42,12 +50,7 @@ INITGIT = ./submodules.sh -i endif -# -# basic build rules -# -all: cgit - -cgit: cgit.c cgit.h $(OBJECTS) +cgit: cgit.c cgit.h VERSION $(OBJECTS) $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) $(OBJECTS): cgit.h git/libgit.a @@ -65,7 +68,7 @@ install: all clean-cache install cgit.css $(prefix)/cgit.css clean-cgit: - rm -f cgit *.o + rm -f cgit VERSION *.o distclean-cgit: clean-cgit git clean -d -x @@ -83,5 +86,9 @@ clean: clean-cgit clean-sub distclean: distclean-cgit distclean-sub +version: clean-cgit + ./gen-version.sh + make + .PHONY: all install clean clean-cgit clean-sub clean-cache \ - distclean distclean-cgit distclean-sub + distclean distclean-cgit distclean-sub release version diff --git a/cgit.c b/cgit.c index 3fc90bf..11dff76 100644 --- a/cgit.c +++ b/cgit.c @@ -8,9 +8,6 @@ #include "cgit.h" -const char cgit_version[] = CGIT_VERSION; - - static int cgit_prepare_cache(struct cacheitem *item) { if (!cgit_repo && cgit_query_repo) { diff --git a/cgit.h b/cgit.h index bd2dd0d..9558362 100644 --- a/cgit.h +++ b/cgit.h @@ -98,7 +98,7 @@ struct taginfo { char *msg; }; -extern const char cgit_version[]; +extern const char *cgit_version; extern struct repolist cgit_repolist; extern struct repoinfo *cgit_repo; diff --git a/gen-version.sh b/gen-version.sh new file mode 100755 index 0000000..4c60f60 --- /dev/null +++ b/gen-version.sh @@ -0,0 +1,4 @@ +v=$(git-describe --abbrev=4 HEAD | sed -e 's/-/./g') +test -z "$v" && exit 1 +echo "CGIT_VERSION = $v" +echo "CGIT_VERSION = $v" > VERSION diff --git a/shared.c b/shared.c index f20fb5c..f7f43b2 100644 --- a/shared.c +++ b/shared.c @@ -12,6 +12,8 @@ struct repolist cgit_repolist; struct repoinfo *cgit_repo; int cgit_cmd; +const char *cgit_version = CGIT_VERSION; + char *cgit_root_title = "Git repository browser"; char *cgit_css = "/cgit.css"; char *cgit_logo = "/git-logo.png"; diff --git a/ui-shared.c b/ui-shared.c index 15d8254..110c696 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -262,7 +262,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item) html("<title>"); html_txt(title); html("</title>\n"); - htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); + htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); html("<link rel='stylesheet' type='text/css' href='"); html_attr(cgit_css); html("'/>\n"); |