From: henryk@ploetzli.ch Date: Tue, 1 Sep 2009 22:56:07 +0000 (+0000) Subject: Fix mkversion.pl for the case where the global svn revision is different from the... X-Git-Tag: v1.0.0~492 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/4f3bd9738f10b494189b922337f442644aae9968 Fix mkversion.pl for the case where the global svn revision is different from the last changed revision --- diff --git a/common/Makefile.common b/common/Makefile.common index 51d60cce..c212ccb7 100644 --- a/common/Makefile.common +++ b/common/Makefile.common @@ -76,11 +76,12 @@ $(VERSIONOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES) # This objcopy call translates physical flash addresses to logical addresses # without touching start address or RAM addresses (.bss and .data sections) # See ldscript.common. -- Henryk Plötz 2009-08-27 -$(OBJDIR)/%.s19: $(OBJDIR)/%.elf - $(OBJCOPY) -Osrec --srec-forceS3 --strip-debug --no-change-warnings \ +OBJCOPY_TRANSLATIONS = --no-change-warnings \ --change-addresses -0x100000 --change-start 0 \ --change-section-address .bss+0 --change-section-address .data+0 \ - --change-section-address .commonarea+0 $^ $@ + --change-section-address .commonarea+0 +$(OBJDIR)/%.s19: $(OBJDIR)/%.elf + $(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@ # version.c should be remade on every compilation .PHONY: version.c diff --git a/tools/mkversion.pl b/tools/mkversion.pl index 4b771517..a3ec2f2b 100644 --- a/tools/mkversion.pl +++ b/tools/mkversion.pl @@ -38,13 +38,14 @@ if(open(SVNINFO, "svn info $main_dir|")) { } } else { - # Strategy two: look for .svn/entries. The third line should be "dir", the fourth line should contain the current + # Strategy two: look for .svn/entries. The third line should be "dir", the fourth line should contain + # the currently checked out revision, the eleventh line should contain the last changed revision. # revision. if(open(ENTRIES, "$main_dir/.svn/entries")) { my $i = 1; while() { last if($i == 3 and !/^dir/); - if($i == 4 and /^([0-9]*)/) { + if($i == 11 and /^([0-9]*)/) { $present = 1; $svnversion = $1; }