From dfcc61c403e151b39b9d5cfbe7090b88e1c8cd50 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Tue, 28 Nov 2023 20:36:58 +0100 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 487611 -> 488339 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 38fd2475e20..0718b51c8db 100644 --- a/Repository.mk +++ b/Repository.mk @@ -865,7 +865,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 \ odk_unowinreg \ ) \ diff --git a/configure.ac b/configure.ac index 36de7f6bd8f84f8145b7cfe81779ee4daa0fc9f2..a1d117d933d85266d87cba8a442e2898d9508b36 100644 GIT binary patch delta 578 zcmZXRKWGzC9LITgzg&_t7pgI5a@U%dXi4C%5K$~Bg;oP%I#elj(Ga7#v$5qanpANs zI0Re_M)M_ZZca{x40RBkyQqsor5!}U!C75=NmD_5@a6G-e16~GpSQU?(fK;DzQJDF zQI(5x^>*c6rRv`-bzVG=cYbU~BKK>}<*88=vpHr2_a9pp%TiJB_-V0Y*-@BRYmLf{ zRj0vkIi7R3(yaL&_g%hFnCC;dV6$_0c!s61onk@oqwK(6%XE&#(6d-9HSDHj+k0IN znkbJ7%sg-!rB=^oLQ=nH%iZr|e5%4T#~p7_xa?O~u=Rmb@b6Fn>%Zg#9&eELtWE?s zNr%v~B@Oksq@q15h`diEi&4uDAuV*32h~yV#i_GJ)``N62fMHG@Ldl4=%|e zxCW)6s$}AcAyU^4Qlj%J8p5RrDfnp6G|C!XtlErtrJrfJ-^kyj* zz3E$}SPZ7GW?~VV{#%MgW_p7-3(ItQX%^|}UK<%jrYq#Ka7|B;W|5kH>ngL@^!uf( ztkV@VfJ){`vj|UD_{YjO{kSxX;ZzG&!O8WU%F{2rVB?tXBg0|~F=(m`i|q6R5-j}F xFUqj!PTw|*QDC~9EKoLCmPK;dhE5VLL9mSfKd1ps)uKSKZj diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index b9dc8d35807..d3b8fc31109 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -35,7 +35,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) \ $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg)) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 410f8cf8ef1..363a8a41dea 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ $(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\ CustomTarget_classes \ - CustomTarget_javadoc \ - GeneratedPackage_odk_javadoc \ GeneratedPackage_uno_loader_classes \ $(if $(filter WNT,$(OS)),Library_unowinreg) \ Package_unowinreg \ + $(if $(JAVADOC),\ + CustomTarget_javadoc \ + GeneratedPackage_odk_javadoc \ + ) \ )) endif diff --git a/odk/util/check.pl b/odk/util/check.pl index be03d40ff58..bed51e1c7a6 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