Skip to content

Commit de9030a

Browse files
Lt-FlashLt-Flash
committed
Merge origin/master into feature/clusterer-controller-devel
# Conflicts: # modules/tm/README # modules/tm/doc/tm_admin.xml
2 parents a753af0 + 01d6f6d commit de9030a

1,035 files changed

Lines changed: 11152 additions & 263529 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/cifuzz.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: CIFuzz
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches-ignore:
5+
- coverity_scan
6+
pull_request:
37
jobs:
48
Fuzzing:
59
runs-on: ubuntu-latest

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ name: Main CI
66
on:
77
# Triggers the workflow on all push or pull request events
88
push:
9+
branches-ignore:
10+
- coverity_scan
911
pull_request:
1012

1113
# Allows you to run this workflow manually from the Actions tab

‎.github/workflows/multiarch.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ name: Multi-Architecture Build
66
on:
77
# Triggers the workflow on all push or pull request events
88
push:
9+
branches-ignore:
10+
- coverity_scan
911
pull_request:
1012

1113
# Allows you to run this workflow manually from the Actions tab

‎.github/workflows/rtp.io.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ name: rtp.io
66
on:
77
# Triggers the workflow on all push or pull request events
88
push:
9+
branches-ignore:
10+
- coverity_scan
911
pull_request:
1012

1113
# Allows you to run this workflow manually from the Actions tab

‎.github/workflows/unittests.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ name: Unit Tests
66
on:
77
# Triggers the workflow on all push or pull request events
88
push:
9+
branches-ignore:
10+
- coverity_scan
911
pull_request:
1012

1113
# Allows you to run this workflow manually from the Actions tab

‎Makefile‎

