(openoffice) branch trunk updated: Report Builder: fix the commons-logging Class-Path with system Pentaho jars, and the BSD sed failure

[jim]

This is an automated email from the ASF dual-hosted git repository.

jimjag pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 55adca3b56 Report Builder: fix the commons-logging Class-Path with 
system Pentaho jars, and the BSD sed failure
55adca3b56 is described below

commit 55adca3b5634862672eb3b8bd7f242c8984dfe41
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Thu Oct 22 09:48:29 2026 -0400

    Report Builder: fix the commons-logging Class-Path with system Pentaho 
jars, and the BSD sed failure
    
    The manifest still named commons-logging-1.1.1.jar after the 1.1.3 update, 
so the extension failed to install.
---
 .../java/com/sun/star/report/pentaho/makefile.mk        | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk 
b/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
index d8fcf6d9b8..55c27832f2 100644
--- a/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+++ b/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
@@ -110,20 +110,17 @@ $(JARTARGETN) : $(COMP) $(PROPERTYFILES) $(CSSFILES) 
$(XSDFILES) $(TXTFILES) $(X
 fix_system_libs: $(JARMANIFEST)
        @echo "Fix Java Class-Path entry for libraries from system."
 .IF ("$(SYSTEM_JFREEREPORT)" != "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES")
-       @$(SED) -r -e 
"s#commons-logging-1.1.1.jar#file://$(COMMONS_LOGGING_JAR)#" \
-               -i $<
+       @$(PERL) -pi -e 
"s#commons-logging-1\.1\.3\.jar#file://$(COMMONS_LOGGING_JAR)#" $<
 .ELIF ("$(SYSTEM_JFREEREPORT)" == "YES" && "$(SYSTEM_APACHE_COMMONS)" != "YES")
-       @$(SED) '/flute/,/sac/d' -i 
../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
-       @$(SED) -r -e "s#^Class-Path.*#\0\n  file://$(LIBBASE_JAR)\n  
file://$(SAC_JAR)\n  file://$(LIBXML_JAR)\n\
+       @$(PERL) -ni -e 'print unless /flute/.../sac/' $<
+       @$(PERL) -pi -e "s#^(Class-Path.*)#\$$1\n  file://$(LIBBASE_JAR)\n  
file://$(SAC_JAR)\n  file://$(LIBXML_JAR)\n\
   file://$(FLUTE_JAR)\n  file://$(JFREEREPORT_JAR)\n  
file://$(LIBLAYOUT_JAR)\n  file://$(LIBLOADER_JAR)\n  
file://$(LIBFORMULA_JAR)\n\
-  file://$(LIBREPOSITORY_JAR)\n  file://$(LIBFONTS_JAR)\n  
file://$(LIBSERIALIZER_JAR)\n  commons-logging-1.1.1.jar#" \
-       -i $<
+  file://$(LIBREPOSITORY_JAR)\n  file://$(LIBFONTS_JAR)\n  
file://$(LIBSERIALIZER_JAR)\n  commons-logging-1.1.3.jar#" $<
 .ELIF ("$(SYSTEM_JFREEREPORT)" == "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES")
-       @$(SED) '/flute/,/sac/d' -i 
../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
-       @$(SED) -r -e "s#^Class-Path.*#\0\n  file://$(LIBBASE_JAR)\n  
file://$(SAC_JAR)\n  file://$(LIBXML_JAR)\n\
+       @$(PERL) -ni -e 'print unless /flute/.../sac/' $<
+       @$(PERL) -pi -e "s#^(Class-Path.*)#\$$1\n  file://$(LIBBASE_JAR)\n  
file://$(SAC_JAR)\n  file://$(LIBXML_JAR)\n\
   file://$(FLUTE_JAR)\n  file://$(JFREEREPORT_JAR)\n  
file://$(LIBLAYOUT_JAR)\n  file://$(LIBLOADER_JAR)\n  
file://$(LIBFORMULA_JAR)\n\
-  file://$(LIBREPOSITORY_JAR)\n  file://$(LIBFONTS_JAR)\n  
file://$(LIBSERIALIZER_JAR)\n  file://$(COMMONS_LOGGING_JAR)#" \
-       -i $<
+  file://$(LIBREPOSITORY_JAR)\n  file://$(LIBFONTS_JAR)\n  
file://$(LIBSERIALIZER_JAR)\n  file://$(COMMONS_LOGGING_JAR)#" $<
 .ENDIF
 
 $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties