June 2025 - gerrit-log - lists.osmocom.org

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

by osmith

osmith has submitted this change. ( 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, 139 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved 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..87492e5 100644 --- a/include/osmocom/hnbap/Makefile.am +++ b/include/osmocom/hnbap/Makefile.am @@ -1,3 +1,16 @@ +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + hnbap_HEADERS = \ hnbap_common.h hnbap_ies_defs.h \ HNBAP_AccessResult.h \ @@ -115,9 +128,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..cef1cd3 100644 --- a/include/osmocom/ranap/Makefile.am +++ b/include/osmocom/ranap/Makefile.am @@ -6,6 +6,19 @@ 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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + ranap_HEADERS = \ ranap_ies_defs.h \ ranap_common.h \ @@ -605,9 +618,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..5880784 100644 --- a/include/osmocom/rua/Makefile.am +++ b/include/osmocom/rua/Makefile.am @@ -1,3 +1,16 @@ +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + rua_HEADERS = \ rua_common.h rua_ies_defs.h rua_msg_factory.h \ RUA_Ansi-41-IDNNS.h \ @@ -35,9 +48,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..2533daa 100644 --- a/include/osmocom/sabp/Makefile.am +++ b/include/osmocom/sabp/Makefile.am @@ -6,6 +6,19 @@ 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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + sabp_HEADERS = \ sabp_ies_defs.h \ sabp_common.h \ @@ -72,9 +85,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: merged Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7cba0d32f024797e1360ed250a2e4f2d8ca501ee Gerrit-Change-Number: 40515 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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, 31 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/Makefile.am b/src/Makefile.am index e594dd9..96783fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,11 +18,25 @@ $(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" \ + $< > $@ + +EXTRA_DIST = \ + $(LIBRARY_SOURCE_DIR)/smpp34_version.h.tpl \ + $(NULL) + 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: merged Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: I03ba56c80d83fda5824da247a942e2e33f48580e Gerrit-Change-Number: 40509 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/40516?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: Ia4ccdc833b95cd60fc27e7d73b55c99c1a0a8d7d --- M .gitignore M include/osmocom/sbcap/Makefile.am A include/osmocom/sbcap/version.h.tpl 3 files changed, 31 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 7f8336d..d8ffce0 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ contrib/osmo-cbc.spec libosmo-sbcap.pc +include/osmocom/sbcap/version.h diff --git a/include/osmocom/sbcap/Makefile.am b/include/osmocom/sbcap/Makefile.am index cc994eb..4327596 100644 --- a/include/osmocom/sbcap/Makefile.am +++ b/include/osmocom/sbcap/Makefile.am @@ -1,3 +1,16 @@ +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + sbcap_HEADERS = \ sbcap_common.h \ sbcap_internal.h \ @@ -115,6 +128,7 @@ SBcAP_Write-Replace-Warning-Indication.h \ SBcAP_Write-Replace-Warning-Request.h \ SBcAP_Write-Replace-Warning-Response.h \ + version.h \ $(NULL) sbcapdir = $(includedir)/osmocom/sbcap diff --git a/include/osmocom/sbcap/version.h.tpl b/include/osmocom/sbcap/version.h.tpl new file mode 100644 index 0000000..40c554f --- /dev/null +++ b/include/osmocom/sbcap/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_SBCAP_VERSION {{VERSION}} +#define LIBOSMO_SBCAP_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_SBCAP_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_SBCAP_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_SBCAP_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_SBCAP_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_SBCAP_VERSION_MAJOR > (major) || \ + (LIBOSMO_SBCAP_VERSION_MAJOR == (major) && \ + LIBOSMO_SBCAP_VERSION_MINOR > (minor)) || \ + (LIBOSMO_SBCAP_VERSION_MAJOR == (major) && \ + LIBOSMO_SBCAP_VERSION_MINOR == (minor) && \ + LIBOSMO_SBCAP_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/40516?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia4ccdc833b95cd60fc27e7d73b55c99c1a0a8d7d Gerrit-Change-Number: 40516 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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, 181 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved 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..6fd59e3 100644 --- a/include/osmocom/csn1/Makefile.am +++ b/include/osmocom/csn1/Makefile.am @@ -1,6 +1,20 @@ +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + 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..b1e6010 100644 --- a/include/osmocom/gprs/gmm/Makefile.am +++ b/include/osmocom/gprs/gmm/Makefile.am @@ -1,13 +1,26 @@ - noinst_HEADERS = \ gmm_ms_fsm.h \ gmm_private.h \ gmm_pdu.h \ $(NULL) +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + 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..c20c7cc 100644 --- a/include/osmocom/gprs/llc/Makefile.am +++ b/include/osmocom/gprs/llc/Makefile.am @@ -2,9 +2,23 @@ llc_private.h \ $(NULL) +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + 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..5b71d85 100644 --- a/include/osmocom/gprs/rlcmac/Makefile.am +++ b/include/osmocom/gprs/rlcmac/Makefile.am @@ -22,11 +22,25 @@ types_private.h \ $(NULL) +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + rlcmac_HEADERS = \ csn1_defs.h \ 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..cf0c072 100644 --- a/include/osmocom/gprs/sm/Makefile.am +++ b/include/osmocom/gprs/sm/Makefile.am @@ -1,14 +1,27 @@ - noinst_HEADERS = \ sm_ms_fsm.h \ sm_pdu.h \ sm_private.h \ $(NULL) +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + sm_HEADERS = \ 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..b19e214 100644 --- a/include/osmocom/gprs/sndcp/Makefile.am +++ b/include/osmocom/gprs/sndcp/Makefile.am @@ -1,4 +1,3 @@ - noinst_HEADERS = \ comp.h \ dcomp.h \ @@ -10,9 +9,23 @@ v42bis_private.h \ $(NULL) +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + 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: merged Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icf0319d4b7c27f80a696cb951aa40e2add64749b Gerrit-Change-Number: 40508 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved 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..21b3aeb 100644 --- a/include/osmocom/pfcp/Makefile.am +++ b/include/osmocom/pfcp/Makefile.am @@ -2,6 +2,19 @@ pfcp_cp_peer_private.h \ $(NULL) +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + pfcp_HEADERS = \ pfcp_endpoint.h \ pfcp_ies_custom.h \ @@ -10,6 +23,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: merged Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I5f1e568d5ef991371aa29188e54de86b4b940472 Gerrit-Change-Number: 40507 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40504?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: I7b010b3815845fe49d105bc8bf3295707104923d --- M .gitignore M include/osmocom/sigtran/Makefile.am A include/osmocom/sigtran/version.h.tpl 3 files changed, 31 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 67685b4..99cb052 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ doc/sigtran contrib/libosmo-sccp.spec +include/osmocom/sigtran/version.h diff --git a/include/osmocom/sigtran/Makefile.am b/include/osmocom/sigtran/Makefile.am index 69895bc..783a6bc 100644 --- a/include/osmocom/sigtran/Makefile.am +++ b/include/osmocom/sigtran/Makefile.am @@ -1,3 +1,16 @@ +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" \ + $< > $@ + +EXTRA_DIST = \ + version.h.tpl \ + $(NULL) + sigtran_HEADERS = \ mtp_sap.h \ osmo_ss7.h \ @@ -5,6 +18,7 @@ sccp_sap.h \ sigtran_sap.h \ xua_msg.h \ + version.h \ $(NULL) sigtrandir = $(includedir)/osmocom/sigtran diff --git a/include/osmocom/sigtran/version.h.tpl b/include/osmocom/sigtran/version.h.tpl new file mode 100644 index 0000000..34b9cb1 --- /dev/null +++ b/include/osmocom/sigtran/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_SIGTRAN_VERSION {{VERSION}} +#define LIBOSMO_SIGTRAN_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_SIGTRAN_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_SIGTRAN_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_SIGTRAN_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_SIGTRAN_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_SIGTRAN_VERSION_MAJOR > (major) || \ + (LIBOSMO_SIGTRAN_VERSION_MAJOR == (major) && \ + LIBOSMO_SIGTRAN_VERSION_MINOR > (minor)) || \ + (LIBOSMO_SIGTRAN_VERSION_MAJOR == (major) && \ + LIBOSMO_SIGTRAN_VERSION_MINOR == (minor) && \ + LIBOSMO_SIGTRAN_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40504?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I7b010b3815845fe49d105bc8bf3295707104923d Gerrit-Change-Number: 40504 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/40520?usp=email ) Change subject: Generate a version.h file ...................................................................... Generate a version.h file Related: OS#6626 Change-Id: Ia894a9d9a20e343755d8060822d33b8a1c59b4db --- M .gitignore M host/include/Makefile.am A host/include/osmocom/simtrace2/version.h.tpl 3 files changed, 28 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index f8f1139..0a86b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ usb_strings_generated.h firmware/usbstring/usbstring firmware/apps/*/usb_strings.txt.patched -firmware/misc/crctool \ No newline at end of file +firmware/misc/crctool +host/include/osmocom/simtrace2/version.h diff --git a/host/include/Makefile.am b/host/include/Makefile.am index 60134f3..3a9722c 100644 --- a/host/include/Makefile.am +++ b/host/include/Makefile.am @@ -1,3 +1,12 @@ +osmocom/simtrace2/version.h: osmocom/simtrace2/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/simtrace2/apdu_dispatch.h \ osmocom/simtrace2/simtrace2_api.h \ @@ -5,4 +14,5 @@ osmocom/simtrace2/simtrace_prot.h \ osmocom/simtrace2/usb_util.h \ osmocom/simtrace2/gsmtap.h \ + osmocom/simtrace2/version.h \ $(NULL) diff --git a/host/include/osmocom/simtrace2/version.h.tpl b/host/include/osmocom/simtrace2/version.h.tpl new file mode 100644 index 0000000..14f965f --- /dev/null +++ b/host/include/osmocom/simtrace2/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_SIMTRACE2_VERSION {{VERSION}} +#define LIBOSMO_SIMTRACE2_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_SIMTRACE2_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_SIMTRACE2_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_SIMTRACE2_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_SIMTRACE2_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_SIMTRACE2_VERSION_MAJOR > (major) || \ + (LIBOSMO_SIMTRACE2_VERSION_MAJOR == (major) && \ + LIBOSMO_SIMTRACE2_VERSION_MINOR > (minor)) || \ + (LIBOSMO_SIMTRACE2_VERSION_MAJOR == (major) && \ + LIBOSMO_SIMTRACE2_VERSION_MINOR == (minor) && \ + LIBOSMO_SIMTRACE2_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/40520?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia894a9d9a20e343755d8060822d33b8a1c59b4db Gerrit-Change-Number: 40520 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-e1d[master]: include/Makefile: format nobase_include_HEADERS

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/40517?usp=email ) Change subject: include/Makefile: format nobase_include_HEADERS ...................................................................... include/Makefile: format nobase_include_HEADERS Make it diff friendly. Change-Id: Ib3df73373ea2be0bead2ebccb5552bee218b5403 --- M include/Makefile.am 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index 3c4cb0d..a736481 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1,7 @@ -nobase_include_HEADERS = osmocom/e1d/proto_clnt.h osmocom/e1d/proto.h osmocom/e1d/proto_srv.h \ - osmocom/octoi/octoi.h osmocom/octoi/e1oip_proto.h +nobase_include_HEADERS = \ + osmocom/e1d/proto.h \ + osmocom/e1d/proto_clnt.h \ + osmocom/e1d/proto_srv.h \ + osmocom/octoi/e1oip_proto.h \ + osmocom/octoi/octoi.h \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/40517?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib3df73373ea2be0bead2ebccb5552bee218b5403 Gerrit-Change-Number: 40517 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/40518?usp=email ) Change subject: Generate version.h files ...................................................................... Generate version.h files Related: OS#6626 Change-Id: I5087a677ef8117a6556942dcf1ff3915b107eb37 --- M .gitignore M include/Makefile.am A include/osmocom/e1d/version.h.tpl A include/osmocom/octoi/version.h.tpl 4 files changed, 45 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 4d83803..42158c0 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ tests/testsuite.log tests/testsuite.dir tests/*/*_test + +include/osmocom/*/version.h diff --git a/include/Makefile.am b/include/Makefile.am index a736481..ce33860 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,7 +1,18 @@ +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/e1d/proto.h \ osmocom/e1d/proto_clnt.h \ osmocom/e1d/proto_srv.h \ + osmocom/e1d/version.h \ osmocom/octoi/e1oip_proto.h \ osmocom/octoi/octoi.h \ + osmocom/octoi/version.h \ $(NULL) diff --git a/include/osmocom/e1d/version.h.tpl b/include/osmocom/e1d/version.h.tpl new file mode 100644 index 0000000..a84b38a --- /dev/null +++ b/include/osmocom/e1d/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_E1D_VERSION {{VERSION}} +#define LIBOSMO_E1D_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_E1D_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_E1D_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_E1D_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_E1D_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_E1D_VERSION_MAJOR > (major) || \ + (LIBOSMO_E1D_VERSION_MAJOR == (major) && \ + LIBOSMO_E1D_VERSION_MINOR > (minor)) || \ + (LIBOSMO_E1D_VERSION_MAJOR == (major) && \ + LIBOSMO_E1D_VERSION_MINOR == (minor) && \ + LIBOSMO_E1D_VERSION_PATCH >= (patch))) diff --git a/include/osmocom/octoi/version.h.tpl b/include/osmocom/octoi/version.h.tpl new file mode 100644 index 0000000..fa81278 --- /dev/null +++ b/include/osmocom/octoi/version.h.tpl @@ -0,0 +1,16 @@ +#pragma once + +#define LIBOSMO_OCTOI_VERSION {{VERSION}} +#define LIBOSMO_OCTOI_VERSION_STR "{{VERSION}}" + +#define LIBOSMO_OCTOI_VERSION_MAJOR {{VERSION_MAJOR}} +#define LIBOSMO_OCTOI_VERSION_MINOR {{VERSION_MINOR}} +#define LIBOSMO_OCTOI_VERSION_PATCH {{VERSION_PATCH}} + +#define LIBOSMO_OCTOI_VERSION_GREATER_EQUAL(major, minor, patch) \ + (LIBOSMO_OCTOI_VERSION_MAJOR > (major) || \ + (LIBOSMO_OCTOI_VERSION_MAJOR == (major) && \ + LIBOSMO_OCTOI_VERSION_MINOR > (minor)) || \ + (LIBOSMO_OCTOI_VERSION_MAJOR == (major) && \ + LIBOSMO_OCTOI_VERSION_MINOR == (minor) && \ + LIBOSMO_OCTOI_VERSION_PATCH >= (patch))) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/40518?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I5087a677ef8117a6556942dcf1ff3915b107eb37 Gerrit-Change-Number: 40518 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified 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: merged 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025