/client/Makefile: Output object files to the obj subdir.

[proxmark3-svn] / tools / mkversion.pl

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 4b77151713a3fc3978a32af732af7561f8145a51..351bac91f0f894f3a182352e338eb30d71a22659 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -25,7 +25,7 @@ if(open(SVNINFO, "svn info $main_dir|")) {
                }
        }
        close(SVNINFO);
                }
        }
        close(SVNINFO);

-       
+

        if(open(SVNSTATUS, "svn status $main_dir|")) {
                $clean = 1;
                while(<SVNSTATUS>) {
        if(open(SVNSTATUS, "svn status $main_dir|")) {
                $clean = 1;
                while(<SVNSTATUS>) {


@@ -36,15 +36,16 @@ if(open(SVNINFO, "svn info $main_dir|")) {
                }
                close(SVNINFO);
        }
                }
                close(SVNINFO);
        }

-       
+

 } 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;
                        }


@@ -58,7 +59,7 @@ $compiletime[5] += 1900;
 my $ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @compiletime);
 
 print <<EOF
 my $ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @compiletime);
 
 print <<EOF

-#include <proxmark3.h>
+#include "proxmark3.h"

 /* Generated file, do not edit */
 struct version_information __attribute__((section(".version_information"))) version_information = {
        VERSION_INFORMATION_MAGIC,
 /* Generated file, do not edit */
 struct version_information __attribute__((section(".version_information"))) version_information = {
        VERSION_INFORMATION_MAGIC,