- gerrit-log - lists.osmocom.org

[M] Change in osmo-iuh[master]: Generate version.h files

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/40515?usp=email ) Change subject: Generate version.h files ...................................................................... Generate version.h files Related: OS#6626 Change-Id: I7cba0d32f024797e1360ed250a2e4f2d8ca501ee --- M .gitignore M include/osmocom/hnbap/Makefile.am A include/osmocom/hnbap/version.h.tpl M include/osmocom/ranap/Makefile.am A include/osmocom/ranap/version.h.tpl M include/osmocom/rua/Makefile.am A include/osmocom/rua/version.h.tpl M include/osmocom/sabp/Makefile.am A include/osmocom/sabp/version.h.tpl 9 files changed, 123 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/15/40515/1 diff --git a/.gitignore b/.gitignore index 209421b..48dd415 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ doc/manuals/*.pdf contrib/osmo-iuh.spec +include/osmocom/*/version.h diff --git a/include/osmocom/hnbap/Makefile.am b/include/osmocom/hnbap/Makefile.am index 6db9966..7c3469d 100644 --- a/include/osmocom/hnbap/Makefile.am +++ b/include/osmocom/hnbap/Makefile.am @@ -1,3 +1,12 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + hnbap_HEADERS = \ hnbap_common.h hnbap_ies_defs.h \ HNBAP_AccessResult.h \ @@ -115,9 +124,13 @@ HNBAP_U-RNTI.h \ HNBAP_U-RNTIQueryRequest.h \ HNBAP_U-RNTIQueryResponse.h \ - HNBAP_UTRANCellID.h + HNBAP_UTRANCellID.h \ + version.h \ + $(NULL) hnbapdir = $(includedir)/osmocom/hnbap DISTCLEANFILES = \ - hnbap_ies_defs.h + hnbap_ies_defs.h \ + version.h \ + $(NULL) diff --git a/include/osmocom/hnbap/version.h.tpl b/include/osmocom/hnbap/version.h.tpl new file mode 100644 index 0000000..4ad1c79 --- /dev/null +++ b/include/osmocom/hnbap/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_HNBAP_VERSION {{VERSION}} +#define LIBOSMO_HNBAP_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_HNBAP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_HNBAP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_HNBAP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_HNBAP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_HNBAP_VERSION_MAJOR > (major) || \ + (LIBOSMO_HNBAP_VERSION_MAJOR == (major) && \ + LIBOSMO_HNBAP_VERSION_MINOR > (minor)) || \ + (LIBOSMO_HNBAP_VERSION_MAJOR == (major) && \ + LIBOSMO_HNBAP_VERSION_MINOR == (minor) && \ + LIBOSMO_HNBAP_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/ranap/Makefile.am b/include/osmocom/ranap/Makefile.am index 71e2feb..deb2281 100644 --- a/include/osmocom/ranap/Makefile.am +++ b/include/osmocom/ranap/Makefile.am @@ -6,6 +6,15 @@ ranap_ies_defs.h: $(MAKE) -C $(top_builddir)/src/ gen_ranap.stamp +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + ranap_HEADERS = \ ranap_ies_defs.h \ ranap_common.h \ @@ -605,9 +614,13 @@ RANAP_VerticalAccuracyCode.h \ RANAP_VerticalSpeedDirection.h \ RANAP_VerticalVelocity.h \ - RANAP_VoiceSupportMatchIndicator.h + RANAP_VoiceSupportMatchIndicator.h \ + version.h \ + $(NULL) ranapdir = $(includedir)/osmocom/ranap DISTCLEANFILES = \ - ranap_ies_defs.h + ranap_ies_defs.h \ + version.h \ + $(NULL) diff --git a/include/osmocom/ranap/version.h.tpl b/include/osmocom/ranap/version.h.tpl new file mode 100644 index 0000000..1a2f117 --- /dev/null +++ b/include/osmocom/ranap/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_RANAP_VERSION {{VERSION}} +#define LIBOSMO_RANAP_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_RANAP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_RANAP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_RANAP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_RANAP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_RANAP_VERSION_MAJOR > (major) || \ + (LIBOSMO_RANAP_VERSION_MAJOR == (major) && \ + LIBOSMO_RANAP_VERSION_MINOR > (minor)) || \ + (LIBOSMO_RANAP_VERSION_MAJOR == (major) && \ + LIBOSMO_RANAP_VERSION_MINOR == (minor) && \ + LIBOSMO_RANAP_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/rua/Makefile.am b/include/osmocom/rua/Makefile.am index e85f1e6..b915eed 100644 --- a/include/osmocom/rua/Makefile.am +++ b/include/osmocom/rua/Makefile.am @@ -1,3 +1,12 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + rua_HEADERS = \ rua_common.h rua_ies_defs.h rua_msg_factory.h \ RUA_Ansi-41-IDNNS.h \ @@ -35,9 +44,13 @@ RUA_SuccessfulOutcome.h \ RUA_TriggeringMessage.h \ RUA_TypeOfError.h \ - RUA_UnsuccessfulOutcome.h + RUA_UnsuccessfulOutcome.h \ + version.h \ + $(NULL) ruadir = $(includedir)/osmocom/rua DISTCLEANFILES = \ - rua_ies_defs.h + rua_ies_defs.h \ + version.h \ + $(NULL) diff --git a/include/osmocom/rua/version.h.tpl b/include/osmocom/rua/version.h.tpl new file mode 100644 index 0000000..60fe1cd --- /dev/null +++ b/include/osmocom/rua/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_RUA_VERSION {{VERSION}} +#define LIBOSMO_RUA_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_RUA_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_RUA_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_RUA_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_RUA_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_RUA_VERSION_MAJOR > (major) || \ + (LIBOSMO_RUA_VERSION_MAJOR == (major) && \ + LIBOSMO_RUA_VERSION_MINOR > (minor)) || \ + (LIBOSMO_RUA_VERSION_MAJOR == (major) && \ + LIBOSMO_RUA_VERSION_MINOR == (minor) && \ + LIBOSMO_RUA_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/sabp/Makefile.am b/include/osmocom/sabp/Makefile.am index 848bb39..1de4c1f 100644 --- a/include/osmocom/sabp/Makefile.am +++ b/include/osmocom/sabp/Makefile.am @@ -6,6 +6,15 @@ sabp_ies_defs.h: $(MAKE) -C $(top_builddir)/src/ gen_sabp.stamp +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + sabp_HEADERS = \ sabp_ies_defs.h \ sabp_common.h \ @@ -72,9 +81,12 @@ SABP_Failure.h \ SABP_Error-Indication.h \ SABP_IE.h \ + version.h \ $(NULL) sabpdir = $(includedir)/osmocom/sabp DISTCLEANFILES = \ - sabp_ies_defs.h + sabp_ies_defs.h \ + version.h \ + $(NULL) diff --git a/include/osmocom/sabp/version.h.tpl b/include/osmocom/sabp/version.h.tpl new file mode 100644 index 0000000..d7487ec --- /dev/null +++ b/include/osmocom/sabp/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_SABP_VERSION {{VERSION}} +#define LIBOSMO_SABP_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_SABP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_SABP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_SABP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_SABP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_SABP_VERSION_MAJOR > (major) || \ + (LIBOSMO_SABP_VERSION_MAJOR == (major) && \ + LIBOSMO_SABP_VERSION_MINOR > (minor)) || \ + (LIBOSMO_SABP_VERSION_MAJOR == (major) && \ + LIBOSMO_SABP_VERSION_MINOR == (minor) && \ + LIBOSMO_SABP_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/40515?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7cba0d32f024797e1360ed250a2e4f2d8ca501ee Gerrit-Change-Number: 40515 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 23 minutes

1
0
0 0

[S] Change in osmo-mgw[master]: Generate a version.h file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/40514?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: I8460e85d50149f4bc58b6048e5596c5768010829 --- M .gitignore M include/osmocom/mgcp_client/Makefile.am A include/osmocom/mgcp_client/version.h.tpl 3 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/14/40514/1 diff --git a/.gitignore b/.gitignore index 3f1a890..71cd588 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ bscconfig.h bscconfig.h.in include/osmocom/mgcp_client/mgcp_common.h +include/osmocom/mgcp_client/version.h src/osmo-mgw/osmo-mgw *.*~ *.sw? diff --git a/include/osmocom/mgcp_client/Makefile.am b/include/osmocom/mgcp_client/Makefile.am index 90b1bd7..ee6ff9f 100644 --- a/include/osmocom/mgcp_client/Makefile.am +++ b/include/osmocom/mgcp_client/Makefile.am @@ -1,5 +1,6 @@ BUILT_SOURCES = \ mgcp_common.h \ + version.h \ $(NULL) noinst_HEADERS = \ @@ -11,4 +12,13 @@ echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of <osmocom/mgcp/mgcp_common.h>\n\n */" > mgcp_common.h cat $(top_srcdir)/include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + CLEANFILES = mgcp_common.h diff --git a/include/osmocom/mgcp_client/version.h.tpl b/include/osmocom/mgcp_client/version.h.tpl new file mode 100644 index 0000000..db873af --- /dev/null +++ b/include/osmocom/mgcp_client/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_MGCP_CLIENT_VERSION {{VERSION}} +#define LIBOSMO_MGCP_CLIENT_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_MGCP_CLIENT_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_MGCP_CLIENT_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_MGCP_CLIENT_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_MGCP_CLIENT_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_MGCP_CLIENT_VERSION_MAJOR > (major) || \ + (LIBOSMO_MGCP_CLIENT_VERSION_MAJOR == (major) && \ + LIBOSMO_MGCP_CLIENT_VERSION_MINOR > (minor)) || \ + (LIBOSMO_MGCP_CLIENT_VERSION_MAJOR == (major) && \ + LIBOSMO_MGCP_CLIENT_VERSION_MINOR == (minor) && \ + LIBOSMO_MGCP_CLIENT_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/40514?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8460e85d50149f4bc58b6048e5596c5768010829 Gerrit-Change-Number: 40514 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 23 minutes

1
0
0 0

[S] Change in osmo-hlr[master]: Generate version.h files

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/40513?usp=email ) Change subject: Generate version.h files ...................................................................... Generate version.h files Related: OS#6626 Change-Id: I716821b2426c28fc2500fa8cdf44b7b8cb339d65 --- M .gitignore M include/Makefile.am A include/osmocom/gsupclient/version.h.tpl A include/osmocom/mslookup/version.h.tpl 4 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/13/40513/1 diff --git a/.gitignore b/.gitignore index 6c8e9b9..725d280 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,5 @@ /debian/osmo-mslookup-utils/ /debian/*.log /debian/*.substvars + +include/osmocom/*/version.h diff --git a/include/Makefile.am b/include/Makefile.am index f3baca6..8a5e8ed 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,14 +1,25 @@ SUBDIRS = osmocom +osmocom/%/version.h: osmocom/%/version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + nobase_include_HEADERS = \ osmocom/gsupclient/cni_peer_id.h \ osmocom/gsupclient/gsup_client.h \ osmocom/gsupclient/gsup_client_mux.h \ osmocom/gsupclient/gsup_req.h \ + osmocom/gsupclient/version.h \ osmocom/mslookup/mdns.h \ osmocom/mslookup/mdns_sock.h \ osmocom/mslookup/mslookup_client_fake.h \ osmocom/mslookup/mslookup_client.h \ osmocom/mslookup/mslookup_client_mdns.h \ osmocom/mslookup/mslookup.h \ + osmocom/mslookup/version.h \ $(NULL) diff --git a/include/osmocom/gsupclient/version.h.tpl b/include/osmocom/gsupclient/version.h.tpl new file mode 100644 index 0000000..eb8805c --- /dev/null +++ b/include/osmocom/gsupclient/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_GSUP_CLIENT_VERSION {{VERSION}} +#define LIBOSMO_GSUP_CLIENT_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_GSUP_CLIENT_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_GSUP_CLIENT_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_GSUP_CLIENT_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_GSUP_CLIENT_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_GSUP_CLIENT_VERSION_MAJOR > (major) || \ + (LIBOSMO_GSUP_CLIENT_VERSION_MAJOR == (major) && \ + LIBOSMO_GSUP_CLIENT_VERSION_MINOR > (minor)) || \ + (LIBOSMO_GSUP_CLIENT_VERSION_MAJOR == (major) && \ + LIBOSMO_GSUP_CLIENT_VERSION_MINOR == (minor) && \ + LIBOSMO_GSUP_CLIENT_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/mslookup/version.h.tpl b/include/osmocom/mslookup/version.h.tpl new file mode 100644 index 0000000..c6daf87 --- /dev/null +++ b/include/osmocom/mslookup/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_MSLOOKUP_VERSION {{VERSION}} +#define LIBOSMO_MSLOOKUP_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_MSLOOKUP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_MSLOOKUP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_MSLOOKUP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_MSLOOKUP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_MSLOOKUP_VERSION_MAJOR > (major) || \ + (LIBOSMO_MSLOOKUP_VERSION_MAJOR == (major) && \ + LIBOSMO_MSLOOKUP_VERSION_MINOR > (minor)) || \ + (LIBOSMO_MSLOOKUP_VERSION_MAJOR == (major) && \ + LIBOSMO_MSLOOKUP_VERSION_MINOR == (minor) && \ + LIBOSMO_MSLOOKUP_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/40513?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I716821b2426c28fc2500fa8cdf44b7b8cb339d65 Gerrit-Change-Number: 40513 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 23 minutes

