diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:47 +0000 |
| commit | 91fe6b97952aa6f7cef58327fd085a17db38ad95 (patch) | |
| tree | 7a4412295bfb80e15a4936fe67d4bd7b96458ce8 /ridljar | |
| parent | Releasing progress-linux version 4:24.2.1-4~progress7.99u1. (diff) | |
| download | libreoffice-91fe6b97952aa6f7cef58327fd085a17db38ad95.tar.xz libreoffice-91fe6b97952aa6f7cef58327fd085a17db38ad95.zip | |
Merging upstream version 4:24.2.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ridljar')
| -rw-r--r-- | ridljar/Jar_libreoffice.mk | 6 | ||||
| -rw-r--r-- | ridljar/Jar_unoloader.mk | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk index 76a56eedc0..77397bc246 100644 --- a/ridljar/Jar_libreoffice.mk +++ b/ridljar/Jar_libreoffice.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \ $(eval $(call gb_Jar_add_packagedirs,libreoffice,\ $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \ $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \ - $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class \ + $(if $(MODULAR_JAVA),$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class) \ )) -$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ ridljar/source/libreoffice/module-info \ -)) +))) $(eval $(call gb_Jar_add_sourcefiles,libreoffice,\ ridljar/com/sun/star/comp/bridgefactory/BridgeFactory \ diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk index 2acf20b5b2..b7fcbc105d 100644 --- a/ridljar/Jar_unoloader.mk +++ b/ridljar/Jar_unoloader.mk @@ -14,13 +14,13 @@ $(eval $(call gb_Jar_set_packageroot,unoloader,com)) $(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest)) # the module-info.class is manually added here since it's not in "com" dir -$(eval $(call gb_Jar_add_packagedirs,unoloader,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_packagedirs,unoloader,\ $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,unoloader))/module-info.class \ -)) +))) -$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ ridljar/source/unoloader/module-info \ -)) +))) $(eval $(call gb_Jar_add_sourcefiles,unoloader,\ ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \ |