From 1dcb79912722e9d040fbbe94b5dd6f37633e52ed Mon Sep 17 00:00:00 2001
From: Dominik Stadler <dominik.stadler@gmx.at>
Date: Tue, 7 Oct 2025 22:20:54 +0200
Subject: [PATCH] Source-rebuild testing: Fix building actual source-pacakge
 and improve output

Adjust for the actual build-directory where sources were extracted
Also print out how the necessary source-package can be created
---
 poi-integration/build.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/poi-integration/build.xml b/poi-integration/build.xml
index 5f7db9314f..e3974c50e5 100644
--- a/poi-integration/build.xml
+++ b/poi-integration/build.xml
@@ -27,11 +27,14 @@ Before running this, you should execute the "jar" target in the main build.gradl
     <property name="dist" value="../build/dist"/>
     <property name="build" value="../build/distsourcebuild"/>
 
-    <condition property="gradle.executable" value="../gradlew.bat" else="../gradlew">
+    <!-- Gradle is executed in ../build/poi-<version>, so three ".." are needed to use gradle from the root-dir -->
+    <condition property="gradle.executable" value="../../../gradlew.bat" else="../../../gradlew">
         <os family="windows" />
     </condition>
 
     <target name="init" depends="">
+        <echo message="Using Ant: ${ant.version} from ${ant.home}, Ant detected Java ${ant.java.version} (may be different than actual Java sometimes...)" />
+        <echo message="Using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}" />
     </target>
 
     <target name="run" depends="init,runSourceBuild,runCompileTest"/>
@@ -55,7 +58,7 @@ Before running this, you should execute the "jar" target in the main build.gradl
             </last>
         </pathconvert>
 
-        <echo message="Found source package at ${srcpackage}"/>
+        <echo message="Found source package with pattern 'apache-poi-src-*.zip' in ${dist} at '${srcpackage}'. Run Gradle-task 'srcDistZip' in the main directory if it is missing"/>
         <unzip src="${srcpackage}" dest="${build}" failOnEmptyArchive="true"/>
 
         <!-- look for name of sub-dir, do this dynamically as it changes with every (beta|rc)-release -->
@@ -74,7 +77,7 @@ Before running this, you should execute the "jar" target in the main build.gradl
         <!-- finally call Ant on the extracted source to check if we can build the packages -->
         <echo message="Building in temporary dir ${dirversion}/"/>
         <!--ant dir="${dirversion}" target="assemble" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/-->
-        <exec executable="${gradle.executable}" dir="." failonerror="true">
+        <exec executable="${gradle.executable}" dir="${dirversion}" failonerror="true">
             <arg value="assemble" />
         </exec>
     </target>