1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 01:57:09 +00:00

First commit to fresh new hip git repo for Conky.

This commit is contained in:
Brenden Matthews 2008-12-06 23:03:24 -07:00
parent d1b139f8e2
commit 726934998d
4 changed files with 36 additions and 1556 deletions

26
.gitignore vendored Normal file
View 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

View File

@ -1,5 +1,7 @@
# $Id$ # $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 Authors of conky in alphapetical order (please, send mail if I forgot
somebody or email address / name is wrong): somebody or email address / name is wrong):

View File

@ -26,7 +26,7 @@
# #
# $Id$ # $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} AUTOCONF=${AUTOCONF:-autoconf}
AUTOMAKE=${AUTOMAKE:-automake} AUTOMAKE=${AUTOMAKE:-automake}
@ -34,15 +34,16 @@ ACLOCAL=${ACLOCAL:-aclocal}
AUTOHEADER=${AUTOHEADER:-autoheader} AUTOHEADER=${AUTOHEADER:-autoheader}
LIBTOOLIZE=${LIBTOOLIZE:-libtoolize} LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
# identify svn revision, if an svn working copy # identify a git revision similar to svn based on number of commits, if a git
if test "$1" != "" && test -d "$1/.svn"; then # working copy. the last svn commit was rev 1274, so we'll pick up from there
revision=`LC_ALL=C svn info $1 | awk '/^Revision: / {printf "%05d\n", $2}'`; if test "$1" != "" && test -d "$1/.git"; then
elif test -d ".svn"; then revision=`git log --since=2008-12-06 --pretty=oneline | wc -l | awk '{print $1 + 1274}'`;
revision=`LC_ALL=C svn info | awk '/^Revision: / {printf "%05d\n", $2}'`; elif test -d ".git"; then
revision=`git log --since=2008-12-06 --pretty=oneline | wc -l | awk '{print $1 + 1274}'`;
else else
revision="NONE"; fi 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" sed -e "s/@REVISION@/${revision}/g" < "configure.ac.in" > "configure.ac"
echo Running $ACLOCAL -I m4 ... && $ACLOCAL -I m4 echo Running $ACLOCAL -I m4 ... && $ACLOCAL -I m4

File diff suppressed because it is too large Load Diff