From 5f8a4f1841039d552247259f13f345f7a2ef3333 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 13 Aug 2025 17:35:20 +0200 Subject: [PATCH] javadoc-optional Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gbp-Pq: Name javadoc-optional.diff --- Repository.mk | 2 +- configure.ac | Bin 532620 -> 533339 bytes odk/CustomTarget_check.mk | 2 +- odk/Module_odk.mk | 6 ++++-- odk/util/check.pl | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Repository.mk b/Repository.mk index 35c0b746c7c..fc8819193fa 100644 --- a/Repository.mk +++ b/Repository.mk @@ -919,7 +919,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ offapi_idl \ udkapi_idl \ $(if $(ENABLE_JAVA), \ - odk_javadoc \ + $(if $(JAVADOC),odk_javadoc) \ odk_uno_loader_classes \ ) \ )) diff --git a/configure.ac b/configure.ac index 0c264c4ddfa5ca6f0c00f90b8cbb36b0dc4e06cd..b9958e2c3ea0000d64c33f396a4390beac258bfd 100644 GIT binary patch delta 571 zcmZ9J&1(};6vcVtO(ruMZ5nGr4E3cJVx?fkb(Ew9F)mVxx==zoHIsBQB~zVIaii5m zM5z+U;^4<5<3{`gimp^tD1>fwp$J02g$s4BE>wJ}p?+Mri+A{)b1(NTJ>&0I_~J5q zYi?G#sFPLgoK~_<6`Ge{453wJA-S($p~7P8j~`W*q^w{uX0n~hKEq3fttF891j|0&0N`uBRQTurNAR7T&S8L}7gV_cG@VXRg@KPF>LL z!qtw+L`$MKJnESAZ6c)CdJ~IQ$sFN{6t7uG-;{Tw`#@5Vdm<~ibc@EoU5Z2$qs$%M zcKFEX-^tB;p*Rk>v=6@96vuU!qB!xvAH?@7q+r<<+Vn@i53gJrM(nN>$Kx)k2(~DO zjjOZ;4Nt%eUnD}NMG?&0m$#wPqP>WIl_Ge0&8K3|DkYoKLxjc+DS-WVD2Vqhn!wB) z1rTae0-sjccBI!q3)h z-Qn5v@$^(~QdOY6k+u%}E0zs>Zc{A!=LCKHQ2t<6xWo}6!~a{<^kgxAER#RFs|VLT Ps(Ze==YQzQON+k%FaE)~ delta 236 zcmcb8OrhtXLc9S>&g8{a_TCKIb?i*L0QzEK<{>omjZ0Z&<@7I9*^Z z3(It;1uVkT3)VC8P0wDyVmRGghfQ$u25H{u4ZqoiroY|A$TR)J0v6lprVCjVr~Axh z;h$c*kVSX;wCgMa(+@3Vu@&}m40CkxclHc+_X1M3N|mX_(-ZHrh)zGfh=o(c(K$Xi b)G0Vb14&u?`9&;1%nHP8+s`jz?`Z%4_90hf diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 0286cc6cdc6..f833c8b36fc 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ + $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) ifneq ($(gb_SUPPRESS_TESTS),) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 16eba69c3e3..0d5fca58d2c 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -42,8 +42,10 @@ endif ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_classes \ - CustomTarget_javadoc \ - GeneratedPackage_odk_javadoc \ + $(if $(JAVADOC),\ + CustomTarget_javadoc \ + GeneratedPackage_odk_javadoc \ + ) \ GeneratedPackage_uno_loader_classes \ )) endif diff --git a/odk/util/check.pl b/odk/util/check.pl index 377c8be0dc5..fc0daf1ed53 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -184,7 +184,7 @@ if (-d "$SdkDir") { # improvement required my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; - if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { + if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") { print "check java docu: "; if (check_dir("docs/java/ref")) { if (!check_file("docs/java/ref/index.html")) { -- 2.30.2