epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge Pierrick's VersionHeaderDate branch into 7.0

Browse Source
This commit is contained in:
Andrew Johnson
2022-08-23 11:54:07 -05:00
parent 5cef60a3e4 5997018fb0
commit 1fa98d489f
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/database/src/ioc/misc/epicsRelease.c
View File

@@ -23,6 +23,7 @@ DBCORE_API int coreRelease(void)
printf ( "############################################################################\n" );
printf ( "## %s\n", epicsReleaseVersion );
printf ( "## %s\n", "Rev. " EPICS_VCS_VERSION );
printf ( "## %s\n", "Rev. Date " EPICS_VCS_VERSION_DATE );
printf ( "############################################################################\n" );
return 0;
}

16
src/tools/genVersionHeader.pl
View File

@@ -29,7 +29,10 @@ our $opt_t = '.';
our $opt_N = 'VCSVERSION';
our $opt_V = $now;
our $RevDate = $now;
my $vcs;
my $cv;
getopts('dhivqt:N:V:') && @ARGV == 1
or HELP_MESSAGE();
@@ -53,6 +56,7 @@ if (!$vcs && -d "$opt_t/_darcs") { # Darcs
my $hasmod = `darcs whatsnew --repodir="$opt_t" -l`;
$opt_V .= '-dirty' unless $?;
}
$cv = ""; # ToDo
}
if (!$vcs && -d "$opt_t/.hg") { # Mercurial
print "== Found <top>/.hg directory\n" if $opt_v;
@@ -69,6 +73,7 @@ if (!$vcs && -d "$opt_t/.hg") { # Mercurial
chomp $hasmod;
$opt_V .= '-dirty' if $hasmod ne '';
}
$cv = `hg log -l1 --template '{date|isodate}'` # this is untested
}
if (!$vcs && -d "$opt_t/.git") { # Git
print "== Found <top>/.git directory\n" if $opt_v;
@@ -82,6 +87,7 @@ if (!$vcs && -d "$opt_t/.git") { # Git
$opt_V = $result;
$vcs = 'Git';
}
$cv = `git show -s --format=%ci HEAD`;
}
if (!$vcs && -d "$opt_t/.svn") { # Subversion
print "== Found <top>/.svn directory\n" if $opt_v;
@@ -97,6 +103,7 @@ if (!$vcs && -d "$opt_t/.svn") { # Subversion
chomp $hasmod;
$opt_V .= '-dirty' if $hasmod ne '';
}
$cv = `svn info --show-item last-changed-date`; # this is untested
}
if (!$vcs && -d "$opt_t/.bzr") { # Bazaar
print "== Found <top>/.bzr directory\n" if $opt_v;
@@ -108,6 +115,7 @@ if (!$vcs && -d "$opt_t/.bzr") { # Bazaar
$opt_V = $result;
$vcs = 'Bazaar';
}
$cv = `bzr version-info -q --custom --template='{date}'`;
}
if (!$vcs) {
print "== No VCS directories\n" if $opt_v;
@@ -120,6 +128,9 @@ if (!$vcs) {
}
}
chomp $cv;
$RevDate=$vcs . ': ' . $cv;
my $output = << "__END";
/* Generated file, do not edit! */
@@ -128,12 +139,16 @@ my $output = << "__END";
#ifndef $opt_N
#define $opt_N \"$opt_V\"
#endif
#ifndef ${opt_N}_DATE
#define ${opt_N}_DATE \"$RevDate\"
#endif
__END
print "== Want:\n$output==\n" if $opt_v;
my $DST;
if (open($DST, '+<', $outfile)) {
my $actual = join('', <$DST>);
print "== Current:\n$actual==\n" if $opt_v;
@@ -190,4 +205,3 @@ Usage:
EOF
exit $opt_h ? 0 : 1;
}