RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated nameing (svn -> git) & fixed whitespaces.

Browse source
This commit is contained in:
ikarus 2014-04-02 21:46:25 +02:00
parent 23ca86b833
commit 9c6837165b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
armsrc/util.c
View file

@ -239,7 +239,7 @@ void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers
return;
}
strncat(dst, v->svnversion, len);
strncat(dst, v->gitversion, len);
if(v->clean == 0) {
strncat(dst, "-unclean", len);
} else if(v->clean == 2) {

2
include/proxmark3.h
View file

@ -89,7 +89,7 @@ struct version_information {
char versionversion; /* Must be 1 */
char present; /* 1 if the version information could be created at compile time, otherwise 0 and the remaining fields (except for magic) are empty */
char clean; /* 1: Tree was clean, no local changes. 0: Tree was unclean. 2: Couldn't be determined */
char svnversion[50]; /* String with the SVN revision */
char gitversion[50]; /* String with the git revision */
char buildtime[30]; /* string with the build time */
} __attribute__((packed));

6
tools/mkversion.pl
View file

@ -7,7 +7,7 @@
# --- Martin Holst Swende <martin@swende.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";
@ -16,9 +16,9 @@ my $gitbranch = `git rev-parse --abbrev-ref HEAD`;
my $clean = 2;
my @compiletime = gmtime();
my $fullgitinfo= $gitbranch . '/'.$gitversion;
my $fullgitinfo = $gitbranch . '/' . $gitversion;
$fullgitinfo=~ s/(\s)//g;
$fullgitinfo =~ s/(\s)//g;
# Crop so it fits within 50 characters
$fullgitinfo =~ s/.{50}\K.*//s;