From 4f09d74afdaaa263a8920e66bcfedfac4eb08d00 Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Mon, 9 Mar 2026 17:50:42 +0100
Subject: [PATCH] fix JAVINTERPRETER path in verapdf.sh verification script

wsl-as-helper case uses a post-script for AC_CONFIG_FILES for
config_host.mk to replace wsl-style paths in the form of
/mnt/<driveletter>/ to <driveletter>:/ for use by the build in the
windows-realm.
For variables that are used in the other generated files, the paths
needs to be converted explicitly/manually

this change partially undoes 9add00445618057e16e0b7cf48c10bae255d49d2
There's no need for a TARFILE_LOCATION_NATIVE / the build already uses
the native form, it was just another case of the replacement only being
done for the config_host.mk, not in the generated scripts.

(since configure runs in the linux realm, it needs the unix-style paths
as seen from within wsl, the actual build is then run in the windows
realm and uses windows paths (in mixed-form, i.e. forward slashes))

Change-Id: I5252ed134b0a338cf8812ad4c84022b5b43daf32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201297
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
---
 bin/odfvalidator.sh.in | 2 +-
 bin/officeotron.sh.in  | 2 +-
 bin/verapdf.sh.in      | 2 +-
 configure.ac           | 8 +++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/odfvalidator.sh.in b/bin/odfvalidator.sh.in
index 99b2207ad138..a70cf8cd5b36 100644
--- a/bin/odfvalidator.sh.in
+++ b/bin/odfvalidator.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar @TARFILE_LOCATION_NATIVE@/@ODFVALIDATOR_JAR@ "$@"
+@JAVAINTERPRETER@ -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar @TARFILE_LOCATION@/@ODFVALIDATOR_JAR@ "$@"
diff --git a/bin/officeotron.sh.in b/bin/officeotron.sh.in
index 935ec5809cdd..3d60c798deef 100644
--- a/bin/officeotron.sh.in
+++ b/bin/officeotron.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -jar @TARFILE_LOCATION_NATIVE@/@OFFICEOTRON_JAR@ "$@"
+@JAVAINTERPRETER@ -jar @TARFILE_LOCATION@/@OFFICEOTRON_JAR@ "$@"
diff --git a/bin/verapdf.sh.in b/bin/verapdf.sh.in
index 4de68605b66f..859f4dc2e9d8 100644
--- a/bin/verapdf.sh.in
+++ b/bin/verapdf.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-@JAVAINTERPRETER@ -jar @TARFILE_LOCATION_NATIVE@/@VERAPDF_JAR@ --nonpdfext "$@"
+@JAVAINTERPRETER@ -jar @TARFILE_LOCATION@/@VERAPDF_JAR@ --nonpdfext "$@"
diff --git a/configure.ac b/configure.ac
index 37ef3a40ed59..c3c367fc9aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6697,10 +6697,7 @@ else
     PathFormat "${absolute_path}"
     TARFILE_LOCATION="${formatted_path_unix}"
 fi
-PathFormat "$TARFILE_LOCATION"
-TARFILE_LOCATION_NATIVE="$formatted_path"
 AC_SUBST(TARFILE_LOCATION)
-AC_SUBST(TARFILE_LOCATION_NATIVE)
 
 AC_MSG_CHECKING([whether we want to fetch tarballs])
 if test "$enable_fetch_external" != "no"; then
@@ -16292,6 +16289,11 @@ if test -n "$WSL_ONLY_AS_HELPER"; then
     SRC_ROOT="$formatted_path"
     PathFormat "$BUILDDIR"
     BUILDDIR="$formatted_path"
+    # TARFILE_LOCATION and JAVAINTERPRETER are used in the validator scripts
+    PathFormat "$TARFILE_LOCATION"
+    TARFILE_LOCATION_="$formatted_path"
+    PathFormat "$JAVAINTERPRETER"
+    JAVAINTERPRETER="$formatted_path"
     # git-bash has (gnu) tar, curl and sha256sum
     CURL="curl.exe"
     WGET=