Skip to content

Commit f3cb4d0

Browse files
gquintardgquintard
committed
cleaner VARNISHD_ABI
1 parent 159a884 commit f3cb4d0

10 files changed

Lines changed: 21 additions & 60 deletions

File tree

‎varnish-modules/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
#!/usr/bin/make -f
22
DEB_BUILD_OPTIONS=noddebs
33

4-
num=\#
5-
VARNISHD_ABI = $(shell \
6-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
7-
cpp - -Iinclude | \
8-
tail -1 | \
9-
tr -d '"')
4+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
105

6+
num=\#
117
VARNISHD_VRT = $(shell \
128
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
139
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-cfg/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ DEB_BUILD_OPTIONS=noddebs
44
%:
55
dh $@
66

7-
num=\#
8-
VARNISHD_ABI = $(shell \
9-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
10-
cpp - -Iinclude | \
11-
tail -1 | \
12-
tr -d '"')
7+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
138

9+
num=\#
1410
VARNISHD_VRT = $(shell \
1511
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
1612
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-digest/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ DEB_BUILD_OPTIONS=noddebs
44
%:
55
dh $@
66

7-
num=\#
8-
VARNISHD_ABI = $(shell \
9-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
10-
cpp - -Iinclude | \
11-
tail -1 | \
12-
tr -d '"')
7+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
138

9+
num=\#
1410
VARNISHD_VRT = $(shell \
1511
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
1612
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-fileserver/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,9 @@ override_dh_auto_test:
1919
%:
2020
dh $@
2121

22-
num=\#
23-
VARNISHD_ABI = $(shell \
24-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
25-
cpp - -Iinclude | \
26-
tail -1 | \
27-
tr -d '"')
22+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
2823

24+
num=\#
2925
VARNISHD_VRT = $(shell \
3026
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
3127
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-geoip2/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ DEB_BUILD_OPTIONS=noddebs
44
%:
55
dh $@
66

7-
num=\#
8-
VARNISHD_ABI = $(shell \
9-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
10-
cpp - -Iinclude | \
11-
tail -1 | \
12-
tr -d '"')
7+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
138

9+
num=\#
1410
VARNISHD_VRT = $(shell \
1511
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
1612
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-jq/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ DEB_BUILD_OPTIONS=noddebs
44
%:
55
dh $@
66

7-
num=\#
8-
VARNISHD_ABI = $(shell \
9-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
10-
cpp - -Iinclude | \
11-
tail -1 | \
12-
tr -d '"')
7+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
138

9+
num=\#
1410
VARNISHD_VRT = $(shell \
1511
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
1612
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-querystring/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ DEB_BUILD_OPTIONS=noddebs
44
%:
55
dh $@
66

7-
num=\#
8-
VARNISHD_ABI = $(shell \
9-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
10-
cpp - -Iinclude | \
11-
tail -1 | \
12-
tr -d '"')
7+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
138

9+
num=\#
1410
VARNISHD_VRT = $(shell \
1511
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
1612
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-reqwest/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,9 @@ override_dh_auto_test:
2020
%:
2121
dh $@
2222

23-
num=\#
24-
VARNISHD_ABI = $(shell \
25-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
26-
cpp - -Iinclude | \
27-
tail -1 | \
28-
tr -d '"')
23+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
2924

25+
num=\#
3026
VARNISHD_VRT = $(shell \
3127
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
3228
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-rers/debian/rules‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ override_dh_auto_test:
1818
%:
1919
dh $@
2020

21-
num=\#
22-
VARNISHD_ABI = $(shell \
23-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
24-
cpp - -Iinclude | \
25-
tail -1 | \
26-
tr -d '"')
2721

22+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
23+
24+
num=\#
2825
VARNISHD_VRT = $(shell \
2926
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
3027
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

‎vmod-uuid/debian/rules‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ DEB_BUILD_OPTIONS=noddebs
44
%:
55
dh $@
66

7-
num=\#
8-
VARNISHD_ABI = $(shell \
9-
printf '$(num)include "vcs_version.h"\nVCS_Version\n' | \
10-
cpp - -Iinclude | \
11-
tail -1 | \
12-
tr -d '"')
7+
VARNISHD_ABI = $(shell varnishd -V 2>&1| awk -F ' |\)' '$0 ~ "revision" {print $4}')
138

9+
num=\#
1410
VARNISHD_VRT = $(shell \
1511
printf '$(num)include "vdef.h"\n$(num)include "vrt.h"\n%s.%s\n' \
1612
VRT_MAJOR_VERSION VRT_MINOR_VERSION | \

0 commit comments

Comments
 (0)