Fix mkversion.pl for the case where the global svn revision is different from the...

diff --git a/common/Makefile.common b/common/Makefile.common
index 51d60cce1b03a17c8479d0bf63f58227f26bc33e..c212ccb75991f1c9f3c290e9eb932f47d15ec6d0 100644 (file)
--- 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 <henryk@ploetzli.ch> 2009-08-27
 # 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 <henryk@ploetzli.ch> 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-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
 
 # version.c should be remade on every compilation
 .PHONY: version.c

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 4b77151713a3fc3978a32af732af7561f8145a51..a3ec2f2bb2ea4b5fab5efbad61a11700d042d9f4 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -38,13 +38,14 @@ if(open(SVNINFO, "svn info $main_dir|")) {
        }
        
 } else {
        }
        
 } 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(<ENTRIES>) {
                        last if($i == 3 and !/^dir/);
        #  revision.
        if(open(ENTRIES, "$main_dir/.svn/entries")) {
                my $i = 1;
                while(<ENTRIES>) {
                        last if($i == 3 and !/^dir/);

-                       if($i == 4 and /^([0-9]*)/) {
+                       if($i == 11 and /^([0-9]*)/) {

                                $present = 1;
                                $svnversion = $1;
                        }
                                $present = 1;
                                $svnversion = $1;
                        }