X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5eae566a28d4494e70a9e3812e269dbd87d9bc07..e0a241f76ed8aea5f23745fb3775c6916406aea4:/tools/mkversion.pl diff --git a/tools/mkversion.pl b/tools/mkversion.pl index e12dd447..f726640e 100644 --- a/tools/mkversion.pl +++ b/tools/mkversion.pl @@ -5,18 +5,26 @@ # -- Henryk Plötz 2009-09-28 # Modified april 2014 because of the move to github. # --- Martin Holst Swende - +# Modified january 2016 to work with Travis-CI +# --- iceman # 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 $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;