fdo#70393: move apache-commons to a subdir of external

Change-Id: I97f27f1fd53e416767c7aa3478deb23aae0427e0
Reviewed-on: https://gerrit.libreoffice.org/6281
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

21 files changed, 5 insertions, 9 deletions

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 111d3b566e5e..a4ad804f70d6 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	accessibility \
 	android \
 	animations \
-	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
 	apple_remote \
 	avmedia \
 	basctl \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index a141b65ebcd1..2aca373c3363 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -19,6 +19,7 @@ endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,AFMS,afms) \
+	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
index 41cd2c6d41c2..41cd2c6d41c2 100644
--- a/apache-commons/ExternalPackage_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/external/apache-commons/ExternalProject_apache_commons_codec.mk
index 2135cb4c70d2..2135cb4c70d2 100644
--- a/apache-commons/ExternalProject_apache_commons_codec.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_codec.mk
diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk
index 4c02459c207d..4c02459c207d 100644
--- a/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk
diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/external/apache-commons/ExternalProject_apache_commons_lang.mk
index aadd73312bfb..aadd73312bfb 100644
--- a/apache-commons/ExternalProject_apache_commons_lang.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_lang.mk
diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk
index 98a77eb7ab45..98a77eb7ab45 100644
--- a/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk
diff --git a/apache-commons/Makefile b/external/apache-commons/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/apache-commons/Makefile
+++ b/external/apache-commons/Makefile
diff --git a/apache-commons/Module_apache-commons.mk b/external/apache-commons/Module_apache-commons.mk
index 0361597bd7e4..59d25ebb8263 100644
--- a/apache-commons/Module_apache-commons.mk
+++ b/external/apache-commons/Module_apache-commons.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Module_Module,apache-commons))
 
-ifneq ($(ENABLE_JAVA),)
-ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_targets,apache-commons,\
 	ExternalPackage_apache_commons_logging \
 	ExternalProject_apache_commons_codec \
@@ -25,7 +23,5 @@ $(eval $(call gb_Module_add_targets,apache-commons,\
 	UnpackedTarball_apache_commons_lang \
 	UnpackedTarball_apache_commons_logging \
 ))
-endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Package_apache_commons_codec.mk b/external/apache-commons/Package_apache_commons_codec.mk
index 65d302b31357..65d302b31357 100644
--- a/apache-commons/Package_apache_commons_codec.mk
+++ b/external/apache-commons/Package_apache_commons_codec.mk
diff --git a/apache-commons/Package_apache_commons_httpclient.mk b/external/apache-commons/Package_apache_commons_httpclient.mk
index dd21d777a97e..dd21d777a97e 100644
--- a/apache-commons/Package_apache_commons_httpclient.mk
+++ b/external/apache-commons/Package_apache_commons_httpclient.mk
diff --git a/apache-commons/Package_apache_commons_lang.mk b/external/apache-commons/Package_apache_commons_lang.mk
index a9c1eb375d1d..a9c1eb375d1d 100644
--- a/apache-commons/Package_apache_commons_lang.mk
+++ b/external/apache-commons/Package_apache_commons_lang.mk
diff --git a/apache-commons/README b/external/apache-commons/README
index 0ab7b63d1ea8..0ab7b63d1ea8 100644
--- a/apache-commons/README
+++ b/external/apache-commons/README
diff --git a/apache-commons/UnpackedTarball_apache_commons_codec.mk b/external/apache-commons/UnpackedTarball_apache_commons_codec.mk
index 64a29e31b281..5e55c1f84669 100644
--- a/apache-commons/UnpackedTarball_apache_commons_codec.mk
+++ b/external/apache-commons/UnpackedTarball_apache_commons_codec.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_codec,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,apache_commons_codec,\
-	apache-commons/patches/codec.patch \
+	external/apache-commons/patches/codec.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk b/external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
index c5279e8161ef..23d995f2d103 100644
--- a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
+++ b/external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_httpclient))
 $(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_httpclient,$(APACHE_COMMONS_HTTPCLIENT_TARBALL),,apache-commons))
 
 $(eval $(call gb_UnpackedTarball_add_patches,apache_commons_httpclient,\
-	apache-commons/patches/httpclient.patch \
-	apache-commons/patches/httpclient_no_javadoc.patch \
+	external/apache-commons/patches/httpclient.patch \
+	external/apache-commons/patches/httpclient_no_javadoc.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/apache-commons/UnpackedTarball_apache_commons_lang.mk b/external/apache-commons/UnpackedTarball_apache_commons_lang.mk
index 9b9f077b5fea..9b9f077b5fea 100644
--- a/apache-commons/UnpackedTarball_apache_commons_lang.mk
+++ b/external/apache-commons/UnpackedTarball_apache_commons_lang.mk
diff --git a/apache-commons/UnpackedTarball_apache_commons_logging.mk b/external/apache-commons/UnpackedTarball_apache_commons_logging.mk
index 8d725ff7c4d4..1d5ad3dc2d9d 100644
--- a/apache-commons/UnpackedTarball_apache_commons_logging.mk
+++ b/external/apache-commons/UnpackedTarball_apache_commons_logging.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_logging,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,apache_commons_logging,\
-	apache-commons/patches/logging.patch \
+	external/apache-commons/patches/logging.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/apache-commons/patches/codec.patch b/external/apache-commons/patches/codec.patch
index 7a9b4893daf7..7a9b4893daf7 100644
--- a/apache-commons/patches/codec.patch
+++ b/external/apache-commons/patches/codec.patch
diff --git a/apache-commons/patches/httpclient.patch b/external/apache-commons/patches/httpclient.patch
index a64384f9e42a..a64384f9e42a 100644
--- a/apache-commons/patches/httpclient.patch
+++ b/external/apache-commons/patches/httpclient.patch
diff --git a/apache-commons/patches/httpclient_no_javadoc.patch b/external/apache-commons/patches/httpclient_no_javadoc.patch
index a9bd95de1d17..a9bd95de1d17 100644
--- a/apache-commons/patches/httpclient_no_javadoc.patch
+++ b/external/apache-commons/patches/httpclient_no_javadoc.patch
diff --git a/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch
index f96eda38075c..f96eda38075c 100644
--- a/apache-commons/patches/logging.patch
+++ b/external/apache-commons/patches/logging.patch