CHG: reverted back from the idea of measureing in (us) microseconds, the timer...

[proxmark3-svn] / tools / mkversion.pl

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index de394a85d67214dd00e015eaaf30a0cb7b99f45c..3edc360594573e1da6b38886fe160a67c2bbda1e 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -5,20 +5,28 @@
 # -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28
 # Modified april 2014 because of the move to github. 
 # --- Martin Holst Swende <martin@swende.se>
+# Modified january 2016 to work with Travis-CI
+# --- iceman <iceman@iuse.se>
 
-
-# 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";
 
+my $githistory = `git fetch --all`;
 my $gitversion = `git describe --dirty`;
 my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
 my $clean = 2;
 my @compiletime = gmtime();
 
-my $fullgitinfo= $gitbranch . '/'.$gitversion;
+my $fullgitinfo = 'iceman';
+
+if ( defined $gitbranch and defined $gitversion ) {
+       $fullgitinfo =  '/'. $gitbranch . '/' . $gitversion;
+} else {
+       $fullgitinfo =  '/master/release-build (no_git)';
+}
 
-$fullgitinfo=~ s/(\s)//g;
+$fullgitinfo =~ s/(\s)//g;
 
 # Crop so it fits within 50 characters
 $fullgitinfo =~ s/.{50}\K.*//s;