mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 16:35:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
apparmor/utils/vim/Makefile

30 lines
681 B
Makefile
Raw Normal View History

Subject: rewrite apparmor.vim generation and integrate into build This patch replaces the apparmor.vim generating script with a python version that eliminates the need for using the replace tool from the mysql-server package. It makes use of the automatically generated lists of capabilities and network protocols provided by the build infrastructure. I did not capture all the notes and TODOs that Christian had in the shell script; I can do so if desired. It also hooks the generation of the apparmor.vim file into the utils/ build and clean stages.
2012-03-22 13:26:20 -07:00
COMMONDIR=../../common/
all:
Entire tree: makefile cruft removal - drop the symlink magic of the common/ directory, and just include files directly from there. - update comments indicating required steps to take when including common/Make.rules - drop make clean steps that refer to no longer generated tarballs, specfiles, and symlinks to the common directory/Make.rules. - don't silence clean steps if VERBOSE is set Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Christian "Ghostbuster" Boltz <apparmor@cboltz.de>
2015-01-23 15:52:09 -08:00
include $(COMMONDIR)/Make.rules
Subject: rewrite apparmor.vim generation and integrate into build This patch replaces the apparmor.vim generating script with a python version that eliminates the need for using the replace tool from the mysql-server package. It makes use of the automatically generated lists of capabilities and network protocols provided by the build infrastructure. I did not capture all the notes and TODOs that Christian had in the shell script; I can do so if desired. It also hooks the generation of the apparmor.vim file into the utils/ build and clean stages.
2012-03-22 13:26:20 -07:00
Move apparmor.vim.5 from parser to utils (apparmor.vim already lives there).
2013-06-30 00:25:44 +10:00
MANPAGES=apparmor.vim.5
Subject: add apparmor.vim install target to utils/ install This patch adds a make install target for the generated apparmor.vim file, installing by default into /usr/share/apparmor based on IRC discussions; alternate suggestions welcome. (Installing directly into the vim syntax tree is difficult as the system path by default contains the vim version number.)
2012-03-22 13:27:29 -07:00
VIM_INSTALL_PATH=${DESTDIR}/usr/share/apparmor
utils: make html version of apparmor.vim manpage Bug: https://bugs.launchpad.net/bugs/1366572 In the move of the apparmor.vim manpage source from the parser directory to utils/vim/, the creation of the html version of the manpage was lost. This patch fixes that, as well as fixes the vim Makefile to use the common/Make.rules _clean target (which clears the pod2htm*.tmp files created by pod2html as well). It also fixes a bug in common/Make.rules where the _clean target would report an error when used in a directory where the Makefile doesn't set the NAME variable, such as utils/vim/. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Christian Boltz <apparmor@cboltz.de>
2014-10-16 15:50:13 -07:00
all: apparmor.vim manpages htmlmanpages
Subject: rewrite apparmor.vim generation and integrate into build This patch replaces the apparmor.vim generating script with a python version that eliminates the need for using the replace tool from the mysql-server package. It makes use of the automatically generated lists of capabilities and network protocols provided by the build infrastructure. I did not capture all the notes and TODOs that Christian had in the shell script; I can do so if desired. It also hooks the generation of the apparmor.vim file into the utils/ build and clean stages.
2012-03-22 13:26:20 -07:00
apparmor.vim: apparmor.vim.in Makefile create-apparmor.vim.py
Delete (possibly broken) apparmor.vim on failure If create-apparmor.vim.py fails, an empty apparmor.vim gets created. The next "make" run will assume that apparmor.vim was already created (the file exists and has a new-enough timestamp) and will therefore skip the create-apparmor.vim.py run, keeping the broken apparmor.vim forever. Adjust the Makefile to delete apparmor.vim if the script fails. This ensures that make tries again in the next run.
2020-04-05 14:31:33 +02:00
${PYTHON} create-apparmor.vim.py > apparmor.vim || { rm -f apparmor.vim ; exit 1; }
apparmor.vim: - allow "deny [filename] x" rules - add support for "make clean" Acked-by: John Johansen <john.johansen@canonical.com>
2011-08-21 23:49:25 +02:00
Move apparmor.vim.5 from parser to utils (apparmor.vim already lives there).
2013-06-30 00:25:44 +10:00
manpages: $(MANPAGES)
utils: make html version of apparmor.vim manpage Bug: https://bugs.launchpad.net/bugs/1366572 In the move of the apparmor.vim manpage source from the parser directory to utils/vim/, the creation of the html version of the manpage was lost. This patch fixes that, as well as fixes the vim Makefile to use the common/Make.rules _clean target (which clears the pod2htm*.tmp files created by pod2html as well). It also fixes a bug in common/Make.rules where the _clean target would report an error when used in a directory where the Makefile doesn't set the NAME variable, such as utils/vim/. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Christian Boltz <apparmor@cboltz.de>
2014-10-16 15:50:13 -07:00
htmlmanpages: $(HTMLMANPAGES)
Move apparmor.vim.5 from parser to utils (apparmor.vim already lives there).
2013-06-30 00:25:44 +10:00
install: apparmor.vim manpages
Subject: add apparmor.vim install target to utils/ install This patch adds a make install target for the generated apparmor.vim file, installing by default into /usr/share/apparmor based on IRC discussions; alternate suggestions welcome. (Installing directly into the vim syntax tree is difficult as the system path by default contains the vim version number.)
2012-03-22 13:27:29 -07:00
install -d $(VIM_INSTALL_PATH)
install -m 644 $< $(VIM_INSTALL_PATH)
Move apparmor.vim.5 from parser to utils (apparmor.vim already lives there).
2013-06-30 00:25:44 +10:00
$(MAKE) install_manpages DESTDIR=${DESTDIR}
Subject: add apparmor.vim install target to utils/ install This patch adds a make install target for the generated apparmor.vim file, installing by default into /usr/share/apparmor based on IRC discussions; alternate suggestions welcome. (Installing directly into the vim syntax tree is difficult as the system path by default contains the vim version number.)
2012-03-22 13:27:29 -07:00
utils: hook in vim generator sanity test into make check Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Seth Arnold <seth.arnold@canonical.com>
2014-02-27 16:25:00 -08:00
.PHONY: check
manpages: incorporate podchecker; fix errors and (most) warnings This patch adds a 'check_pod_files' make target to the common make rules, and then fixes the errors it highlighted as well as most of the warnings. It will cause 'make check' in most of the directories to fail if there are errors in a pod file (but not if there are warnings). Common issues were: - using an '=over/=back' pair for code-like snippets that did not contain any =items therein; the =over keyword is intended for indenting lists of =item entries, and generates a warning if there isn't any. - not escaping '<' or '>' - blank lines that contained spaces or tabs The second -warnings flag passed to podchecker is to add additional warnings, un-escaped '<' and '>' being of them. I did not fix all of the warnings in apparmor.d.pod, as I have not come up with a good warning-free way to express the BNF of the language similar in format to what is currently generated. The existing libapparmor warnings (complaints about duplicate =item definition names) are actually a result of passing the second -warnings flag. The integration into libapparmor is suboptimal due to automake's expectation that there will be a test driver program(s) for make check targets; that's why I added the podchecker call to the manpage generation point. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Seth Arnold <seth.arnold@canonical.com> --- changehat/mod_apparmor/Makefile | 3 changehat/mod_apparmor/mod_apparmor.pod | 28 ++- common/Make.rules | 4 libraries/libapparmor/doc/Makefile.am | 7 parser/Makefile | 2 parser/apparmor.d.pod | 275 +++++++++++++------------------- utils/Makefile | 3 utils/aa-cleanprof.pod | 2 utils/aa-complain.pod | 2 utils/aa-decode.pod | 2 utils/aa-easyprof.pod | 69 +++----- utils/aa-enforce.pod | 2 utils/aa-genprof.pod | 2 utils/aa-logprof.pod | 6 utils/aa-sandbox.pod | 64 ++----- utils/logprof.conf.pod | 2 utils/vim/Makefile | 2 17 files changed, 212 insertions(+), 263 deletions(-)
2014-09-15 11:30:47 -07:00
check: check_pod_files
Initial port to python3 for utilities.
2012-06-11 17:56:21 +01:00
#Testing with all pythons
$(call pyalldo, create-apparmor.vim.py > /dev/null)
Subject: add apparmor.vim install target to utils/ install This patch adds a make install target for the generated apparmor.vim file, installing by default into /usr/share/apparmor based on IRC discussions; alternate suggestions welcome. (Installing directly into the vim syntax tree is difficult as the system path by default contains the vim version number.)
2012-03-22 13:27:29 -07:00
rename _clean to pod_clean in Makefiles Since the Makefile cleanup, the _clean target is only used to delete manpages etc. generated from *.pod files. This patch renames the _clean target to pod_clean to make it obvious what it does. Acked-by: John Johansen <john.johansen@canonical.com>
2015-01-30 22:15:53 +01:00
clean: pod_clean
Entire tree: makefile cruft removal - drop the symlink magic of the common/ directory, and just include files directly from there. - update comments indicating required steps to take when including common/Make.rules - drop make clean steps that refer to no longer generated tarballs, specfiles, and symlinks to the common directory/Make.rules. - don't silence clean steps if VERBOSE is set Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Christian "Ghostbuster" Boltz <apparmor@cboltz.de>
2015-01-23 15:52:09 -08:00
rm -f apparmor.vim
Reference in a new issue Copy permalink