1
0
0 0

[S] Change in libusrp[master]: Generate a version.h file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/40512?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: Ibb9a4fb34beabaca322031e9bde3646385591f3a --- M .gitignore M host/include/usrp/Makefile.am A host/include/usrp/version.h.tpl 3 files changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/12/40512/1 diff --git a/.gitignore b/.gitignore index 576da6d..f83ba42 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ contrib/libusrp.spec /.version +/host/include/usrp/version.h diff --git a/host/include/usrp/Makefile.am b/host/include/usrp/Makefile.am index 1950431..d0e0fe6 100644 --- a/host/include/usrp/Makefile.am +++ b/host/include/usrp/Makefile.am @@ -23,6 +23,15 @@ usrpincludedir = $(includedir)/usrp +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + usrpinclude_HEADERS = \ db_base.h \ db_basic.h \ @@ -45,7 +54,9 @@ usrp_slots.h \ usrp_standard.h \ usrp_subdev_spec.h \ - usrp_tune_result.h + usrp_tune_result.h \ + version.h \ + $(NULL) EXTRA_DIST += \ libusb_types.h.in diff --git a/host/include/usrp/version.h.tpl b/host/include/usrp/version.h.tpl new file mode 100644 index 0000000..7bed445 --- /dev/null +++ b/host/include/usrp/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBUSRP_VERSION {{VERSION}} +#define LIBUSRP_VERSION_STR "{{VERSION}}" + +#define LIBUSRP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBUSRP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBUSRP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBUSRP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBUSRP_VERSION_MAJOR > (major) || \ + (LIBUSRP_VERSION_MAJOR == (major) && \ + LIBUSRP_VERSION_MINOR > (minor)) || \ + (LIBUSRP_VERSION_MAJOR == (major) && \ + LIBUSRP_VERSION_MINOR == (minor) && \ + LIBUSRP_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/40512?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ibb9a4fb34beabaca322031e9bde3646385591f3a Gerrit-Change-Number: 40512 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 23 minutes

1
0
0 0

[S] Change in libgtpnl[master]: Generate a version.h file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/40511?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: I7761491ae767f1f21b2a3bba62d9ecb8a7d1226b --- M .gitignore M include/libgtpnl/Makefile.am A include/libgtpnl/version.h.tpl 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/11/40511/1 diff --git a/.gitignore b/.gitignore index 56eefa6..c5757f4 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ tools/gtp-tunnel tests/qemu/_* + +include/libgtpnl/version.h diff --git a/include/libgtpnl/Makefile.am b/include/libgtpnl/Makefile.am index 90b0a2e..f17f9d1 100644 --- a/include/libgtpnl/Makefile.am +++ b/include/libgtpnl/Makefile.am @@ -1,4 +1,14 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + pkginclude_HEADERS = \ gtp.h \ gtpnl.h \ + version.h \ $(NULL) diff --git a/include/libgtpnl/version.h.tpl b/include/libgtpnl/version.h.tpl new file mode 100644 index 0000000..0a5a209 --- /dev/null +++ b/include/libgtpnl/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBGTPNL_VERSION {{VERSION}} +#define LIBGTPNL_VERSION_STR "{{VERSION}}" + +#define LIBGTPNL_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBGTPNL_VERSION_MINOR {{VERSION_MINOR}} +#define LIBGTPNL_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBGTPNL_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBGTPNL_VERSION_MAJOR > (major) || \ + (LIBGTPNL_VERSION_MAJOR == (major) && \ + LIBGTPNL_VERSION_MINOR > (minor)) || \ + (LIBGTPNL_VERSION_MAJOR == (major) && \ + LIBGTPNL_VERSION_MINOR == (minor) && \ + LIBGTPNL_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/40511?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I7761491ae767f1f21b2a3bba62d9ecb8a7d1226b Gerrit-Change-Number: 40511 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 23 minutes

