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 d2ed28363cdff6bad7f66025725b166dc9baacc9..879491f5ca1c53cb13cc7675e57bdf16dc926018 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -925,7 +925,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
        odk_settings \
        odk_settings_generated \
        $(if $(ENABLE_JAVA), \
-               odk_javadoc \
+               $(if $(JAVADOC),odk_javadoc) \
                odk_uno_loader_classes \
        ) \
 ))

diff --git a/configure.ac b/configure.ac
index d0ec9e3f4801442ed49e3496456c70385d1bc1ff..6493200da0ffd4d85fbc1872ad5fd6f3d0ff3e32 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 f0095619d50edf52a7e0e30ddc4c7fcb61d9991a..eeb4afa2a51508ee41569ba33105d49c27c72dd1 100644 (file)
--- 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)
 ifneq ($(gb_SUPPRESS_TESTS),)

diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 8b8ee8ccaac02b843170eea589a14ec3a88a16ea..073f048998f3a30849864fea03d6e55b88ff154a 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 8c1728671d91894af987009c130ba3543836d582..405d84a72dbd2b8ccc44f99595c62cf41dee18f5 100644 (file)
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,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")) {