sigrok-cross-mingw: Temporarily skip Pulseview PDF manual for Windows CI builds.
authorGerhard Sittig <gerhard.sittig@gmx.net>
Sat, 22 Jan 2022 15:56:10 +0000 (16:56 +0100)
committerGerhard Sittig <gerhard.sittig@gmx.net>
Sat, 22 Jan 2022 15:56:10 +0000 (16:56 +0100)
Currently Windows CI jobs fail on sigrok.org build machines in the
Pulseview 'make manual-pdf' step. Intentionally break the lookup of the
external utility from the cross MinGW script, to skip the PDF creation.

This temporary evil hack needs to get reverted when the actual cause of
the failed build got addressed. The approach of the sigrok-util patch
keeps all other Pulseview builds unaffected.

cross-compile/mingw/pulseview-manual-pdf-hack.patch [new file with mode: 0644]
cross-compile/mingw/sigrok-cross-mingw

diff --git a/cross-compile/mingw/pulseview-manual-pdf-hack.patch b/cross-compile/mingw/pulseview-manual-pdf-hack.patch
new file mode 100644 (file)
index 0000000..a13d932
--- /dev/null
@@ -0,0 +1,34 @@
+From f174de8d8dbe6c51af95d308ff92367ba5649061 Mon Sep 17 00:00:00 2001
+From: Gerhard Sittig <gerhard.sittig@gmx.net>
+Date: Sat, 22 Jan 2022 16:43:04 +0100
+Subject: [PATCH] HACK manual: intentionally break the lookup of the PDF
+ creation utility
+
+Search for the asciidoctor-pdf(1) utility under a name which won't be
+found. Which results in an empty skeleton make(1) rule for the PDF file
+creation which won't fail. Which hopefully unbreaks Windows installer
+creation from CI builds.
+
+This is a temporary evil hack which needs to get reverted when the
+actual issue got addressed which causes the asciidoctor-pdf execution
+to fail on the sigrok.org build machine.
+---
+ manual/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
+index c425f36b3bdd..480ad0569d4b 100644
+--- a/manual/CMakeLists.txt
++++ b/manual/CMakeLists.txt
+@@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 2.8.12)
+ # External dependencies, required and optional tools.
+ find_program(ASCIIDOCTOR_EXECUTABLE NAMES asciidoctor)
+-find_program(ASCIIDOCTOR_PDF_EXECUTABLE NAMES asciidoctor-pdf)
++find_program(ASCIIDOCTOR_PDF_EXECUTABLE NAMES asciidoctor-pdf-notfound)
+ # Tunables.
+ set(STYLES_DIR "asciidoctor-stylesheet-factory/stylesheets")
+-- 
+2.29.0
+
index 2a4b29db5325195232e78399771df1f1f0c9653c..0b28cf1fcccf46d0d411060344683e1caa1731bd 100755 (executable)
@@ -250,6 +250,7 @@ cd ..
 $ECHO "component pulseview ..."
 $GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
+patch -p1 < ../../pulseview-manual-pdf-hack.patch
 cp ../../FileAssociation.nsh contrib
 $CMAKE \
        -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \