From f70a83f186d3ab7adf769187ac31cfe08ff1c2fc Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sat, 12 Nov 2022 08:28:58 +0000 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 532001 -> 532720 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 907e41774619c3c7fadee30e63074835210753d9..77e1527b842996142292e5f212ad117657c8c41e 100644 GIT binary patch delta 568 zcmZ3uN8!Ukg@!GRKG}R+3P2E@l~|UTlAjzqdEsHv>G#DLd3ee*OEPq!!qWq?7^T=@ zoWd+dbrvt6hUs&&7?stb!U`#w#feEdsl^KEsd=eIi6xo&c?$Vy3jQwM3NXcz(;2fF zHK)hMFdD;6)5>C0lLtE@R!0Zo7?9QRP-AT?Q;TEUZL=AHm;>LP=_IiGq>}vMG}n3d&43nZsf{y*!tVZ@OPFE8Fz_ zjVv6~>*ugYO#hX_!aIGz92V8d0irC^kIrF{pT6rpi_G)`cUicmGtFg@n*RC|i`eu7 zo0++$o6lttpPrDw%s>6WOrZYQxhw|LBOU<7KBTd5OrGFpI{oBa7Tf6``j|PUv&~~s zoSqrQDm~q39*g00*ZFJ`lkW+0OfQ}XR3Y0B)SfVtg=PAdc`TwHpjZHbv`j8eh18tl zR4z_Vh0?s@)Di_R$1q11e`laLP!g&JtOCSFRg#uD{lPpIDRD$7Ks9>?yL-9#PiM4X rmQY65!sX~39~|lw9HIeLtjRTfK{vZ%yYze(AZ7((w(ZjM+1cs=?^C%3 delta 210 zcmexxP+{R7g@!GRKH2SWa~Oe`35c1uzs+IEGMGMLCX34Sxw{xSrt`b9aZQ*0&LlBi zcNUA_^s{qW#3$Fta7-7U$6`D^pqWKtdfGf7ajS}*cY6Ok7RBjX=CR06?{Z=inf`tr z&=BiYY|_(>=d*}Uzp#;!Z+gOf7Q^W?X0v!s|1_V)V7k@Gd;N_}gDCWC3DUAZFYC JY9TvYJph4cP^ka_ 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