Merge pull request #1 from midnitesnake/master

[proxmark3-svn] / tools / mkversion.pl

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 351bac91f0f894f3a182352e338eb30d71a22659..6f2eff69bdc6031d599b2b9af74dc8370075fa05 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -11,7 +11,6 @@ $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 my $svnversion = 0;
 $ENV{'LANG'} = "C";
 
 my $svnversion = 0;

-my $present = 0;

 my $clean = 2;
 my @compiletime = gmtime();
 
 my $clean = 2;
 my @compiletime = gmtime();
 


@@ -19,7 +18,6 @@ my @compiletime = gmtime();
 if(open(SVNINFO, "svn info $main_dir|")) {
        while(<SVNINFO>) {
                if (/^Last Changed Rev: (.*)/) {
 if(open(SVNINFO, "svn info $main_dir|")) {
        while(<SVNINFO>) {
                if (/^Last Changed Rev: (.*)/) {

-                       $present = 1;

                        $svnversion = $1;
                        ## last; # Do not abort here, since SVN tends to complain about a Broken pipe
                }
                        $svnversion = $1;
                        ## last; # Do not abort here, since SVN tends to complain about a Broken pipe
                }


@@ -46,7 +44,6 @@ if(open(SVNINFO, "svn info $main_dir|")) {
                while(<ENTRIES>) {
                        last if($i == 3 and !/^dir/);
                        if($i == 11 and /^([0-9]*)/) {
                while(<ENTRIES>) {
                        last if($i == 3 and !/^dir/);
                        if($i == 11 and /^([0-9]*)/) {

-                               $present = 1;

                                $svnversion = $1;
                        }
                        $i++;
                                $svnversion = $1;
                        }
                        $i++;


@@ -57,14 +54,15 @@ if(open(SVNINFO, "svn info $main_dir|")) {
 $compiletime[4] += 1;
 $compiletime[5] += 1900;
 my $ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @compiletime);
 $compiletime[4] += 1;
 $compiletime[5] += 1900;
 my $ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @compiletime);

+$svnversion=~ s/(^\s+|\s+$)//g;

 
 print <<EOF
 #include "proxmark3.h"
 /* Generated file, do not edit */
 
 print <<EOF
 #include "proxmark3.h"
 /* Generated file, do not edit */

-struct version_information __attribute__((section(".version_information"))) version_information = {
+const struct version_information __attribute__((section(".version_information"))) version_information = {

        VERSION_INFORMATION_MAGIC,
        1,
        VERSION_INFORMATION_MAGIC,
        1,

-       $present,
+       1,

        $clean,
        "svn $svnversion",
        "$ctime",
        $clean,
        "svn $svnversion",
        "$ctime",