diff options
author | Siri Hansen <[email protected]> | 2018-07-13 12:23:01 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2018-07-13 12:23:01 +0200 |
commit | 6ff0857f6385848248f38e6315881f6ffc44729f (patch) | |
tree | 56e63d6888873877b3858cd2a6ff6566c7510220 /lib/kernel/doc/src/Makefile | |
parent | adb0b077e7ee5b0d9b140bb985b56a43d82927cd (diff) | |
parent | 48824be3d833b13a35b92652df372c6ce3c190a0 (diff) | |
download | otp-6ff0857f6385848248f38e6315881f6ffc44729f.tar.gz otp-6ff0857f6385848248f38e6315881f6ffc44729f.tar.bz2 otp-6ff0857f6385848248f38e6315881f6ffc44729f.zip |
Merge branch 'siri/logger/post-21/OTP-15132' into maint
* siri/logger/post-21/OTP-15132:
[logger] Allow setting kernel parameter 'logger_level' to 'all'
[kernel] Reduce risk of dead lock when terminating logger_sup
[logger] Fix regexp replacement for unicode strings
Update proc_lib:report_cb to obey logger formatter's size limiting params
[logger] Allow report callback with two arguments returning a string
Don't call report_cb from cth_log_redirect - formatter does that
Add legacy test of sasl_report_file_h and size limiting
[logger] Remove compiler warnings in test
[logger] Fix problem with test cases waiting for handler restart
[logger] Add ?LOG macro which takes Level as argument
[logger] Improve spec for set_handler_config/3 and set_primary_config/2
[logger] Generate .png file from .dia
[logger] Update documentation
Diffstat (limited to 'lib/kernel/doc/src/Makefile')
-rw-r--r-- | lib/kernel/doc/src/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile index f34eee71ba..fceba14515 100644 --- a/lib/kernel/doc/src/Makefile +++ b/lib/kernel/doc/src/Makefile @@ -84,6 +84,7 @@ XML_CHAPTER_FILES = \ BOOK_FILES = book.xml +# The .png file is generated from a .dia file with target 'update_png' IMAGE_FILES = \ logger_arch.png @@ -112,6 +113,17 @@ SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml) TOP_SPECS_FILE = specs.xml # ---------------------------------------------------- +# FIGURES +# ---------------------------------------------------- +# In order to update the figures you have to have both dia +# and imagemagick installed. +# The generated .png file must be committed. + +update_png: + dia --export=logger_arch.eps logger_arch.dia + convert logger_arch.eps -resize 65% logger_arch.png + +# ---------------------------------------------------- # FLAGS # ---------------------------------------------------- XML_FLAGS += @@ -147,7 +159,7 @@ clean clean_docs: rm -f $(MAN6DIR)/* rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo) rm -f $(SPECDIR)/* - rm -f errs core *~ + rm -f errs core *~ *.eps $(SPECDIR)/specs_erl_prim_loader_stub.xml: $(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \ |