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 dba6f9874803f0499861f2b7a8b176d0c1516be3..cbb6df60a9d0f5cb20b72644450b79380ee988cb 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -945,7 +945,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 \
        ) \
        odk_scripts \

diff --git a/configure.ac b/configure.ac
index c241c7f7b0feac13ec1f5d90a2cc6193102e3a21..9ff59153aef96304f4a8a0f2e9b0f4eb5148803e 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 0966fa577462a2ebde0b763e55c81ab7a48d3e0d..fdf355050239b2435abdc28520c66665323c680e 100644 (file)
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(gb_CustomTarget_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 d30c7164776ad9092a082c92990de33c7b720519..500348a7ea618a3fde7059ca16953082812e3774 100644 (file)
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,8 +43,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")) {