Lines changed: 4 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,6 @@ static_defs=$(foreach mod, $(static_modules), \
101101
override extra_defs+=$(static_defs) $(EXTRA_DEFS)
102102
export extra_defs
103103

104-
# If modules is supplied, only do those. If not, use all modules when
105-
# building documentation.
106-
ifeq ($(modules),)
107-
doc_modules=$(all_modules)
108-
else
109-
doc_modules=$(modules)
110-
endif
111-
112104
# Take subset of all modules, excluding the exclude_modules and the
113105
# static_modules.
114106
modules=$(filter-out $(addprefix modules/, \
@@ -238,125 +230,12 @@ gen_misclibs:
238230
$(MAKE) -C $$r ; \
239231
done
240232

241-
.PHONY: tool-docbook2pdf
242-
tool-docbook2pdf:
243-
@if [ -z "$(DBXML2PDF)" ]; then \
244-
echo "error: docbook2pdf not found"; exit 1; \
245-
fi
246-
247-
.PHONY: tool-lynx
248-
tool-lynx:
249-
@if [ -z "$(DBHTML2TXT)" ]; then \
250-
echo "error: lynx not found"; exit 1; \
251-
fi
252-
253-
.PHONY: tool-xsltproc
254-
tool-xsltproc:
255-
@if [ -z "$(DBXML2HTML)" ]; then \
256-
echo "error: xsltproc not found"; exit 1; \
257-
fi
258-
@if [ -z "$(DBHTMLXSL)" ]; then \
259-
echo "error: docbook.xsl not found (docbook-xsl)"; exit 1; \
260-
fi
261-
262233
.PHONY: git-dir
263234
git-dir:
264235
@if [ ! -r .git ]; then \
265236
echo "error: Not a git repo! (.git dir not found)"; exit 1; \
266237
fi
267238

268-
.PHONY: modules-contrib
269-
modules-contrib: git-dir
270-
@set -e; ./docs/build-contrib.sh $(modules)
271-
272-
.PHONY: modules-readme
273-
modules-readme: tool-lynx tool-xsltproc
274-
@set -e; \
275-
for mod in $(doc_modules); do \
276-
r=`basename $$mod`;\
277-
echo "Reading directory $$mod for module $$r";\
278-
if [ ! -d "$$mod/doc" ]; then \
279-
continue; \
280-
fi; \
281-
cd "$$mod/doc"; \
282-
if [ -f "$$r".xml ]; then \
283-
echo "docbook xml to html: $$r.xml"; \
284-
$(DBXML2HTML) -o $$r.html $(DBXML2HTMLPARAMS) $(DBHTMLXSL) \
285-
$$r.xml; \
286-
echo "docbook html to txt: $$r.html"; \
287-
$(DBHTML2TXT) $(DBHTML2TXTPARAMS) $$r.html >$$r.txt; \
288-
echo "docbook txt to readme: $$r.txt"; \
289-
rm $$r.html; \
290-
mv $$r.txt ../README; \
291-
echo ""; \
292-
fi; \
293-
cd ../../..; \
294-
done
295-
296-
.PHONY: modules-docbook-txt
297-
modules-docbook-txt: tool-lynx tool-xsltproc
298-
@set -e; \
299-
for mod in $(doc_modules); do \
300-
r=`basename $$mod`;\
301-
echo "Reading directory $$mod for module $$r";\
302-
if [ ! -d "$$mod/doc" ]; then \
303-
continue; \
304-
fi; \
305-
cd "$$mod/doc"; \
306-
if [ -f "$$r".xml ]; then \
307-
echo ""; \
308-
echo "docbook xml to html: $$r.xml"; \
309-
$(DBXML2HTML) -o $$r.html $(DBXML2HTMLPARAMS) $(DBHTMLXSL) \
310-
$$r.xml; \
311-
echo "docbook html to txt: $$r.html"; \
312-
$(DBHTML2TXT) $(DBHTML2TXTPARAMS) $$r.html >$$r.txt; \
313-
rm $$r.html; \
314-
echo ""; \
315-
fi; \
316-
cd ../../..; \
317-
done
318-
319-
.PHONY: modules-docbook-html
320-
modules-docbook-html: tool-xsltproc
321-
@set -e; \
322-
for mod in $(doc_modules); do \
323-
r=`basename $$mod`;\
324-
echo "Reading directory $$mod for module $$r";\
325-
if [ ! -d "$$mod/doc" ]; then \
326-
continue; \
327-
fi; \
328-
cd "$$mod/doc"; \
329-
if [ -f "$$r".xml ]; then \
330-
echo ""; \
331-
echo "docbook xml to html: $$r.xml"; \
332-
$(DBXML2HTML) -o $$r.html $(DBXML2HTMLPARAMS) $(DBHTMLXSL) \
333-
$$r.xml; \
334-
echo ""; \
335-
fi; \
336-
cd ../../..; \
337-
done
338-
339-
.PHONY: modules-docbook-pdf
340-
modules-docbook-pdf: tool-docbook2pdf
341-
@set -e; \
342-
for mod in $(doc_modules); do \
343-
r=`basename $$mod`;\
344-
echo "Reading directory $$mod for module $$r";\
345-
if [ ! -d "$$mod/doc" ]; then \
346-
continue; \
347-
fi; \
348-
cd "$$mod/doc"; \
349-
if [ -f "$$r".xml ]; then \
350-
echo ""; \
351-
echo "docbook xml to pdf: $$r.xml"; \
352-
$(DBXML2PDF) "$$r".xml; \
353-
fi; \
354-
cd ../../..; \
355-
done
356-
357-
.PHONY: modules-docbook
358-
modules-docbook: modules-docbook-txt modules-docbook-html modules-docbook-pdf
359-
360239
.PHONY: dbschema-docbook-txt
361240
dbschema-docbook-txt: dbschema
362241
@set -e; \
@@ -490,11 +369,11 @@ sunpkg:
490369
install-app: mk-install-dirs install-cfg install-bin \
491370
install-app-doc install-man install-config-templates
492371

493-
# Install all module stuff (except modules-docbook?)
372+
# Install all module stuff
494373
install-modules-files: install-modules install-modules-doc
495374
install-modules-all: install-modules-files install-modules-dbschema
496375

497-
# Install everything (except modules-docbook?)
376+
# Install everything
498377
install: install-app install-modules-all
499378

500379
install-config-templates: $(data_prefix)/$(data_dir)
@@ -587,9 +466,9 @@ install-app-doc: $(doc_prefix)/$(doc_dir)
587466
install-modules-doc: $(doc_prefix)/$(doc_dir)
588467
-@for r in $(modules_basenames) "" ; do \
589468
if [ -n "$$r" ]; then \
590-
if [ -f modules/"$$r"/README ]; then \
469+
if [ -f modules/"$$r"/README.md ]; then \
591470
$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/README."$$r" ; \
592-
$(INSTALL_DOC) modules/"$$r"/README \
471+
$(INSTALL_DOC) modules/"$$r"/README.md \
593472
$(doc_prefix)/$(doc_dir)/README."$$r" ; \
594473
fi ; \
595474
fi ; \
@@ -610,29 +489,6 @@ install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
610489
< $(NAME).cfg.5 > $(man_prefix)/$(man_dir)/man5/$(NAME).cfg.5
611490
chmod 644 $(man_prefix)/$(man_dir)/man5/$(NAME).cfg.5
612491

613-
install-modules-docbook: $(doc_prefix)/$(doc_dir)
614-
-@for r in $(modules_basenames) "" ; do \
615-
if [ -n "$$r" ]; then \
616-
if [ -d modules/"$$r"/doc ]; then \
617-
if [ -f modules/"$$r"/doc/"$$r".txt ]; then \
618-
$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$r".txt ; \
619-
$(INSTALL_DOC) modules/"$$r"/doc/"$$r".txt \
620-
$(doc_prefix)/$(doc_dir)/"$$r".txt ; \
621-
fi ; \
622-
if [ -f modules/"$$r"/doc/"$$r".html ]; then \
623-
$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$r".html ; \
624-
$(INSTALL_DOC) modules/"$$r"/doc/"$$r".html \
625-
$(doc_prefix)/$(doc_dir)/"$$r".html ; \
626-
fi ; \
627-
if [ -f modules/"$$r"/doc/"$$r".pdf ]; then \
628-
$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$r".pdf ; \
629-
$(INSTALL_DOC) modules/"$$r"/doc/"$$r".pdf \
630-
$(doc_prefix)/$(doc_dir)/"$$r".pdf ; \
631-
fi ; \
632-
fi ; \
633-
fi ; \
634-
done
635-
636492
doxygen:
637493
-@echo "Create Doxygen documentation"
638494
# disable call graphes, because of the DOT dependencies

‎Makefile.defs‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -538,46 +538,6 @@ REGENERATE_MEM_STATS=remove-mem-stats
538538
endif
539539
endif
540540

541-
ifeq ($(DBXML2HTML),)
542-
DBXML2HTML = $(shell which xsltproc)
543-
endif
544-
545-
ifneq ($(DBXML2HTML),)
546-
ifeq ($(DBHTMLCSS),)
547-
DBHTMLCSS = ../../../docs/module-docbook.css
548-
endif
549-
#DBHTMLXSL = /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl
550-
# On CentOS, this is the right path:
551-
#DBHTMLXSL = /usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl
552-
553-
DBHTMLXSL=$(shell \
554-
if [ -e /usr/share/xml/docbook/xsl-stylesheets-1.79.2-nons/xhtml/docbook.xsl ]; then \
555-
echo "/usr/share/xml/docbook/xsl-stylesheets-1.79.2-nons/xhtml/docbook.xsl"; \
556-
elif [ -e /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl ]; then \
557-
echo "/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"; \
558-
elif [ -e /usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl ]; then \
559-
echo "/usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl"; \
560-
elif [ -e /usr/share/xml/docbook/xsl-stylesheets*/xhtml/docbook.xsl ]; then \
561-
ls -1 /usr/share/xml/docbook/xsl-stylesheets*/xhtml/docbook.xsl; \
562-
fi)
563-
DBXML2HTMLPARAMS = --stringparam section.autolabel 1
564-
DBXML2HTMLPARAMS += --stringparam section.label.includes.component.label 1
565-
DBXML2HTMLPARAMS += --stringparam generate.toc "book toc,title,figure,table,example"
566-
DBXML2HTMLPARAMS += --stringparam html.stylesheet $(DBHTMLCSS)
567-
endif
568-
569-
ifeq ($(DBHTML2TXT),)
570-
DBHTML2TXT = $(shell which lynx)
571-
endif
572-
573-
ifneq ($(DBHTML2TXT),)
574-
DBHTML2TXTPARAMS = -force_html -dump -nolist -width=72
575-
endif
576-
577-
ifeq ($(DBXML2PDF),)
578-
DBXML2PDF = $(shell which docbook2pdf)
579-
endif
580-
581541
MKTAGS=ctags -R .
582542

583543
# compile-time options

‎Makefile.rules‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,6 @@ dosetrev:
125125
@echo "$(THISREVISION)" >.$(VERSIONTYPE)revision
126126

127127

128-
.PHONY: docbook-clean
129-
docbook-clean:
130-
-@for r in $(modules) $(static_modules_path) "" ; do \
131-
if [ -d "$$r" ]; then \
132-
if [ -d "$$r"/doc ]; then \
133-
rm -f "$$r"/doc/*.txt ; \
134-
rm -f "$$r"/doc/*.html ; \
135-
rm -f "$$r"/doc/*.pdf ; \
136-
fi ; \
137-
fi ; \
138-
done
139-
140128
.PHONY: dbschema-docbook-clean
141129
dbschema-docbook-clean:
142130
-@if [ -d docs/database ] ; then \
@@ -147,7 +135,7 @@ dbschema-docbook-clean:
147135
fi
148136

149137
.PHONY: clean
150-
clean: docbook-clean dbschema-docbook-clean
138+
clean: dbschema-docbook-clean
151139
-@rm -f $(objs) $(NAME) $(objs:.o=.il) 2>/dev/null
152140
-@for r in $(all_modules) $(all_utils) $(all_misclibs); do \
153141
if [ -d "$$r" -a -f "$$r/Makefile" ]; then \

‎docs/authors.xml‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)