little changes

This commit is contained in:
ardi@ist-einmalig.de 2009-07-26 11:32:30 +00:00
parent 46a650feb7
commit 47989619cd
2 changed files with 13 additions and 13 deletions

View File

@ -54,8 +54,9 @@ export DEPSDIR := $(CURDIR)/$(BUILD)
#---------------------------------------------------------------------------------
# automatically build a list of object files for our project
#---------------------------------------------------------------------------------
SVNREV := $(shell svnrev.sh)
export CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
export CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
export CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
@ -123,7 +124,6 @@ release:
else
DEPENDS := $(OFILES:.o=.d)
SVNREV := $(shell ../svnrev.sh)
#---------------------------------------------------------------------------------
# main targets

View File

@ -1,20 +1,20 @@
#! /bin/sh
#
a=$(svnversion -n ..)
[ -n "$a" ] || a=$(SubWCRev .. | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
a=$(svnversion -n .)
[ -n "$a" ] || a=$(SubWCRev . | tr -d '\n' | sed 's/[^0-9]*[0-9]*[^0-9]*\([0-9]*\).*/\1/')
[ -f ../source/svnrev.c ] || touch ../source/svnrev.c
[ -f ./source/svnrev.c ] || touch ./source/svnrev.c
b=$(cat ../source/svnrev.c | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
b=$(cat ./source/svnrev.c | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
if [ "$a" != "$b" ]; then
echo '#define SVN_REV "'$a'"' > ../source/svnrev.c
echo '' >> ../source/svnrev.c
echo 'const char *GetRev()' >> ../source/svnrev.c
echo '{ ' >> ../source/svnrev.c
echo ' return SVN_REV;' >> ../source/svnrev.c
echo '}' >> ../source/svnrev.c
echo '' >> ../source/svnrev.c
echo '#define SVN_REV "'$a'"' > ./source/svnrev.c
echo '' >> ./source/svnrev.c
echo 'const char *GetRev()' >> ./source/svnrev.c
echo '{ ' >> ./source/svnrev.c
echo ' return SVN_REV;' >> ./source/svnrev.c
echo '}' >> ./source/svnrev.c
echo '' >> ./source/svnrev.c
echo 'svnrev changed' >&2
fi
echo $a