1
0
0 0

[XS] Change in libgtpnl[master]: include/libgtpnl/Makefile: format pkginclude_HEADERS

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/40510?usp=email ) Change subject: include/libgtpnl/Makefile: format pkginclude_HEADERS ...................................................................... include/libgtpnl/Makefile: format pkginclude_HEADERS Make it diff-friendly by having one file per line. Change-Id: Ib4add6a8d079002ad03a7446c4466c3dd652eaea --- M include/libgtpnl/Makefile.am 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/10/40510/1 diff --git a/include/libgtpnl/Makefile.am b/include/libgtpnl/Makefile.am index b12e9a3..90b0a2e 100644 --- a/include/libgtpnl/Makefile.am +++ b/include/libgtpnl/Makefile.am @@ -1 +1,4 @@ -pkginclude_HEADERS = gtp.h gtpnl.h +pkginclude_HEADERS = \ + gtp.h \ + gtpnl.h \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/40510?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ib4add6a8d079002ad03a7446c4466c3dd652eaea Gerrit-Change-Number: 40510 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 23 minutes

1
0
0 0

[S] Change in libsmpp34[master]: Generate a version.h file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/40509?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Give the file a smpp34_ prefix as it ends up in /usr/include. Related: OS#6626 Change-Id: I03ba56c80d83fda5824da247a942e2e33f48580e --- M src/Makefile.am A src/smpp34_version.h.tpl 2 files changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/09/40509/1 diff --git a/src/Makefile.am b/src/Makefile.am index e594dd9..7feb2a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,11 +18,21 @@ $(LIBRARY_SOURCE_DIR)/smpp34_params.c \ $(LIBRARY_SOURCE_DIR)/smpp34_params.h +smpp34_version.h: $(LIBRARY_SOURCE_DIR)/smpp34_version.h.tpl + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + include_HEADERS = \ $(LIBRARY_SOURCE_DIR)/smpp34.h \ $(LIBRARY_SOURCE_DIR)/smpp34_heap.h \ $(LIBRARY_SOURCE_DIR)/smpp34_structs.h \ - $(LIBRARY_SOURCE_DIR)/smpp34_params.h + $(LIBRARY_SOURCE_DIR)/smpp34_params.h \ + smpp34_version.h \ + $(NULL) libsmpp34_la_CFLAGS = @CFLAGS@ -Wall libsmpp34_la_CFLAGS += -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS diff --git a/src/smpp34_version.h.tpl b/src/smpp34_version.h.tpl new file mode 100644 index 0000000..e9bc8cd --- /dev/null +++ b/src/smpp34_version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBSMPP34_VERSION {{VERSION}} +#define LIBSMPP34_VERSION_STR "{{VERSION}}" + +#define LIBSMPP34_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBSMPP34_VERSION_MINOR {{VERSION_MINOR}} +#define LIBSMPP34_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBSMPP34_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBSMPP34_VERSION_MAJOR > (major) || \ + (LIBSMPP34_VERSION_MAJOR == (major) && \ + LIBSMPP34_VERSION_MINOR > (minor)) || \ + (LIBSMPP34_VERSION_MAJOR == (major) && \ + LIBSMPP34_VERSION_MINOR == (minor) && \ + LIBSMPP34_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/40509?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: I03ba56c80d83fda5824da247a942e2e33f48580e Gerrit-Change-Number: 40509 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 23 minutes

1
0
0 0

