Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / tools / mkversion.pl

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index 03ef27d286e24c55791bc46a566551cbe23d599b..e12dd4472c4c6df0ff9a21bece88b037a199a59e 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -3,70 +3,40 @@
 # Normally a couple of lines of bash would be enough (see openpcd project, original firmware by Harald Welte and Milosch Meriac)
 # but this will, at least in theory, also work on Windows with our current compile environment.
 # -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28
 # Normally a couple of lines of bash would be enough (see openpcd project, original firmware by Harald Welte and Milosch Meriac)
 # but this will, at least in theory, also work on Windows with our current compile environment.
 # -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28

+# Modified april 2014 because of the move to github. 
+# --- Martin Holst Swende <martin@swende.se>

 
 

-my $main_dir = shift;

 
 

-# Clear environment locale so that svn will not use localized strings
+# Clear environment locale so that git will not use localized strings

 $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 

-my $svnversion = 0;
-my $present = 0;
+my $gitversion = `git describe --dirty`;
+my $gitbranch = `git rev-parse --abbrev-ref HEAD`;

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

-# Strategy one: call svn info and extract last changed revision, call svn status and look for ^M
-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
-               }
-       }
-       close(SVNINFO);
+my $fullgitinfo = 'iceman' . $gitbranch . '/' . $gitversion;

 
 

-       if(open(SVNSTATUS, "svn status $main_dir|")) {
-               $clean = 1;
-               while(<SVNSTATUS>) {
-                       if(/^M/) {
-                               $clean = 0;
-                               ## last;
-                       }
-               }
-               close(SVNINFO);
-       }
+$fullgitinfo =~ s/(\s)//g;

 
 

-} else {
-       # 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/);
-                       if($i == 11 and /^([0-9]*)/) {
-                               $present = 1;
-                               $svnversion = $1;
-                       }
-                       $i++;
-               }
-       }
-}
+# Crop so it fits within 50 characters
+$fullgitinfo =~ s/.{50}\K.*//s;

 
 $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);
 

+

 print <<EOF
 #include "proxmark3.h"
 /* Generated file, do not edit */
 const struct version_information __attribute__((section(".version_information"))) version_information = {
        VERSION_INFORMATION_MAGIC,
        1,
 print <<EOF
 #include "proxmark3.h"
 /* Generated file, do not edit */
 const struct version_information __attribute__((section(".version_information"))) version_information = {
        VERSION_INFORMATION_MAGIC,
        1,

-       $present,
+       1,

        $clean,
        $clean,

-       "svn $svnversion",
+       "$fullgitinfo",

        "$ctime",
 };
 EOF
        "$ctime",
 };
 EOF