mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-11-15 17:47:09 +00:00
First commit to fresh new hip git repo for Conky.
This commit is contained in:
parent
d1b139f8e2
commit
726934998d
26
.gitignore
vendored
Normal file
26
.gitignore
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
Makefile
|
||||
Makefile.in
|
||||
aclocal.m4
|
||||
autom4te.cache/
|
||||
config.guess
|
||||
config.log
|
||||
config.status
|
||||
config.sub
|
||||
configure
|
||||
configure.ac
|
||||
depcomp
|
||||
install-sh
|
||||
libtool
|
||||
ltmain.sh
|
||||
missing
|
||||
src/config.h.in
|
||||
src/conky
|
||||
src/stamp-h1
|
||||
src/.deps/
|
||||
src/build.h
|
||||
src/config.h
|
||||
src/*.o
|
||||
conky-*.tar.*
|
||||
doc/*.html
|
||||
doc/*.mxml
|
||||
doc/conky.1
|
2
AUTHORS
2
AUTHORS
@ -1,5 +1,7 @@
|
||||
# $Id$
|
||||
|
||||
NOTE: Since moving to Git, I am no longer going to continue to update this file (in favour of Git's log stuff).
|
||||
|
||||
Authors of conky in alphapetical order (please, send mail if I forgot
|
||||
somebody or email address / name is wrong):
|
||||
|
||||
|
15
autogen.sh
15
autogen.sh
@ -26,7 +26,7 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
# optional $1 = optional directory containing build tree or svn working copy
|
||||
# optional $1 = optional directory containing build tree or git working copy
|
||||
|
||||
AUTOCONF=${AUTOCONF:-autoconf}
|
||||
AUTOMAKE=${AUTOMAKE:-automake}
|
||||
@ -34,15 +34,16 @@ ACLOCAL=${ACLOCAL:-aclocal}
|
||||
AUTOHEADER=${AUTOHEADER:-autoheader}
|
||||
LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
|
||||
|
||||
# identify svn revision, if an svn working copy
|
||||
if test "$1" != "" && test -d "$1/.svn"; then
|
||||
revision=`LC_ALL=C svn info $1 | awk '/^Revision: / {printf "%05d\n", $2}'`;
|
||||
elif test -d ".svn"; then
|
||||
revision=`LC_ALL=C svn info | awk '/^Revision: / {printf "%05d\n", $2}'`;
|
||||
# identify a git revision similar to svn based on number of commits, if a git
|
||||
# working copy. the last svn commit was rev 1274, so we'll pick up from there
|
||||
if test "$1" != "" && test -d "$1/.git"; then
|
||||
revision=`git log --since=2008-12-06 --pretty=oneline | wc -l | awk '{print $1 + 1274}'`;
|
||||
elif test -d ".git"; then
|
||||
revision=`git log --since=2008-12-06 --pretty=oneline | wc -l | awk '{print $1 + 1274}'`;
|
||||
else
|
||||
revision="NONE"; fi
|
||||
|
||||
# generate configure.ac with substituted svn revision
|
||||
# generate configure.ac with substituted git revision
|
||||
sed -e "s/@REVISION@/${revision}/g" < "configure.ac.in" > "configure.ac"
|
||||
|
||||
echo Running $ACLOCAL -I m4 ... && $ACLOCAL -I m4
|
||||
|
1549
doc/conky.1
1549
doc/conky.1
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user