From 06621ba387f8d45e0c273f77f18573eb52cd66b8 Mon Sep 17 00:00:00 2001 From: Pauli Date: Fri, 21 May 2021 15:24:57 +1000 Subject: configurations: update template makefiles to install documentation images Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/15399) --- Configurations/unix-Makefile.tmpl | 80 +++++++++++++++++++++++++++++++++++- Configurations/windows-makefile.tmpl | 30 +++++++++++++- 2 files changed, 106 insertions(+), 4 deletions(-) (limited to 'Configurations') diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 59e404b5c7..6fdd761bce 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -207,6 +207,22 @@ MISC_SCRIPTS={- && $unified_info{attributes}->{scripts}->{$_}->{misc} } @{$unified_info{scripts}})) -} +IMAGEDOCS1={- + join(" \\\n" . ' ' x 10, + fill_lines(" ", $COLUMNS - 10, + @{$unified_info{imagedocs}->{man1}})) -} +IMAGEDOCS3={- + join(" \\\n" . ' ' x 10, + fill_lines(" ", $COLUMNS - 10, + @{$unified_info{imagedocs}->{man3}})) -} +IMAGEDOCS5={- + join(" \\\n" . ' ' x 10, + fill_lines(" ", $COLUMNS - 10, + @{$unified_info{imagedocs}->{man5}})) -} +IMAGEDOCS7={- + join(" \\\n" . ' ' x 10, + fill_lines(" ", $COLUMNS - 10, + @{$unified_info{imagedocs}->{man7}})) -} HTMLDOCS1={- join(" \\\n" . ' ' x 10, fill_lines(" ", $COLUMNS - 10, @@ -998,7 +1014,7 @@ uninstall_man_docs: build_man_docs $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man7; \ done -install_html_docs: build_html_docs +install_html_docs: install_image_docs build_html_docs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man1 @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man3 @@ -1034,7 +1050,7 @@ install_html_docs: build_html_docs chmod 644 $(DESTDIR)$(HTMLDIR)/man7/$$fn; \ done -uninstall_html_docs: +uninstall_html_docs: uninstall_image_docs @$(ECHO) "*** Uninstalling HTML manpages" @set -e; for x in dummy $(HTMLDOCS1); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ @@ -1061,6 +1077,66 @@ uninstall_html_docs: $(RM) $(DESTDIR)$(HTMLDIR)/man7/$$fn; \ done +install_image_docs: + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man1/img + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man3/img + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man5/img + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man7/img + @set -e; for x in dummy $(IMAGEDOCS1); do \ + if [ "$$x" = "dummy" ]; then continue; fi; \ + fn=`basename $$x`; \ + $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man1/img/$$fn"; \ + cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \ + done + @set -e; for x in dummy $(IMAGEDOCS3); do \ + if [ "$$x" = "dummy" ]; then continue; fi; \ + fn=`basename $$x`; \ + $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man3/img/$$fn"; \ + cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \ + done + @set -e; for x in dummy $(IMAGEDOCS5); do \ + if [ "$$x" = "dummy" ]; then continue; fi; \ + fn=`basename $$x`; \ + $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man5/img/$$fn"; \ + cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \ + done + @set -e; for x in dummy $(IMAGEDOCS7); do \ + if [ "$$x" = "dummy" ]; then continue; fi; \ + fn=`basename $$x`; \ + $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ + cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \ + chmod 644 $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \ + done + +uninstall_image_docs: + @set -e; for x in dummy $(IMAGEDOCS1); do \ + if [ "$$x" = "dummy" ]; then continue; fi; \ + fn=`basename $$x`; \ + $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man1/img/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man1/img/$$fn; \ + done + @set -e; for x in dummy $(IMAGEDOCS3); do \ + if [ "$$x" = "dummy" ]; then continue; fi; \ + fn=`basename $$x`; \ + $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man3/img/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man3/img/$$fn; \ + done + @set -e; for x in dummy $(IMAGEDOCS5); do \ + if [ "$$x" = "dummy" ]; then continue; fi; \ + fn=`basename $$x`; \ + $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man5/img/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man5/img/$$fn; \ + done + @set -e; for x in dummy $(IMAGEDOCS7); do \ + if [ "$$x" = "dummy" ]; then continue; fi; \ + fn=`basename $$x`; \ + $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \ + $(RM) $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \ + done + # Developer targets (note: these are only available on Unix) ######### # It's important that generate_buildinfo comes after ordinals, as ordinals diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index a7123f6a5e..632e5ce4b5 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -145,6 +145,14 @@ MISC_SCRIPTS={- && $unified_info{attributes}->{scripts}->{$_}->{misc} } @{$unified_info{scripts}}) -} +IMAGEDOCS1={- our @IMAGEDOCS1 = @{$unified_info{imagedocs}->{man1}}; + join(" ", @IMAGEDOCS1) -} +IMAGEDOCS3={- our @IMAGEDOCS3 = @{$unified_info{imagedocs}->{man3}}; + join(" ", @IMAGEDOCS3) -} +IMAGEDOCS5={- our @IMAGEDOCS5 = @{$unified_info{imagedocs}->{man5}}; + join(" ", @IMAGEDOCS5) -} +IMAGEDOCS7={- our @IMAGEDOCS7 = @{$unified_info{imagedocs}->{man7}}; + join(" ", @IMAGEDOCS7) -} HTMLDOCS1={- our @HTMLDOCS1 = @{$unified_info{htmldocs}->{man1}}; join(" ", @HTMLDOCS1) -} HTMLDOCS3={- our @HTMLDOCS3 = @{$unified_info{htmldocs}->{man3}}; @@ -595,7 +603,7 @@ install_programs: install_runtime_libs build_programs uninstall_runtime: -install_html_docs: build_html_docs +install_html_docs: install_image_docs build_html_docs @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) @echo *** Installing HTML docs @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man1" @@ -611,7 +619,25 @@ install_html_docs: build_html_docs @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\doc\html\man7\*.html \ "$(INSTALLTOP)\html\man7" -uninstall_html_docs: +uninstall_html_docs: uninstall_image_docs + +install_image_docs: + @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 ) + @echo *** Installing HTML images + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man1\img" + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man3\img" + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man5\img" + @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\html\man7\img" + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man1\img\*.png \ + "$(INSTALLTOP)\html\man1\img" + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man3\img\*.png \ + "$(INSTALLTOP)\html\man3\img" + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man5\img\*.png \ + "$(INSTALLTOP)\html\man5\img" + @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(SRCDIR)\doc\man7\img\*.png \ + "$(INSTALLTOP)\html\man7\img" + +uninstall_image_docs: # Helper targets ##################################################### -- cgit v1.2.3