From b501bd99a3d29fd1ee2c2419f1f148ecb0704d8b Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 2 Jun 2022 16:51:28 +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 527791 -> 528510 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 c68c46ed67b..009c3bdff2d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -860,7 +860,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 ef950d1e20d6a2fd2edaf566b1b68c2b19a04cc7..bb611d40d92014363364b99223263a12ff43c1de 100644 GIT binary patch delta 589 zcmZ2KTjAdVg@!GRzf*X*6o4Q)E3qswB|mxch7vIeun1UGSGPQ~BtsV}IsJb!qZB)g zqmaU=&f*2sHr*$MQJE7etdKIf?xProzl*m5Oipt8h7?B4>4Fm&6{qWlF$%#=xS7nT zCJ(kOR!0Zo43Ks4P@`-sQ;TEU-=r`CF%u9oZ-0}*(kU&NnwOZAlNz6&lC7kmXseKy zKYd{li`MjptE?Q;5127?O|MI5(VTv?kwr)*HK#b0i!(D#p(M4qL_tXf+4#u|1!bmx zZeTHiZ+izh}2b<9l$ILOEI~Qo|)Fu{# z=?}Isa!fzk#G*Jos*pu``bUtiWfd$ElkW+0OgCy~v7P=-kcne@KrRc*^x|d~Q4dfI zfIwO%7pDTmC!7kUdBv$E3SN$3jxPSrKyjcXR1H`Kh>fZwEpz((W)>+4L?A#ldj`9E z0nGpggSaBP7A{BU_~1~d;1CU{;^`B;Sw*H_NMq-3ztzkF#H>Kfw*6K!`_)bWs%XHv delta 219 zcmeyjKwFaITxTeczvS?24 zX<`wdTqDCV{aO=?@${vcEE3aIn}Ni=OctT(!Obi((+||MuuLy+W|5w*o5dnBeO)uq zkkvY@eA7SFvj|TA*32S2-JqC>Z@PR7i{bR}1{Tlh8(UZmAllxxu*gnpWZ|E#*~+3j z{i`#R!1S_K7Tf8&TUjKhzgWi3&*9}5=IG+@tT|n#jYVpDk{_$k^!b_W{Ov2-Sb&%n Nh}pKUY-7LL2>^WcPcQ%g diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 6477ad71e8c..c23343a027e 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 0ffc004d871..8062fce1e48 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