[M] Change in libosmo-gprs[master]: Generate version.h files

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/40508?usp=email ) Change subject: Generate version.h files ...................................................................... Generate version.h files Related: OS#6626 Change-Id: Icf0319d4b7c27f80a696cb951aa40e2add64749b --- M .gitignore M include/osmocom/csn1/Makefile.am A include/osmocom/csn1/version.h.tpl M include/osmocom/gprs/gmm/Makefile.am A include/osmocom/gprs/gmm/version.h.tpl M include/osmocom/gprs/llc/Makefile.am A include/osmocom/gprs/llc/version.h.tpl M include/osmocom/gprs/rlcmac/Makefile.am A include/osmocom/gprs/rlcmac/version.h.tpl M include/osmocom/gprs/sm/Makefile.am A include/osmocom/gprs/sm/version.h.tpl M include/osmocom/gprs/sndcp/Makefile.am A include/osmocom/gprs/sndcp/version.h.tpl 13 files changed, 155 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/08/40508/1 diff --git a/.gitignore b/.gitignore index 020b541..93b84ab 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /deps contrib/libosmo-gprs.spec +include/osmocom/**/version.h diff --git a/include/osmocom/csn1/Makefile.am b/include/osmocom/csn1/Makefile.am index d16b724..1b981b1 100644 --- a/include/osmocom/csn1/Makefile.am +++ b/include/osmocom/csn1/Makefile.am @@ -1,6 +1,17 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + + csn1_HEADERS = \ wireshark_compat.h \ csn1.h \ + version.h \ $(NULL) csn1dir = $(includedir)/osmocom/csn1 diff --git a/include/osmocom/csn1/version.h.tpl b/include/osmocom/csn1/version.h.tpl new file mode 100644 index 0000000..2f90851 --- /dev/null +++ b/include/osmocom/csn1/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_CSN1_VERSION {{VERSION}} +#define LIBOSMO_CSN1_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_CSN1_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_CSN1_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_CSN1_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_CSN1_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_CSN1_VERSION_MAJOR > (major) || \ + (LIBOSMO_CSN1_VERSION_MAJOR == (major) && \ + LIBOSMO_CSN1_VERSION_MINOR > (minor)) || \ + (LIBOSMO_CSN1_VERSION_MAJOR == (major) && \ + LIBOSMO_CSN1_VERSION_MINOR == (minor) && \ + LIBOSMO_CSN1_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/gprs/gmm/Makefile.am b/include/osmocom/gprs/gmm/Makefile.am index 2adfed1..efa45c3 100644 --- a/include/osmocom/gprs/gmm/Makefile.am +++ b/include/osmocom/gprs/gmm/Makefile.am @@ -1,3 +1,11 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ noinst_HEADERS = \ gmm_ms_fsm.h \ @@ -8,6 +16,7 @@ gmm_HEADERS = \ gmm.h \ gmm_prim.h \ + version.h \ $(NULL) gmmdir = $(includedir)/osmocom/gprs/gmm diff --git a/include/osmocom/gprs/gmm/version.h.tpl b/include/osmocom/gprs/gmm/version.h.tpl new file mode 100644 index 0000000..f6135ff --- /dev/null +++ b/include/osmocom/gprs/gmm/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_GPRS_GMM_VERSION {{VERSION}} +#define LIBOSMO_GPRS_GMM_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_GPRS_GMM_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_GPRS_GMM_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_GPRS_GMM_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_GPRS_GMM_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_GPRS_GMM_VERSION_MAJOR > (major) || \ + (LIBOSMO_GPRS_GMM_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_GMM_VERSION_MINOR > (minor)) || \ + (LIBOSMO_GPRS_GMM_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_GMM_VERSION_MINOR == (minor) && \ + LIBOSMO_GPRS_GMM_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/gprs/llc/Makefile.am b/include/osmocom/gprs/llc/Makefile.am index df56a08..97e1aa2 100644 --- a/include/osmocom/gprs/llc/Makefile.am +++ b/include/osmocom/gprs/llc/Makefile.am @@ -1,3 +1,12 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + noinst_HEADERS = \ llc_private.h \ $(NULL) @@ -5,6 +14,7 @@ llc_HEADERS = \ llc.h \ llc_prim.h \ + version.h \ $(NULL) llcdir = $(includedir)/osmocom/gprs/llc diff --git a/include/osmocom/gprs/llc/version.h.tpl b/include/osmocom/gprs/llc/version.h.tpl new file mode 100644 index 0000000..dcae17d --- /dev/null +++ b/include/osmocom/gprs/llc/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_GPRS_LLC_VERSION {{VERSION}} +#define LIBOSMO_GPRS_LLC_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_GPRS_LLC_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_GPRS_LLC_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_GPRS_LLC_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_GPRS_LLC_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_GPRS_LLC_VERSION_MAJOR > (major) || \ + (LIBOSMO_GPRS_LLC_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_LLC_VERSION_MINOR > (minor)) || \ + (LIBOSMO_GPRS_LLC_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_LLC_VERSION_MINOR == (minor) && \ + LIBOSMO_GPRS_LLC_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/gprs/rlcmac/Makefile.am b/include/osmocom/gprs/rlcmac/Makefile.am index a117a34..ecc5024 100644 --- a/include/osmocom/gprs/rlcmac/Makefile.am +++ b/include/osmocom/gprs/rlcmac/Makefile.am @@ -1,3 +1,12 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + noinst_HEADERS = \ codel.h \ coding_scheme.h \ @@ -27,6 +36,7 @@ rlcmac.h \ rlcmac_prim.h \ types.h \ + version.h \ $(NULL) rlcmacdir = $(includedir)/osmocom/gprs/rlcmac diff --git a/include/osmocom/gprs/rlcmac/version.h.tpl b/include/osmocom/gprs/rlcmac/version.h.tpl new file mode 100644 index 0000000..16776bd --- /dev/null +++ b/include/osmocom/gprs/rlcmac/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_GPRS_RLCMAC_VERSION {{VERSION}} +#define LIBOSMO_GPRS_RLCMAC_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_GPRS_RLCMAC_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_GPRS_RLCMAC_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_GPRS_RLCMAC_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_GPRS_RLCMAC_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_GPRS_RLCMAC_VERSION_MAJOR > (major) || \ + (LIBOSMO_GPRS_RLCMAC_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_RLCMAC_VERSION_MINOR > (minor)) || \ + (LIBOSMO_GPRS_RLCMAC_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_RLCMAC_VERSION_MINOR == (minor) && \ + LIBOSMO_GPRS_RLCMAC_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/gprs/sm/Makefile.am b/include/osmocom/gprs/sm/Makefile.am index f6bede4..5e08915 100644 --- a/include/osmocom/gprs/sm/Makefile.am +++ b/include/osmocom/gprs/sm/Makefile.am @@ -1,3 +1,11 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ noinst_HEADERS = \ sm_ms_fsm.h \ @@ -9,6 +17,7 @@ sm.h \ sm_prim.h \ sm_qos.h \ + version.h \ $(NULL) smdir = $(includedir)/osmocom/gprs/sm diff --git a/include/osmocom/gprs/sm/version.h.tpl b/include/osmocom/gprs/sm/version.h.tpl new file mode 100644 index 0000000..ea4ad50 --- /dev/null +++ b/include/osmocom/gprs/sm/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_GPRS_SM_VERSION {{VERSION}} +#define LIBOSMO_GPRS_SM_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_GPRS_SM_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_GPRS_SM_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_GPRS_SM_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_GPRS_SM_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_GPRS_SM_VERSION_MAJOR > (major) || \ + (LIBOSMO_GPRS_SM_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_SM_VERSION_MINOR > (minor)) || \ + (LIBOSMO_GPRS_SM_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_SM_VERSION_MINOR == (minor) && \ + LIBOSMO_GPRS_SM_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/gprs/sndcp/Makefile.am b/include/osmocom/gprs/sndcp/Makefile.am index 0546475..6b5ef99 100644 --- a/include/osmocom/gprs/sndcp/Makefile.am +++ b/include/osmocom/gprs/sndcp/Makefile.am @@ -1,3 +1,11 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ noinst_HEADERS = \ comp.h \ @@ -13,6 +21,7 @@ sndcp_HEADERS = \ sndcp.h \ sndcp_prim.h \ + version.h \ $(NULL) sndcpdir = $(includedir)/osmocom/gprs/sndcp diff --git a/include/osmocom/gprs/sndcp/version.h.tpl b/include/osmocom/gprs/sndcp/version.h.tpl new file mode 100644 index 0000000..16b2ca5 --- /dev/null +++ b/include/osmocom/gprs/sndcp/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_GPRS_SNDCP_VERSION {{VERSION}} +#define LIBOSMO_GPRS_SNDCP_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_GPRS_SNDCP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_GPRS_SNDCP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_GPRS_SNDCP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_GPRS_SNDCP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_GPRS_SNDCP_VERSION_MAJOR > (major) || \ + (LIBOSMO_GPRS_SNDCP_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_SNDCP_VERSION_MINOR > (minor)) || \ + (LIBOSMO_GPRS_SNDCP_VERSION_MAJOR == (major) && \ + LIBOSMO_GPRS_SNDCP_VERSION_MINOR == (minor) && \ + LIBOSMO_GPRS_SNDCP_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/40508?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icf0319d4b7c27f80a696cb951aa40e2add64749b Gerrit-Change-Number: 40508 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 24 minutes

