mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-25 18:08:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add version info from git-describe

Browse Source 
A new script, gen-version.sh, is now invoked from 'make version' to generate
the file VERSION. This file contains a version identifier generated by
git-describe and is included in the Makefile.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2007-06-18 09:42:10 +02:00
parent 4a0be58666
commit f69250358a
7 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
# Files I don't care to see in git-status/commit
cgit
VERSION
*.o
*~

29
Makefile
View File

@ -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

3
cgit.c
View File

@ -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) {

2
cgit.h
View File

@ -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;

4
gen-version.sh Executable file
View File

@ -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

2
shared.c
View File

@ -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";

2
ui-shared.c
View File

@ -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");