RepositoryModule_host.mk | 1 clucene/Library_clucene.mk | 236 ----------- clucene/Makefile | 11 clucene/Module_clucene.mk | 21 clucene/README | 4 clucene/UnpackedTarball_clucene.mk | 65 --- clucene/configs/_clucene-config-LINUX.h | 114 ----- clucene/configs/_clucene-config-MSVC.h | 114 ----- clucene/configs/_clucene-config-generic.h | 114 ----- clucene/configs/clucene-config-GCC-atomic.h | 150 ------ clucene/configs/clucene-config-MINGW-atomic.h | 150 ------ clucene/configs/clucene-config-MINGW.h | 150 ------ clucene/configs/clucene-config-MSVC.h | 150 ------ clucene/configs/clucene-config-generic.h | 150 ------ clucene/patches/clucene-aix.patch | 40 - clucene/patches/clucene-debug.patch | 11 clucene/patches/clucene-git1-win64.patch | 45 -- clucene/patches/clucene-libcpp.patch | 42 - clucene/patches/clucene-multimap-put.patch | 9 clucene/patches/clucene-narrowing-conversions.patch | 36 - clucene/patches/clucene-nullptr.patch | 22 - clucene/patches/clucene-warnings.patch | 54 -- clucene/patches/contribs-lib-makefile.patch | 23 - external/Module_external.mk | 1 external/clucene/Library_clucene.mk | 236 +++++++++++ external/clucene/Makefile | 11 external/clucene/Module_clucene.mk | 21 external/clucene/README | 4 external/clucene/UnpackedTarball_clucene.mk | 65 +++ external/clucene/configs/_clucene-config-LINUX.h | 114 +++++ external/clucene/configs/_clucene-config-MSVC.h | 114 +++++ external/clucene/configs/_clucene-config-generic.h | 114 +++++ external/clucene/configs/clucene-config-GCC-atomic.h | 150 ++++++ external/clucene/configs/clucene-config-MINGW-atomic.h | 150 ++++++ external/clucene/configs/clucene-config-MINGW.h | 150 ++++++ external/clucene/configs/clucene-config-MSVC.h | 150 ++++++ external/clucene/configs/clucene-config-generic.h | 150 ++++++ external/clucene/patches/clucene-aix.patch | 40 + external/clucene/patches/clucene-debug.patch | 11 external/clucene/patches/clucene-git1-win64.patch | 45 ++ external/clucene/patches/clucene-libcpp.patch | 42 + external/clucene/patches/clucene-multimap-put.patch | 9 external/clucene/patches/clucene-narrowing-conversions.patch | 36 + external/clucene/patches/clucene-nullptr.patch | 22 + external/clucene/patches/clucene-warnings.patch | 54 ++ external/clucene/patches/contribs-lib-makefile.patch | 23 + 46 files changed, 1712 insertions(+), 1712 deletions(-)
New commits: commit 894f5e46a6d72d3cfc3731c49a5f01626c6b95db Author: Khaled Hosny <[email protected]> Date: Thu Oct 17 01:28:29 2013 +0200 fdo#70393: move clucene to a subdir of external Change-Id: Ia9b7b18526119e29e21eb315d84d099861e15ea0 Reviewed-on: https://gerrit.libreoffice.org/6285 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 1f358f6..0ec4fca 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ canvas \ chart2 \ cli_ure \ - $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ configmgr \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 85fb170..7d6880e 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,BOOST,boost) \ $(call gb_Helper_optional,BSH,beanshell) \ $(call gb_Helper_optional,CAIRO,cairo) \ + $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk similarity index 100% rename from clucene/Library_clucene.mk rename to external/clucene/Library_clucene.mk diff --git a/clucene/Makefile b/external/clucene/Makefile similarity index 100% rename from clucene/Makefile rename to external/clucene/Makefile diff --git a/clucene/Module_clucene.mk b/external/clucene/Module_clucene.mk similarity index 81% rename from clucene/Module_clucene.mk rename to external/clucene/Module_clucene.mk index aa4a57b..aee8611 100644 --- a/clucene/Module_clucene.mk +++ b/external/clucene/Module_clucene.mk @@ -9,13 +9,13 @@ $(eval $(call gb_Module_Module,clucene)) -ifeq ($(SYSTEM_CLUCENE),NO) +# do we need the Android check below? Shouldn't it be already covered by +# gb_Helper_optional in Module_external.mk? ifneq ($(OS),ANDROID) $(eval $(call gb_Module_add_targets,clucene,\ Library_clucene \ UnpackedTarball_clucene \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/clucene/README b/external/clucene/README similarity index 100% rename from clucene/README rename to external/clucene/README diff --git a/clucene/UnpackedTarball_clucene.mk b/external/clucene/UnpackedTarball_clucene.mk similarity index 63% rename from clucene/UnpackedTarball_clucene.mk rename to external/clucene/UnpackedTarball_clucene.mk index 5328bb2..cda5b3a 100644 --- a/clucene/UnpackedTarball_clucene.mk +++ b/external/clucene/UnpackedTarball_clucene.mk @@ -23,42 +23,42 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0)) # clucene-multimap-put.patch was proposed upstream, see # http://sourceforge.net/mailarchive/message.php?msg_id=29143260 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\ - clucene/patches/clucene-debug.patch \ - clucene/patches/clucene-multimap-put.patch \ - clucene/patches/clucene-narrowing-conversions.patch \ - clucene/patches/clucene-nullptr.patch \ - clucene/patches/clucene-warnings.patch \ - clucene/patches/clucene-aix.patch \ - clucene/patches/clucene-git1-win64.patch \ + external/clucene/patches/clucene-debug.patch \ + external/clucene/patches/clucene-multimap-put.patch \ + external/clucene/patches/clucene-narrowing-conversions.patch \ + external/clucene/patches/clucene-nullptr.patch \ + external/clucene/patches/clucene-warnings.patch \ + external/clucene/patches/clucene-aix.patch \ + external/clucene/patches/clucene-git1-win64.patch \ )) ifneq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,clucene,\ - clucene/patches/clucene-libcpp.patch \ + external/clucene/patches/clucene-libcpp.patch \ )) endif ifeq ($(OS),WNT) -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-MSVC.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-MSVC.h)) ifeq ($(COM),MSC) -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MSVC.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MSVC.h)) else ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE) -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MINGW-atomic.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MINGW-atomic.h)) else -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MINGW.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MINGW.h)) endif endif else # ! $(OS),WNT ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE) -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-GCC-atomic.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-GCC-atomic.h)) else -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-generic.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-generic.h)) endif ifeq ($(OS),LINUX) -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-LINUX.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-LINUX.h)) else -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-generic.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-generic.h)) endif endif # $(OS),WNT diff --git a/clucene/configs/_clucene-config-LINUX.h b/external/clucene/configs/_clucene-config-LINUX.h similarity index 100% rename from clucene/configs/_clucene-config-LINUX.h rename to external/clucene/configs/_clucene-config-LINUX.h diff --git a/clucene/configs/_clucene-config-MSVC.h b/external/clucene/configs/_clucene-config-MSVC.h similarity index 100% rename from clucene/configs/_clucene-config-MSVC.h rename to external/clucene/configs/_clucene-config-MSVC.h diff --git a/clucene/configs/_clucene-config-generic.h b/external/clucene/configs/_clucene-config-generic.h similarity index 100% rename from clucene/configs/_clucene-config-generic.h rename to external/clucene/configs/_clucene-config-generic.h diff --git a/clucene/configs/clucene-config-GCC-atomic.h b/external/clucene/configs/clucene-config-GCC-atomic.h similarity index 100% rename from clucene/configs/clucene-config-GCC-atomic.h rename to external/clucene/configs/clucene-config-GCC-atomic.h diff --git a/clucene/configs/clucene-config-MINGW-atomic.h b/external/clucene/configs/clucene-config-MINGW-atomic.h similarity index 100% rename from clucene/configs/clucene-config-MINGW-atomic.h rename to external/clucene/configs/clucene-config-MINGW-atomic.h diff --git a/clucene/configs/clucene-config-MINGW.h b/external/clucene/configs/clucene-config-MINGW.h similarity index 100% rename from clucene/configs/clucene-config-MINGW.h rename to external/clucene/configs/clucene-config-MINGW.h diff --git a/clucene/configs/clucene-config-MSVC.h b/external/clucene/configs/clucene-config-MSVC.h similarity index 100% rename from clucene/configs/clucene-config-MSVC.h rename to external/clucene/configs/clucene-config-MSVC.h diff --git a/clucene/configs/clucene-config-generic.h b/external/clucene/configs/clucene-config-generic.h similarity index 100% rename from clucene/configs/clucene-config-generic.h rename to external/clucene/configs/clucene-config-generic.h diff --git a/clucene/patches/clucene-aix.patch b/external/clucene/patches/clucene-aix.patch similarity index 100% rename from clucene/patches/clucene-aix.patch rename to external/clucene/patches/clucene-aix.patch diff --git a/clucene/patches/clucene-debug.patch b/external/clucene/patches/clucene-debug.patch similarity index 100% rename from clucene/patches/clucene-debug.patch rename to external/clucene/patches/clucene-debug.patch diff --git a/clucene/patches/clucene-git1-win64.patch b/external/clucene/patches/clucene-git1-win64.patch similarity index 100% rename from clucene/patches/clucene-git1-win64.patch rename to external/clucene/patches/clucene-git1-win64.patch diff --git a/clucene/patches/clucene-libcpp.patch b/external/clucene/patches/clucene-libcpp.patch similarity index 100% rename from clucene/patches/clucene-libcpp.patch rename to external/clucene/patches/clucene-libcpp.patch diff --git a/clucene/patches/clucene-multimap-put.patch b/external/clucene/patches/clucene-multimap-put.patch similarity index 100% rename from clucene/patches/clucene-multimap-put.patch rename to external/clucene/patches/clucene-multimap-put.patch diff --git a/clucene/patches/clucene-narrowing-conversions.patch b/external/clucene/patches/clucene-narrowing-conversions.patch similarity index 100% rename from clucene/patches/clucene-narrowing-conversions.patch rename to external/clucene/patches/clucene-narrowing-conversions.patch diff --git a/clucene/patches/clucene-nullptr.patch b/external/clucene/patches/clucene-nullptr.patch similarity index 100% rename from clucene/patches/clucene-nullptr.patch rename to external/clucene/patches/clucene-nullptr.patch diff --git a/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch similarity index 100% rename from clucene/patches/clucene-warnings.patch rename to external/clucene/patches/clucene-warnings.patch diff --git a/clucene/patches/contribs-lib-makefile.patch b/external/clucene/patches/contribs-lib-makefile.patch similarity index 100% rename from clucene/patches/contribs-lib-makefile.patch rename to external/clucene/patches/contribs-lib-makefile.patch
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
