Changeset e26aa72

Timestamp:

2015-01-25T05:00:06Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

36ee8c6, 95e17fc

Parents:

eb4ad8d

git-author:

dequis <dx@…> (24-01-15 22:48:09)

git-committer:

dequis <dx@…> (25-01-15 05:00:06)

Message:

Add git specific stuff!

• A few build system tweaks
• A fancy README.md
• s/.bzrignore/.gitignore/
• .travis.yml for travis-ci integration
• doc/git-bzr-rev-map for historical purposes

Files:

• .gitignore (moved) (moved from .bzrignore) (1 diff)
• .travis.yml (added)
• Makefile (modified) (1 diff)
• README.md (added)
• configure (modified) (1 diff)
• doc/Makefile (modified) (1 diff)
• doc/git-bzr-rev-map (added)

.gitignore

@@ -24 +24 @@
 .depend
 DEADJOE
+callgrind.out.*
+cov-int
+.bzr
+.bzrignore
+.git
+.gitignore

Makefile

@@ -153 +153 @@
         x=$$(basename $$(pwd)); \
         cd ..; \
-        tar czf $$x.tar.gz --exclude=debian --exclude=.bzr* --exclude=.depend $$x
+        tar czf $$x.tar.gz --exclude-from=.gitignore $$x
 
 $(subdirs):

configure

@@ -667 +667 @@
 fi
 
+if [ -z "$BITLBEE_VERSION" -a -d .git ] && type git > /dev/null 2> /dev/null; then
+        rev=`git describe --long --tags`-`git rev-parse --abbrev-ref HEAD`
+        echo 'Using '$rev' as git version number'
+        BITLBEE_VERSION=$rev-git
+fi
+
 if [ -n "$BITLBEE_VERSION" ]; then
         echo 'Spoofing version number: '$BITLBEE_VERSION

doc/Makefile

@@ -5 +5 @@
 
 all:
-        # Only build the docs if this is a bzr checkout
-        test ! -d ../.bzr || $(MAKE) -C user-guide
+        # Only build the docs if this is a git tree
+        test ! '(' -d ../.git -o -d ../.bzr ')' || $(MAKE) -C user-guide
 
 install: