projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: 'LF PYRAMID' the crc8_MAXIM and crc16_DNP was calling the wrong crc method....
[proxmark3-svn]
/
tools
/
mkversion.pl
diff --git
a/tools/mkversion.pl
b/tools/mkversion.pl
index e12dd4472c4c6df0ff9a21bece88b037a199a59e..2755b3b99fd1eac67026e2ec0b3ce13616ad15e7 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 $clean = 2;
my $gitversion = `git describe --dirty`;
my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
my $clean = 2;
-my @compiletime = gmtime();
+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;
Impressum
,
Datenschutz