EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

make version generation more robust

Browse Source
This commit is contained in:
zimoch
2020-07-30 17:15:47 +02:00
parent 85e8632b02
commit 1cace82a70
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -89,7 +89,7 @@ CPPFLAGS += -DSTREAM_INTERNAL
# Update version string whenever something changed. # Update version string whenever something changed.
StreamVersion$(OBJ): $(COMMON_DIR)/StreamVersion.h $(filter-out StreamVersion$(OBJ),$(LIBOBJS) $(LIBRARY_OBJS)) ../CONFIG_STREAM StreamVersion$(OBJ): $(COMMON_DIR)/StreamVersion.h $(filter-out StreamVersion$(OBJ),$(LIBOBJS) $(LIBRARY_OBJS)) ../CONFIG_STREAM
$(COMMON_DIR)/StreamVersion.h: $(SRCS) $(filter-out StreamVersion.h, $(INC)) $(COMMON_DIR)/StreamVersion.h: ../../.VERSION $(SRCS) $(filter-out StreamVersion.h, $(INC))
@echo Creating $@ @echo Creating $@
$(PERL) ../makeStreamVersion.pl $@ $(PERL) ../makeStreamVersion.pl $@

10
src/StreamVersion.c
View File

@ -26,10 +26,16 @@
#define STR(x) STR2(x) #define STR(x) STR2(x)
const char StreamVersion [] = const char StreamVersion [] =
"StreamDevice" "StreamDevice"
#if STREAM_MAJOR+0 #ifdef STREAM_MAJOR
" " STR(STREAM_MAJOR) " " STR(STREAM_MAJOR)
"." STR(STREAM_MINOR) "." STR(STREAM_MINOR)
"." STR(STREAM_PATCHLEVEL) "." STR(STREAM_PATCHLEVEL)
STREAM_DEV STREAM_DEV
#endif #endif
" commit:" STREAM_COMMIT_HASH; #ifdef STREAM_COMMIT_DATE
" " STREAM_COMMIT_DATE
#endif
#ifdef STREAM_COMMIT_HASH
"\n commit: " STREAM_COMMIT_HASH
#endif
;

24
src/makeStreamVersion.pl
View File

@ -23,7 +23,7 @@
use strict; use strict;
my ( $major, $minor, $patch, $dev, $branch, $date, $hash ); my ( $major, $minor, $patch, $dev, $date, $hash );
if (my $version = `git describe --tags --abbrev=0 --dirty --match "[0-9]*" 2>/dev/null`) { if (my $version = `git describe --tags --abbrev=0 --dirty --match "[0-9]*" 2>/dev/null`) {
if ($version =~ m/(\d+)\.(\d+)\.(\d+)?(.*)?/) { if ($version =~ m/(\d+)\.(\d+)\.(\d+)?(.*)?/) {
@ -39,10 +39,10 @@ if (!$major) {
if ($line =~ m/COMMIT: *([[:xdigit:]]+)/) { if ($line =~ m/COMMIT: *([[:xdigit:]]+)/) {
$hash = $1; $hash = $1;
} }
if ($line =~ m/REFS: *tag: *((\d+)\.(\d+)\.(\d+)?,)? *(.*)/) { if ($line =~ m/REFS: .*tag: *(\d+)\.(\d+)\.?(\d+)?/) {
$major = $2; $minor = $3; $patch = $4; $branch = $5; $major = $1; $minor = $2; $patch = $3 or $patch = 0;
} }
if ($line =~ m/DATE: *(.+)/) { if ($line =~ m/DATE: *([-0-9:+ ]*)/) {
$date = $1; $date = $1;
} }
} }
@ -58,14 +58,20 @@ print $out <<EOF;
#ifndef StreamVersion_h #ifndef StreamVersion_h
#define StreamVersion_h #define StreamVersion_h
EOF
if ($major) {
print $out <<EOF;
#define STREAM_MAJOR $major #define STREAM_MAJOR $major
#define STREAM_MINOR $minor #define STREAM_MINOR $minor
#define STREAM_PATCHLEVEL $patch #define STREAM_PATCHLEVEL $patch
#define STREAM_DEV "$dev" #define STREAM_DEV "$dev"
#define STREAM_COMMIT_HASH "$hash"
#define STREAM_COMMIT_DATE "$date"
#endif /* StreamVersion_h */
EOF EOF
}
if ($hash) {
print $out "#define STREAM_COMMIT_HASH \"$hash\"\n";
}
if ($date) {
print $out "#define STREAM_COMMIT_DATE \"$date\"\n";
}
print $out "#endif /* StreamVersion_h */\n";
close $out close $out