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,87 +1,94 @@
-CGIT_VERSION = 0.5
-
 prefix = /var/www/htdocs/cgit
-
 SHA1_HEADER = <openssl/sha.h>
 CACHE_ROOT = /var/cache/cgit
 CGIT_CONFIG = /etc/cgitrc
 CGIT_SCRIPT_NAME = cgit.cgi
 
 #
 # Let the user override the above settings.
 #
 -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 \
         ui-snapshot.o ui-blob.o
 
 CFLAGS += -Wall
 
 ifdef DEBUG
         CFLAGS += -g
 endif
 
 CFLAGS += -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 
 
 #
 # If make is run on a nongit platform, get the git sources as a tarball.
 #
 GITVER = $(shell git version 2>/dev/null || echo nogit)
 ifeq ($(GITVER),nogit)
 GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
 INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
 else
 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
 
 git/libgit.a:
         $(INITGIT)
         $(MAKE) -C git
 
 #
 # phony targets
 #
 install: all clean-cache
         mkdir -p $(prefix)
         install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
         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
 
 clean-sub:
         $(MAKE) -C git clean
 
 distclean-sub: clean-sub
         $(shell cd git && git clean -d -x)
 
 clean-cache:
         rm -rf $(CACHE_ROOT)/*
 
 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
@@ -1,37 +1,34 @@
 /* cgit.c: cgi for the git scm
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
-const char cgit_version[] = CGIT_VERSION;
-
-
 static int cgit_prepare_cache(struct cacheitem *item)
 {
         if (!cgit_repo && cgit_query_repo) {
                 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title, 0);
                 cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo));
                 cgit_print_docend();
                 return 0;
         }
 
         if (!cgit_repo) {
                 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
                 item->ttl = cgit_cache_root_ttl;
                 return 1;
         }
 
         if (!cgit_cmd) {
                 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
                            cache_safe_filename(cgit_repo->url)));
                 item->ttl = cgit_cache_repo_ttl;
         } else {
                 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
                            cache_safe_filename(cgit_repo->url), cgit_query_page,
diff --git a/cgit.h b/cgit.h
index bd2dd0d..9558362 100644
--- a/cgit.h
+++ b/cgit.h
@@ -77,49 +77,49 @@ struct repolist {
         int length;
         int count;
         struct repoinfo *repos;
 };
 
 struct commitinfo {
         struct commit *commit;
         char *author;
         char *author_email;
         unsigned long author_date;
         char *committer;
         char *committer_email;
         unsigned long committer_date;
         char *subject;
         char *msg;
 };
 
 struct taginfo {
         char *tagger;
         char *tagger_email;
         int tagger_date;
         char *msg;
 };
 
-extern const char cgit_version[];
+extern const char *cgit_version;
 
 extern struct repolist cgit_repolist;
 extern struct repoinfo *cgit_repo;
 extern int cgit_cmd;
 
 extern char *cgit_root_title;
 extern char *cgit_css;
 extern char *cgit_logo;
 extern char *cgit_index_header;
 extern char *cgit_logo_link;
 extern char *cgit_module_link;
 extern char *cgit_agefile;
 extern char *cgit_virtual_root;
 extern char *cgit_script_name;
 extern char *cgit_cache_root;
 extern char *cgit_repo_group;
 
 extern int cgit_nocache;
 extern int cgit_snapshots;
 extern int cgit_enable_log_filecount;
 extern int cgit_enable_log_linecount;
 extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
diff --git a/gen-version.sh b/gen-version.sh
new file mode 100755
index 0000000..4c60f60
--- a/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
@@ -1,38 +1,40 @@
 /* shared.c: global vars + some callback functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 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";
 char *cgit_index_header = NULL;
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_agefile      = "info/web/last-modified";
 char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = "/var/cache/cgit";
 char *cgit_repo_group   = NULL;
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
 int cgit_enable_log_filecount  =  0;
 int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 int cgit_cache_dynamic_ttl     =  5;
 int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 int cgit_summary_log           =  0;
 
diff --git a/ui-shared.c b/ui-shared.c
index 15d8254..110c696 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -241,49 +241,49 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
                 return;
         }
         if (secs < TM_YEAR * 2) {
                 htmlf("<span class='age-months'>%.0f months</span>",
                       secs * 1.0 / TM_MONTH);
                 return;
         }
         htmlf("<span class='age-years'>%.0f years</span>",
               secs * 1.0 / TM_YEAR);
 }
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
         html("Content-Type: text/html; charset=utf-8\n");
         htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
         htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                          ttl_seconds(item->ttl)));
         html("\n");
         html(cgit_doctype);
         html("<html>\n");
         html("<head>\n");
         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");
         html("</head>\n");
         html("<body>\n");
 }
 
 void cgit_print_docend()
 {
         html("</td></tr></table>");
         html("</body>\n</html>\n");
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
         html("<table id='layout'>");
         html("<tr><td id='header'>");
         html(cgit_root_title);
         html("</td><td id='logo'>");
         html("<a href='");
         html_attr(cgit_logo_link);
         htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
         html("</td></tr>");
         html("<tr><td id='crumb'>");