RepositoryModule_host.mk | 1 apache-commons/ExternalPackage_apache_commons_logging.mk | 16 - apache-commons/ExternalProject_apache_commons_codec.mk | 32 -- apache-commons/ExternalProject_apache_commons_httpclient.mk | 37 --- apache-commons/ExternalProject_apache_commons_lang.mk | 32 -- apache-commons/ExternalProject_apache_commons_logging.mk | 43 --- apache-commons/Makefile | 7 apache-commons/Module_apache-commons.mk | 31 -- apache-commons/Package_apache_commons_codec.mk | 16 - apache-commons/Package_apache_commons_httpclient.mk | 16 - apache-commons/Package_apache_commons_lang.mk | 16 - apache-commons/README | 1 apache-commons/UnpackedTarball_apache_commons_codec.mk | 24 -- apache-commons/UnpackedTarball_apache_commons_httpclient.mk | 19 - apache-commons/UnpackedTarball_apache_commons_lang.mk | 14 - apache-commons/UnpackedTarball_apache_commons_logging.mk | 22 - apache-commons/patches/codec.patch | 20 - apache-commons/patches/httpclient.patch | 119 ---------- apache-commons/patches/httpclient_no_javadoc.patch | 11 apache-commons/patches/logging.patch | 15 - external/Module_external.mk | 1 external/apache-commons/ExternalPackage_apache_commons_logging.mk | 16 + external/apache-commons/ExternalProject_apache_commons_codec.mk | 32 ++ external/apache-commons/ExternalProject_apache_commons_httpclient.mk | 37 +++ external/apache-commons/ExternalProject_apache_commons_lang.mk | 32 ++ external/apache-commons/ExternalProject_apache_commons_logging.mk | 43 +++ external/apache-commons/Makefile | 7 external/apache-commons/Module_apache-commons.mk | 27 ++ external/apache-commons/Package_apache_commons_codec.mk | 16 + external/apache-commons/Package_apache_commons_httpclient.mk | 16 + external/apache-commons/Package_apache_commons_lang.mk | 16 + external/apache-commons/README | 1 external/apache-commons/UnpackedTarball_apache_commons_codec.mk | 24 ++ external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk | 19 + external/apache-commons/UnpackedTarball_apache_commons_lang.mk | 14 + external/apache-commons/UnpackedTarball_apache_commons_logging.mk | 22 + external/apache-commons/patches/codec.patch | 20 + external/apache-commons/patches/httpclient.patch | 119 ++++++++++ external/apache-commons/patches/httpclient_no_javadoc.patch | 11 external/apache-commons/patches/logging.patch | 15 + 40 files changed, 488 insertions(+), 492 deletions(-)
New commits: commit 694248e9785e943bfc83d119304a5b18b683e21f Author: Khaled Hosny <[email protected]> Date: Thu Oct 17 00:56:05 2013 +0200 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 <[email protected]> Tested-by: Björn Michaelsen <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 111d3b5..a4ad804 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 a141b65..2aca373 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 similarity index 100% rename from apache-commons/ExternalPackage_apache_commons_logging.mk rename to 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 similarity index 100% rename from apache-commons/ExternalProject_apache_commons_codec.mk rename to 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 similarity index 100% rename from apache-commons/ExternalProject_apache_commons_httpclient.mk rename to 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 similarity index 100% rename from apache-commons/ExternalProject_apache_commons_lang.mk rename to 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 similarity index 100% rename from apache-commons/ExternalProject_apache_commons_logging.mk rename to external/apache-commons/ExternalProject_apache_commons_logging.mk diff --git a/apache-commons/Makefile b/external/apache-commons/Makefile similarity index 100% rename from apache-commons/Makefile rename to external/apache-commons/Makefile diff --git a/apache-commons/Module_apache-commons.mk b/external/apache-commons/Module_apache-commons.mk similarity index 91% rename from apache-commons/Module_apache-commons.mk rename to external/apache-commons/Module_apache-commons.mk index 0361597..59d25eb 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 similarity index 100% rename from apache-commons/Package_apache_commons_codec.mk rename to 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 similarity index 100% rename from apache-commons/Package_apache_commons_httpclient.mk rename to 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 similarity index 100% rename from apache-commons/Package_apache_commons_lang.mk rename to external/apache-commons/Package_apache_commons_lang.mk diff --git a/apache-commons/README b/external/apache-commons/README similarity index 100% rename from apache-commons/README rename to external/apache-commons/README diff --git a/apache-commons/UnpackedTarball_apache_commons_codec.mk b/external/apache-commons/UnpackedTarball_apache_commons_codec.mk similarity index 94% rename from apache-commons/UnpackedTarball_apache_commons_codec.mk rename to external/apache-commons/UnpackedTarball_apache_commons_codec.mk index 64a29e3..5e55c1f 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 similarity index 84% rename from apache-commons/UnpackedTarball_apache_commons_httpclient.mk rename to external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk index c5279e8..23d995f 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 similarity index 100% rename from apache-commons/UnpackedTarball_apache_commons_lang.mk rename to 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 similarity index 93% rename from apache-commons/UnpackedTarball_apache_commons_logging.mk rename to external/apache-commons/UnpackedTarball_apache_commons_logging.mk index 8d725ff..1d5ad3d 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 similarity index 100% rename from apache-commons/patches/codec.patch rename to external/apache-commons/patches/codec.patch diff --git a/apache-commons/patches/httpclient.patch b/external/apache-commons/patches/httpclient.patch similarity index 100% rename from apache-commons/patches/httpclient.patch rename to 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 similarity index 100% rename from apache-commons/patches/httpclient_no_javadoc.patch rename to external/apache-commons/patches/httpclient_no_javadoc.patch diff --git a/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch similarity index 100% rename from apache-commons/patches/logging.patch rename to external/apache-commons/patches/logging.patch
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
