laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30024 )
Change subject: jenkins.sh: Support for building + publishing the manual
......................................................................
jenkins.sh: Support for building + publishing the manual
Change-Id: Ic399662e6ac5e5e7f999e6e7127df9a9580a0627
---
M contrib/jenkins.sh
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index a6ca30e..6cac702 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -29,6 +29,9 @@
# Additional configure options and depends
CONFIG=""
+if [ "$WITH_MANUALS" = "1" ]; then
+ CONFIG="--enable-manuals"
+fi
set +x
echo
@@ -43,7 +46,14 @@
./configure --enable-sanitize --enable-werror $CONFIG
$MAKE $PARALLEL_MAKE
$MAKE check || cat-testlogs.sh
-DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh
-$MAKE maintainer-clean
+# Do distcheck with --disable-manuals as workaround, because it doesn't build
+# the usermanual pdf for some reason and then fails at "make install" because
+# it doesn't exist. Spent a lot of time on debugging it, not worth fixing now.
+DISTCHECK_CONFIGURE_FLAGS="$CONFIG --disable-manuals" $MAKE distcheck || cat-testlogs.sh
+if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
+ make -C "$base/doc/manuals" publish
+fi
+
+$MAKE maintainer-clean
osmo-clean-workspace.sh
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30024
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ic399662e6ac5e5e7f999e6e7127df9a9580a0627
Gerrit-Change-Number: 30024
Gerrit-PatchSet: 7
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: laforge, msuraev.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30024 )
Change subject: jenkins.sh: Support for building + publishing the manual
......................................................................
Patch Set 7:
(1 comment)
Patchset:
PS4:
> I spent a lot of time investing it as well. osmoe1d-usermanual. […]
I guess part of the problem is that EXTRA_DIST has "doc" in the main Makefile.am. But if I remove that, the build fails elsewhere... so I suggest we just use the workaround for now. Unless you really want me to spend more time on it.
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30024
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ic399662e6ac5e5e7f999e6e7127df9a9580a0627
Gerrit-Change-Number: 30024
Gerrit-PatchSet: 7
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 07 Nov 2022 14:02:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: laforge, msuraev.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30024 )
Change subject: jenkins.sh: Support for building + publishing the manual
......................................................................
Patch Set 7: Code-Review+1
(2 comments)
Patchset:
PS4:
I spent a lot of time investing it as well. osmoe1d-usermanual.pdf does not get built in "make distcheck", leading to the error later where "make install" can't install it. With debug flags for make:
> No need to remake target 'osmoe1d-usermanual.pdf'; using VPATH name '../../../../doc/manuals/osmoe1d-usermanual.pdf'.
So because the pdf is already built in the source directory before we run "make distcheck", make figures it exists already and doesn't try to rebuild it. I wonder why this works in osmo-hlr and other projects... but since I spent a lot of time also at this point and I don't think it matters if we build the manuals in "make distcheck" or not (we build them twice in CI already, in the regular build and in the deb package!), I decided to do "make distcheck" with --disable-manuals. Interestingly there's a similar problem with doxygen, so I've done --disable-doxygen in the next patch too.
File Makefile.am:
https://gerrit.osmocom.org/c/osmo-e1d/+/30024/comment/f092a1b4_e5880423
PS4, Line 5: doc \
> Is the order of subdirs matter?
probably done by accident, changed it back - the result of the build is the same
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30024
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ic399662e6ac5e5e7f999e6e7127df9a9580a0627
Gerrit-Change-Number: 30024
Gerrit-PatchSet: 7
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 07 Nov 2022 13:55:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith, laforge.
osmith has uploaded a new patch set (#7) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30024 )
Change subject: jenkins.sh: Support for building + publishing the manual
......................................................................
jenkins.sh: Support for building + publishing the manual
Change-Id: Ic399662e6ac5e5e7f999e6e7127df9a9580a0627
---
M contrib/jenkins.sh
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/24/30024/7
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30024
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ic399662e6ac5e5e7f999e6e7127df9a9580a0627
Gerrit-Change-Number: 30024
Gerrit-PatchSet: 7
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith, laforge, msuraev.
osmith has uploaded a new patch set (#8) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30023 )
Change subject: doxygen API documentation for libosmo-e1d
......................................................................
doxygen API documentation for libosmo-e1d
If we actually expect 3rd party applications to use libosmo-e1d to talk
to osmo-e1d, we'd better add some basic documentation on how this API
shall be used.
Change-Id: Ib4a97045bca276fbd3892f801898a436de7dc39b
---
A Doxyfile.in
M configure.ac
M contrib/jenkins.sh
M doc/Makefile.am
M doc/manuals/chapters/running.adoc
M include/osmocom/e1d/proto.h
M src/proto_clnt.c
7 files changed, 1,911 insertions(+), 58 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/23/30023/8
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30023
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ib4a97045bca276fbd3892f801898a436de7dc39b
Gerrit-Change-Number: 30023
Gerrit-PatchSet: 8
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: newpatchset
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/30040 )
Change subject: Support RPM building via contrib/osmo-e1-recorder.spec.in
......................................................................
Support RPM building via contrib/osmo-e1-recorder.spec.in
Change-Id: I1851b5c2a68ec9559e42c9da3f04d43c0fc7cdfe
---
M Makefile.am
M configure.ac
A contrib/osmo-e1-recorder.spec.in
3 files changed, 70 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
msuraev: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index 24f0b24..d8c83a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
$(NULL)
BUILT_SOURCES = $(top_srcdir)/.version
-EXTRA_DIST = git-version-gen osmoappdesc.py .version
+EXTRA_DIST = git-version-gen osmoappdesc.py .version contrib/osmo-e1-recorder.spec.in
AM_DISTCHECK_CONFIGURE_FLAGS = \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
diff --git a/configure.ac b/configure.ac
index 65a2c7f..568584d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,4 +192,5 @@
doc/Makefile
tests/Makefile
doc/examples/Makefile
+ contrib/osmo-e1-recorder.spec
Makefile)
diff --git a/contrib/osmo-e1-recorder.spec.in b/contrib/osmo-e1-recorder.spec.in
new file mode 100644
index 0000000..e7f1dba
--- /dev/null
+++ b/contrib/osmo-e1-recorder.spec.in
@@ -0,0 +1,68 @@
+#
+# spec file for package osmo-e1-recorder
+#
+# Copyright (c) 2018, Martin Hauke <mardnh(a)gmx.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+Name: osmo-e1-recorder
+Version: @VERSION@
+Release: 0
+Summary: Osmocom E1/T1 span recorder
+License: GPL-2.0-or-later
+Group: Productivity/Telephony/Utilities
+URL: https://gitea.osmocom.org/cellular-infrastructure/osmo-e1-recorder
+Source: %{name}-%{version}.tar.xz
+BuildRequires: autoconf
+BuildRequires: autoconf-archive
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(libosmoabis)
+BuildRequires: pkgconfig(libosmocore)
+BuildRequires: pkgconfig(libosmogsm)
+BuildRequires: pkgconfig(libosmovty)
+BuildRequires: pkgconfig(talloc)
+
+%description
+The idea of this program is to be able to passively record E1/T1 based
+communications for purposes of data analysis.
+
+Recording of a single E1 link always requires two E1 interface cards,
+one for each direction.
+
+%prep
+%setup -q
+
+%build
+echo "%{version}" >.tarball-version
+autoreconf -fi
+%configure \
+ --docdir=%{_docdir}/%{name}
+make %{?_smp_mflags}
+
+%install
+%make_install
+
+%check
+make %{?_smp_mflags} check
+
+%files
+%doc README
+%{_docdir}/osmo-e1-recorder/examples/osmo-e1-recorder.cfg
+%dir %{_docdir}/%{name}/examples
+%{_docdir}/%{name}/examples/osmo-e1-recorder.cfg
+%dir %{_sysconfdir}/osmocom
+%config %{_sysconfdir}/osmocom/osmo-e1-recorder.cfg
+%{_bindir}//hdlc-test
+%{_bindir}/osmo-e1-recorder
+%{_bindir}/osmo-e1cap-dump
+
+%changelog
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/30040
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1-recorder
Gerrit-Branch: master
Gerrit-Change-Id: I1851b5c2a68ec9559e42c9da3f04d43c0fc7cdfe
Gerrit-Change-Number: 30040
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/30040 )
Change subject: Support RPM building via contrib/osmo-e1-recorder.spec.in
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/30040
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1-recorder
Gerrit-Branch: master
Gerrit-Change-Id: I1851b5c2a68ec9559e42c9da3f04d43c0fc7cdfe
Gerrit-Change-Number: 30040
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 07 Nov 2022 11:47:01 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment