mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] ptxd_make_world_license: handle PDFs in _LICENSE_FILES
@ 2021-07-07 13:53 Roland Hieber
  2021-07-07 13:53 ` [ptxdist] [PATCH 2/2] python3-pycryptodomex: fix license identifier Roland Hieber
  0 siblings, 1 reply; 5+ messages in thread
From: Roland Hieber @ 2021-07-07 13:53 UTC (permalink / raw)
  To: ptxdist; +Cc: Roland Hieber

If PDF files are found in the _LICENSE_FILES variable, include them as
literal pages in license-report.pdf with the 'pdfpages' package, which
nowadays comes preinstalled with most LaTeX distributions.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 scripts/lib/ptxd_make_license_report.sh |  2 ++
 scripts/lib/ptxd_make_world_license.sh  | 41 ++++++++++++++++---------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/scripts/lib/ptxd_make_license_report.sh b/scripts/lib/ptxd_make_license_report.sh
index c92dc725d1f7..bed5bd1d43c5 100644
--- a/scripts/lib/ptxd_make_license_report.sh
+++ b/scripts/lib/ptxd_make_license_report.sh
@@ -18,6 +18,7 @@ ptxd_make_license_report_header() {
 	\usepackage{tikz}
 	\usepackage{adjustbox}
 	\usepackage{spverbatim}
+	\usepackage{pdfpages}
 	\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue}
 
 	%% Something like this may be needed depending on the package list
@@ -209,6 +210,7 @@ ptxd_make_license_compliance_header() {
 	\usepackage{tikz}
 	\usepackage{adjustbox}
 	\usepackage{spverbatim}
+	\usepackage{pdfpages}
 	\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue}
 
 	%% Something like this may be needed depending on the package list
diff --git a/scripts/lib/ptxd_make_world_license.sh b/scripts/lib/ptxd_make_world_license.sh
index f68b75339cb2..785254603765 100644
--- a/scripts/lib/ptxd_make_world_license.sh
+++ b/scripts/lib/ptxd_make_world_license.sh
@@ -188,21 +188,32 @@ ptxd_make_world_license_write() {
 	    continue
 	fi
 	title="$(basename "${license}")"
-	cat <<- EOF
-		\section{$(ptxd_make_latex_escape "${title}")${guess}}
-		\begin{small}
-		\begin{spverbatim}
-	EOF
-	if [ -f "${license}.utf-8" ]; then
-	    cat "${license}.utf-8"
-	else
-	    cat "${license}"
-	fi | sed -e 's/\f/\n/g'
-	check_pipe_status || return
-	cat <<- EOF
-		\end{spverbatim}
-		\end{small}
-	EOF
+	case "${license}" in
+	    *.pdf)
+		cat <<- EOF
+			\section{$(ptxd_make_latex_escape "${title}")${guess}}
+			\includepdf[pages=-]{${license}}
+		EOF
+		;;
+	    *)
+		cat <<- EOF
+			\section{$(ptxd_make_latex_escape "${title}")${guess}}
+			\begin{small}
+			\begin{spverbatim}
+		EOF
+
+		if [ -f "${license}.utf-8" ]; then
+		    cat "${license}.utf-8"
+		else
+		    cat "${license}"
+		fi | sed -e 's/\f/\n/g'
+		check_pipe_status || return
+		cat <<- EOF
+			\end{spverbatim}
+			\end{small}
+		EOF
+		;;
+	esac
     done
 }
 export -f ptxd_make_world_license_write
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-08 18:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-07 13:53 [ptxdist] [PATCH 1/2] ptxd_make_world_license: handle PDFs in _LICENSE_FILES Roland Hieber
2021-07-07 13:53 ` [ptxdist] [PATCH 2/2] python3-pycryptodomex: fix license identifier Roland Hieber
2021-07-07 14:38   ` Michael Olbrich
2021-07-08 18:46     ` [ptxdist] [PATCH] fixup! ptxd_make_world_license: handle PDFs in _LICENSE_FILES Roland Hieber
2021-07-08 18:49       ` Roland Hieber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox