RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/languagetool/ExtensionPackage_LanguageTool.mk | 14 + external/languagetool/ExternalProject_languagetool.mk | 42 +++++ external/languagetool/JLanguageTool-1.4.0-no-hc.patch | 22 ++ external/languagetool/JLanguageTool-1.7.0.patch | 141 +++++++++++++++++ external/languagetool/Makefile | 7 external/languagetool/MessageBox-apichange.patch | 30 +++ external/languagetool/Module_languagetool.mk | 22 ++ external/languagetool/README | 5 external/languagetool/UnpackedTarball_languagetool.mk | 22 ++ languagetool/ExtensionPackage_LanguageTool.mk | 14 - languagetool/ExternalProject_languagetool.mk | 42 ----- languagetool/JLanguageTool-1.4.0-no-hc.patch | 22 -- languagetool/JLanguageTool-1.7.0.patch | 141 ----------------- languagetool/Makefile | 7 languagetool/MessageBox-apichange.patch | 30 --- languagetool/Module_languagetool.mk | 22 -- languagetool/README | 5 languagetool/UnpackedTarball_languagetool.mk | 22 -- 20 files changed, 306 insertions(+), 306 deletions(-)
New commits: commit 11d41e980a5e2d5a4f75183af422a99a79692fc4 Author: Khaled Hosny <[email protected]> Date: Sun Nov 3 20:07:33 2013 +0200 fdo#70393: move languagetool to a subdir of external Change-Id: I402682f21d16c3069d5b6885bd75998bd2e16b3f Reviewed-on: https://gerrit.libreoffice.org/6544 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 090172e..7655e0f 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -68,7 +68,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jurt \ jvmaccess \ jvmfwk \ - $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ librelogo \ libxmlsec \ lingucomponent \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 089a632..2547160 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,ICU,icu) \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,JPEG,jpeg) \ + $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ diff --git a/languagetool/ExtensionPackage_LanguageTool.mk b/external/languagetool/ExtensionPackage_LanguageTool.mk similarity index 100% rename from languagetool/ExtensionPackage_LanguageTool.mk rename to external/languagetool/ExtensionPackage_LanguageTool.mk diff --git a/languagetool/ExternalProject_languagetool.mk b/external/languagetool/ExternalProject_languagetool.mk similarity index 100% rename from languagetool/ExternalProject_languagetool.mk rename to external/languagetool/ExternalProject_languagetool.mk diff --git a/languagetool/JLanguageTool-1.4.0-no-hc.patch b/external/languagetool/JLanguageTool-1.4.0-no-hc.patch similarity index 100% rename from languagetool/JLanguageTool-1.4.0-no-hc.patch rename to external/languagetool/JLanguageTool-1.4.0-no-hc.patch diff --git a/languagetool/JLanguageTool-1.7.0.patch b/external/languagetool/JLanguageTool-1.7.0.patch similarity index 100% rename from languagetool/JLanguageTool-1.7.0.patch rename to external/languagetool/JLanguageTool-1.7.0.patch diff --git a/languagetool/Makefile b/external/languagetool/Makefile similarity index 71% rename from languagetool/Makefile rename to external/languagetool/Makefile index ccb1c85..e4968cf 100644 --- a/languagetool/Makefile +++ b/external/languagetool/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/languagetool/MessageBox-apichange.patch b/external/languagetool/MessageBox-apichange.patch similarity index 100% rename from languagetool/MessageBox-apichange.patch rename to external/languagetool/MessageBox-apichange.patch diff --git a/languagetool/Module_languagetool.mk b/external/languagetool/Module_languagetool.mk similarity index 100% rename from languagetool/Module_languagetool.mk rename to external/languagetool/Module_languagetool.mk diff --git a/languagetool/README b/external/languagetool/README similarity index 100% rename from languagetool/README rename to external/languagetool/README diff --git a/languagetool/UnpackedTarball_languagetool.mk b/external/languagetool/UnpackedTarball_languagetool.mk similarity index 78% rename from languagetool/UnpackedTarball_languagetool.mk rename to external/languagetool/UnpackedTarball_languagetool.mk index d16617a..05f9e00 100644 --- a/languagetool/UnpackedTarball_languagetool.mk +++ b/external/languagetool/UnpackedTarball_languagetool.mk @@ -14,9 +14,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,languagetool,$(LANGUAGETOOL_TARBALL $(eval $(call gb_UnpackedTarball_set_patchlevel,languagetool,3)) $(eval $(call gb_UnpackedTarball_add_patches,languagetool,\ - languagetool/JLanguageTool-1.7.0.patch \ - languagetool/JLanguageTool-1.4.0-no-hc.patch \ - languagetool/MessageBox-apichange.patch \ + external/languagetool/JLanguageTool-1.7.0.patch \ + external/languagetool/JLanguageTool-1.4.0-no-hc.patch \ + external/languagetool/MessageBox-apichange.patch \ )) # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
