From 217df7e0bfef4aea30453ad2595702abecca57d7 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Wed, 3 Jan 2024 13:52:35 +0700
Subject: [PATCH] Remove 'imagesdir' from Asciidoctor Maven config

User relative paths for images instead.

In one case, we need to copy images from a subdirectory one level up,
because otherwise the images are only found in the included document,
but not in the single-page one including it from the subdirectory. In
all other cases, included ADOCs are located in the same directory as the
including document.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 docs/pom.xml | 24 ++++++++++++++++++++++++
 pom.xml      |  7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index e6c256dd9..d0726a217 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,6 +22,30 @@
 
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-images-compiler-weaver</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/html/developer</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>${project.basedir}/developer/compiler-weaver</directory>
+                      <includes>
+                        <include>*.gif</include>
+                      </includes>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.asciidoctor</groupId>
             <artifactId>asciidoctor-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 3b10e3bd1..3fd4a5ff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,6 +302,11 @@
 					<artifactId>maven-install-plugin</artifactId>
 					<version>2.5.2</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>3.3.1</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
@@ -419,7 +424,7 @@
 					<configuration>
 						<attributes>
 							<source-highlighter>coderay</source-highlighter>
-							<imagesdir>./images</imagesdir>
+							<!--<imagesdir>./images</imagesdir>-->
 							<toc>left</toc>
 							<icons>font</icons>
 						</attributes>
-- 
2.39.5