textual change @4m4rOk

[proxmark3-svn] / tools / mkversion.pl

diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index e12dd4472c4c6df0ff9a21bece88b037a199a59e..f726640e946b0aec7734ec5a6d66900a2507b4be 100644 (file)
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -5,18 +5,26 @@
 # -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28
 # Modified april 2014 because of the move to github. 
 # --- Martin Holst Swende <martin@swende.se>
 # -- 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 git will not use localized strings
 $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 
 # 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 $gitversion = `git describe --dirty`;
 my $gitbranch = `git rev-parse --abbrev-ref HEAD`;

-my $clean = 2;
-my @compiletime = gmtime();
+my $clean = $gitversion =~ '-dirty' ? 0 : 1;
+my @compiletime = localtime();
+
+my $fullgitinfo = 'iceman';

 
 

-my $fullgitinfo = 'iceman' . $gitbranch . '/' . $gitversion;
+if ( defined $gitbranch and defined $gitversion ) {
+       $fullgitinfo =  $fullgitinfo.'/'. $gitbranch . '/' . $gitversion;
+} else {
+       $fullgitinfo =  $fullgitinfo.'/master/release-build (no_git)';
+}

 
 $fullgitinfo =~ s/(\s)//g;
 
 
 $fullgitinfo =~ s/(\s)//g;