Merge branch 'lh/menu'

* lh/menu:
  Add ofs argument to cgit_log_link and use it in ui-log.c
  Add trim_end() and use it to remove trailing slashes from repo paths
  Do not include current path in the "tree" menu link
  Add setting to enable/disable extra links on index page
  Change S/L/T to summary/log/tree
  Change "files" to "tree"
  Include querystring as part of cached filename for repo summary page
  Add more menuitems on repo pages

diff --git a/.gitignore b/.gitignore
index c4c9ac3ffa5af077a3a5ffd349a413df1f6e703b..566496210185cd3667c8364649d87f4f730c822b 100644 (file)
--- 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 c2a5736971320639d4a22ef7a4ebfd8bcf614007..e69ad7e3562e66dbab48554a6f1cec0973e61baa 100644 (file)
--- 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 b943fe5769ce56644d5b5ac54c43da0d15be8e7d..d9a03c2773e88ca0a65eadc97183e0197e0524ba 100644 (file)
--- 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 a59a3706f35c64a4cd5b412ab93703ba0963f29a..2ff5340d9d755a17fbc428f15083cc01f52caa5b 100644 (file)
--- 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 (executable)
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 45db735ed39f1a7ba20dce0618f11eecfb08ddc2..1a5b866e86630df4964961086edbb0ea1ec0d48e 100644 (file)
--- 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 bfcc2ac5a880cf5a27ac8d0c227cea562b1956a9..d4376cef5823f403ccd30707abc985ef76c2e6fb 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -282,7 +282,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");