Skip to content

Commit

Permalink
build: introduce new building system
Browse files Browse the repository at this point in the history
Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
  • Loading branch information
Nikola Pajkovsky committed May 14, 2012
1 parent 0172c01 commit c79eaa9
Show file tree
Hide file tree
Showing 11 changed files with 701 additions and 283 deletions.
33 changes: 9 additions & 24 deletions .gitignore
Expand Up @@ -9,8 +9,8 @@
*.la

# ignore binaries
src/iptraf-ng
src/rvnamed-ng
/iptraf-ng
/rvnamed-ng

# don't ignore git files
!.gitignore
Expand All @@ -26,30 +26,15 @@ cscope.*
ncscope.*

# autotools
*/.deps/
*/.libs/
Makefile
Makefile.in
m4/
missing
configure
configure.scan
autom4te.cache/
config.guess
config.log
config.h
config.h.in
config.rpath
config.status
config.sub
aclocal.m4
autoscan.log
depcomp
install-sh
stamp-h1
/configure
/autom4te.cache/
/config.log
/config.mak.append
/config.mak.autogen
/config.status

# misc
*~
\#*#
/iptraf-ng.spec
version
VERSION-FILE
39 changes: 39 additions & 0 deletions GEN-VERSION-FILE
@@ -0,0 +1,39 @@
#!/bin/bash

GVF=VERSION-FILE
DEF_VER=1.1.1
LF='
'

# First see if there is a version file (included in release tarballs),
# then try git-describe, then default.
if test -f version
then
VN=$(cat version) || VN="$DEF_VER"
elif test -d .git -o -f .git &&
VN=$(git describe --tags --match "[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
case "$VN" in
*$LF*) (exit 1) ;;
[0-9]*)
git update-index -q --refresh
test -z "$(git diff-index --name-only HEAD --)" || VN="$VN-dirty"
esac
then
VN=$(echo "$VN" | sed -e 's/-/./g');
else
VN="$DEF_VER"
fi


VN=$(expr "$VN" : v*'\(.*\)')

if test -r $GVF
then
VC=$(sed -e 's/^IPTRAF_VERSION = //' <$GVF)
else
VC=unset
fi
test "$VN" = "$VC" || {
echo >&2 "IPTRAF_VERSION = $VN"
echo "IPTRAF_VERSION = $VN" >$GVF
}

0 comments on commit c79eaa9

Please sign in to comment.