From c778f2f07ba339adf93dcbcea26dad2119f40d40 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 21 May 2020 12:43:43 +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 467575 -> 468303 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 5b837ec5443..e447757bcb8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -863,7 +863,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 f04c281cb000157881843d31d1173ceb7ec0bbc0..26d3c5a28d155496a49711bdd8156fe6052c8828 100644 GIT binary patch delta 532 zcmex>0a`TQtU9! zbtOi17B8Us>3+(LlGA0B8M!#2atbMvC+rmC@OSZ6fGKdA&Lqlc4A(qCiBU}+Y-OyD z4#aAZP4Q3zY%5cXW7`)iGXgQw_QlG~J$J+vbQ2YnR8sR2lX6ny^HZ{w6clY0^75xQ zE@u&$Zg-4{bE*%E$Mg?1j2zSRez35^t#S-ul9@V%#dx~r6;{6K?SGm1rru|fn7&Ju zjdvO&i|TZT+l(yJRT)|2r@wM#k(_=jh=q505+jS$^w&l#{L>GdX6Bt1#lkXuIwOnt z^bOyb#is9JWHFrn+=xXOB*`;fe-E?fv{OKaCKHS8bb$jb9MjX7SQMxCJY?pW{^2>3 z@bpPcKnWHD*ylh delta 206 zcmX?qO6L0!nT9Qlo0QvwRT+VpX?w6LbM2k!`rT~Y(|LEXa!kK>oQZ3C^&@79>FdN< zd8a2ZvxrT%XJX-9d_!xIo&Zrk{Sn$Txk%e`dky^O#wLr!UZD;+uY)nZNEQ|Yh}NkrEV5G% zu<%d6$ikvK{m2hSf$4IrEVk2=Sy?2fAJ1dspMI5&^jRlBVftYQ(HXFN&JOE8o BK~w+$ diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index f0b63489f05..2d9d5ee6dcb 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