1
0
0 0

[S] Change in libosmo-pfcp[master]: Generate a version.h file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/40507?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: I5f1e568d5ef991371aa29188e54de86b4b940472 --- M .gitignore M include/osmocom/pfcp/Makefile.am A include/osmocom/pfcp/version.h.tpl 3 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/07/40507/1 diff --git a/.gitignore b/.gitignore index 56bd8e6..9879e21 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ doc/manuals/build contrib/libosmo-pfcp.spec +include/osmocom/pfcp/version.h diff --git a/include/osmocom/pfcp/Makefile.am b/include/osmocom/pfcp/Makefile.am index 2693be5..e0305f4 100644 --- a/include/osmocom/pfcp/Makefile.am +++ b/include/osmocom/pfcp/Makefile.am @@ -1,3 +1,12 @@ +version.h: version.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed \ + -e "s/{{VERSION}}/$$(echo '@VERSION@' | cut -d. -f1-3)/g" \ + -e "s/{{VERSION_MAJOR}}/$$(echo '@VERSION@' | cut -d. -f1)/g" \ + -e "s/{{VERSION_MINOR}}/$$(echo '@VERSION@' | cut -d. -f2)/g" \ + -e "s/{{VERSION_PATCH}}/$$(echo '@VERSION@' | cut -d. -f3)/g" \ + $< > $@ + noinst_HEADERS = \ pfcp_cp_peer_private.h \ $(NULL) @@ -10,6 +19,7 @@ pfcp_proto.h \ pfcp_strs.h \ pfcp_cp_peer.h \ + version.h \ $(NULL) pfcpdir = $(includedir)/osmocom/pfcp diff --git a/include/osmocom/pfcp/version.h.tpl b/include/osmocom/pfcp/version.h.tpl new file mode 100644 index 0000000..1a7de1b --- /dev/null +++ b/include/osmocom/pfcp/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_PFCP_VERSION {{VERSION}} +#define LIBOSMO_PFCP_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_PFCP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_PFCP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_PFCP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_PFCP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_PFCP_VERSION_MAJOR > (major) || \ + (LIBOSMO_PFCP_VERSION_MAJOR == (major) && \ + LIBOSMO_PFCP_VERSION_MINOR > (minor)) || \ + (LIBOSMO_PFCP_VERSION_MAJOR == (major) && \ + LIBOSMO_PFCP_VERSION_MINOR == (minor) && \ + LIBOSMO_PFCP_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/40507?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I5f1e568d5ef991371aa29188e54de86b4b940472 Gerrit-Change-Number: 40507 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 24 minutes

