mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-19 21:03:48 -07:00
Fixed so build scripts utilises the git version
This commit is contained in:
parent
046f3dfa7c
commit
e3ac0d7095
1 changed files with 10 additions and 38 deletions
|
@ -3,58 +3,30 @@
|
||||||
# Normally a couple of lines of bash would be enough (see openpcd project, original firmware by Harald Welte and Milosch Meriac)
|
# 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.
|
# 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
|
# -- 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 svn will not use localized strings
|
||||||
$ENV{'LC_ALL'} = "C";
|
$ENV{'LC_ALL'} = "C";
|
||||||
$ENV{'LANG'} = "C";
|
$ENV{'LANG'} = "C";
|
||||||
|
|
||||||
my $svnversion = 0;
|
my $gitversion = `git describe --dirty`;
|
||||||
|
my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
|
||||||
my $clean = 2;
|
my $clean = 2;
|
||||||
my @compiletime = gmtime();
|
my @compiletime = gmtime();
|
||||||
|
|
||||||
# Strategy one: call svn info and extract last changed revision, call svn status and look for ^M
|
my $fullgitinfo= $gitbranch . '/'.$gitversion;
|
||||||
if(open(SVNINFO, "svn info $main_dir|")) {
|
|
||||||
while(<SVNINFO>) {
|
|
||||||
if (/^Last Changed Rev: (.*)/) {
|
|
||||||
$svnversion = $1;
|
|
||||||
## last; # Do not abort here, since SVN tends to complain about a Broken pipe
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close(SVNINFO);
|
|
||||||
|
|
||||||
if(open(SVNSTATUS, "svn status $main_dir|")) {
|
$fullgitinfo=~ s/(\s)//g;
|
||||||
$clean = 1;
|
|
||||||
while(<SVNSTATUS>) {
|
|
||||||
if(/^M/) {
|
|
||||||
$clean = 0;
|
|
||||||
## last;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close(SVNINFO);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
# Crop so it fits within 50 characters
|
||||||
# Strategy two: look for .svn/entries. The third line should be "dir", the fourth line should contain
|
$fullgitinfo =~ s/.{50}\K.*//s;
|
||||||
# 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]*)/) {
|
|
||||||
$svnversion = $1;
|
|
||||||
}
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$compiletime[4] += 1;
|
$compiletime[4] += 1;
|
||||||
$compiletime[5] += 1900;
|
$compiletime[5] += 1900;
|
||||||
my $ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @compiletime);
|
my $ctime = sprintf("%6\$04i-%5\$02i-%4\$02i %3\$02i:%2\$02i:%1\$02i", @compiletime);
|
||||||
$svnversion=~ s/(^\s+|\s+$)//g;
|
|
||||||
|
|
||||||
print <<EOF
|
print <<EOF
|
||||||
#include "proxmark3.h"
|
#include "proxmark3.h"
|
||||||
|
@ -64,7 +36,7 @@ const struct version_information __attribute__((section(".version_information"))
|
||||||
1,
|
1,
|
||||||
1,
|
1,
|
||||||
$clean,
|
$clean,
|
||||||
"svn $svnversion",
|
"$fullgitinfo",
|
||||||
"$ctime",
|
"$ctime",
|
||||||
};
|
};
|
||||||
EOF
|
EOF
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue