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.

Gbp-Pq: Name javadoc-optional.diff

diff --git a/Repository.mk b/Repository.mk
index 81902e51f1b95c2104de06d87fb52b4be10f072f..b3c76ff969099f80e08de76d045f18b937be5829 100644 (file)
--- 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 23c146ab669de765eec24212c818092b3d97998b..a322cc3a154b289e47535ab2764655d943078176 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 dc983e2f67d814c9abf655775f55f0f50554da18..538409f7aee1ed27da479c672e69d6cb8fd70914 100644 (file)
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -34,7 +34,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 a72102c9b951544dda73924b838dd25ac0e929c8..321d76dc6a8c5a8fe182f3cb2a4ba98d19201597 100644 (file)
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,11 +42,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 03b58fe3da7c4ac373faf9035e64eea5a0cb0977..63e332079bc893f2fc92ed7adae9df384a94bef9 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")) {