1
0
0 0

[S] Change in libosmo-netif[master]: include/osmocom/netif/Makefile: format osmonetif_HEADERS

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40505?usp=email ) Change subject: include/osmocom/netif/Makefile: format osmonetif_HEADERS ...................................................................... include/osmocom/netif/Makefile: format osmonetif_HEADERS Format osmonetif_HEADERS like similar variables in other Osmocom projects. Change-Id: I6823188601606f1bff9a5787e6a8f2b6971e0ed2 --- M include/osmocom/netif/Makefile.am 1 file changed, 12 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/05/40505/1 diff --git a/include/osmocom/netif/Makefile.am b/include/osmocom/netif/Makefile.am index d518edb..5c10d71 100644 --- a/include/osmocom/netif/Makefile.am +++ b/include/osmocom/netif/Makefile.am @@ -2,17 +2,18 @@ stream_private.h \ $(NULL) -osmonetif_HEADERS = amr.h \ - datagram.h \ - ipa.h \ - ipa_unit.h \ - jibuf.h \ - osmux.h \ - prim.h \ - rs232.h \ - rtp.h \ - stream.h \ - $(NULL) +osmonetif_HEADERS = \ + amr.h \ + datagram.h \ + ipa.h \ + ipa_unit.h \ + jibuf.h \ + osmux.h \ + prim.h \ + rs232.h \ + rtp.h \ + stream.h \ + $(NULL) if ENABLE_LIBSCTP osmonetif_HEADERS += sctp.h -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40505?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6823188601606f1bff9a5787e6a8f2b6971e0ed2 Gerrit-Change-Number: 40505 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 hour, 24 minutes

1
0
0 0

2025

2024

2023

2022

gerrit-log