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

diff --git a/Repository.mk b/Repository.mk
index ea6745990ad395b115a70730de022d58aaa906eb..9c7a2dea611762fe76a43c15798fea689602e011 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -855,7 +855,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 bfe754e686f5108358a69aefc5e90ab87c9db94b..bafcbb01cdd218382589c4f941b639d05bbb5f14 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 6477ad71e8c1b40d9c9f2d32933510c86f2e41af..c23343a027e4fc72b41de40f22c9928f0156df16 100644 (file)
--- 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 16eba69c3e3a0c942e5a9a35a9fd4ef46bf3db3c..0d5fca58d2ce2c6b2eeadfd88b56ef98e0e5f586 100644 (file)
--- 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 be03d40ff5855934bfadff6e46bac002e8a95aaa..bed51e1c7a6a04219c730896bd673c79dd958d22 100644 (file)
--- 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")) {