From df61d7a62d15f812272edef33cfa46ebcb6363ae Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 8 Jul 2020 05:29:17 +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 484295 -> 485023 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 398f68bb983..fa9f77a9da5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -864,7 +864,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 ecb599ca7152ec974ba052759294855add6cfe81..2141f570db42a7efe009a5baca544f933c875018 100644 GIT binary patch delta 596 zcmY*WO=uHA6lO9nn`CREn~k=nZJeyiZnd$83JSW1Vu>`B22sQxmKx2*rp8S$QSoL^ z_28|C&x2q+3ORVN^x(lFg`Ns}@nmU^-g=NKC{kx*a>&5rz4_kvzHfN5u`&F5bNJbN z_Q8s&LY`amg~x?r^{%sY`NhG3Hq?eQnJ4AOT&B~-N0TK(-Al`4CgtQD_F3$x*?~o| zTrb?IxOH*Q_1uSrM!D*VYDwfLr$v{17&VKHpfAbByJ|}de|0oXrXOjWJENoj-{srS zcBJj6ZrxdIT1-Y@wQ2Di-?6irIUj-xfL1YzqG0*_Na)Sr9^ zr{Z)Bf37O~aiAz0YZX%PZi^Eh_>|>{G@SX(6}*hoNqjRTmP(R}?M-gtbBhtieg(qV zi<6DppLiJObxPyJ79aGhFlsuDAiK*2-s+Mvb0!eha}(DlCi54ju3XH?WE*lFSnH?M z>4^VVkG#6u5FL&hDV5s`l*z5s-FDr>085ZH)+=cUTllKRInkJNJvGuZp_a<{vaY1y UM5%8vn;;oM8Omxl5n9Oq170w;p#T5? delta 208 zcmbP#R`&RD*@i8QyEWQlv>1VyX?u(ov)7C1|M*zAr|(M7l^Qk zPZyZR$T$7{Z)UdXi$z$pr@s|o@tm$N%3?4*U6e&}dXx;%qQ#;thSQ(QcQ;VlFx-p4PUoFNWJze%b3;T3_HWsmVIdK*sW(8ul?Q-Jm Gjs5`9c0m0A 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