From 2537a0e82eefb2d247aaff6e847ea46265e5bc68 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 23 Apr 2025 19:20:04 +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 580813 -> 581532 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 dba6f987480..cbb6df60a9d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -945,7 +945,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ odk_settings \ odk_settings_generated \ $(if $(ENABLE_JAVA), \ - odk_javadoc \ + $(if $(JAVADOC),odk_javadoc) \ odk_uno_loader_classes \ ) \ odk_scripts \ diff --git a/configure.ac b/configure.ac index c241c7f7b0feac13ec1f5d90a2cc6193102e3a21..9ff59153aef96304f4a8a0f2e9b0f4eb5148803e 100644 GIT binary patch delta 665 zcmX@RQ+dvQ<%TVcH~V?H6o4Q)E3qswB|mwxLW9`!`F)In>`;N}h24x&aE^XIqq>0? zP$^gwNTUK!Q)zB$UP)p}W`3TYg060PW=TeVX^Ae>0ELw4_1uhND*i6s3V3z;<(Ev} z_(hr{KP6isIk7l(y5mAdmFW)}7=_^0E6!&Woqh)BI(e}Du{t^s$AhelhuUXbnOYp% zeyX1lh?#(xdHbn;mc?0usdIjQkL)0GqyZ58tJr^~)#(VA{MgIQ?${(CH%)A#>o z5uSek7YnO6XJ(p0NosM4f|3fd$$T@w%2WFP(AJ|!0rhf%l z=&*&EfARuL_UU4OSPUm~$OunXkdU4(aDq_^VxatDW{&ATPk@$8_`_l_UEv4|$Mge# zSQMw*Yy%p*_al(|;SY=M^cG=uiRpFwfn43cEVk3)~>Ajt>rX3J%c#scv8Ymj#GfftYRk`oHXQ_W>6l=A!@r delta 253 zcmbQUU-|4#<%TVcH~ZVGCNcss6A&|RubRj*C2M-Z4;Gc_2VB`WrWdHPvQ8J+z{WZ~ z;Q@>0^lg7xgr`4$&d57m{wE9T^ecZ@^ry4`Wigm8|Byv!y6;~Wnd!NIS>&hZJ!BD? zK0%b3bNYuLKy^TE;?upgnYgAeXk+4?uF%EAGW{)3Z1RKzzUfl`SPZB8|6=i+zUCj$ zB%pqd>2LnANKU`Kft7o@!hfJFn*o!+^uqrvwjy4RVU8~T&Yr>UUO>uLsWP=#Y5Kvp lY$CEy8BH!n=lI}Ir{E9`B(<$|tgUryt##~M>p0}@0|4L-Uj_gG diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 0966fa57746..fdf35505023 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -35,7 +35,7 @@ $(gb_CustomTarget_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 d30c7164776..500348a7ea6 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -43,8 +43,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 8c1728671d9..405d84a72db 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -181,7 +181,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