diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:07:33 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:24:39 -0600 |
| commit | 11d41e980a5e2d5a4f75183af422a99a79692fc4 (patch) | |
| tree | f7391dc5c36036d69ae568c13f6054d57b7704db | |
| parent | e485e0ffb51ed11325a31fe77e84252be6c9fad9 (diff) | |
fdo#70393: move languagetool to a subdir of external
Change-Id: I402682f21d16c3069d5b6885bd75998bd2e16b3f
Reviewed-on: https://gerrit.libreoffice.org/6544
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/languagetool/ExtensionPackage_LanguageTool.mk (renamed from languagetool/ExtensionPackage_LanguageTool.mk) | 0 | ||||
| -rw-r--r-- | external/languagetool/ExternalProject_languagetool.mk (renamed from languagetool/ExternalProject_languagetool.mk) | 0 | ||||
| -rw-r--r-- | external/languagetool/JLanguageTool-1.4.0-no-hc.patch (renamed from languagetool/JLanguageTool-1.4.0-no-hc.patch) | 0 | ||||
| -rw-r--r-- | external/languagetool/JLanguageTool-1.7.0.patch (renamed from languagetool/JLanguageTool-1.7.0.patch) | 0 | ||||
| -rw-r--r-- | external/languagetool/Makefile (renamed from languagetool/Makefile) | 2 | ||||
| -rw-r--r-- | external/languagetool/MessageBox-apichange.patch (renamed from languagetool/MessageBox-apichange.patch) | 0 | ||||
| -rw-r--r-- | external/languagetool/Module_languagetool.mk (renamed from languagetool/Module_languagetool.mk) | 0 | ||||
| -rw-r--r-- | external/languagetool/README (renamed from languagetool/README) | 0 | ||||
| -rw-r--r-- | external/languagetool/UnpackedTarball_languagetool.mk (renamed from languagetool/UnpackedTarball_languagetool.mk) | 6 |
11 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 090172ecad40..7655e0fd65ce 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 089a6323979b..2547160110b9 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 index 3b685d707449..3b685d707449 100644 --- a/languagetool/ExtensionPackage_LanguageTool.mk +++ b/external/languagetool/ExtensionPackage_LanguageTool.mk diff --git a/languagetool/ExternalProject_languagetool.mk b/external/languagetool/ExternalProject_languagetool.mk index 20ebdf576fec..20ebdf576fec 100644 --- a/languagetool/ExternalProject_languagetool.mk +++ b/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 index 4337ec6eb697..4337ec6eb697 100644 --- a/languagetool/JLanguageTool-1.4.0-no-hc.patch +++ b/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 index 782b683af79e..782b683af79e 100644 --- a/languagetool/JLanguageTool-1.7.0.patch +++ b/external/languagetool/JLanguageTool-1.7.0.patch diff --git a/languagetool/Makefile b/external/languagetool/Makefile index ccb1c85a04da..e4968cf85fb6 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 index ceea259b88ac..ceea259b88ac 100644 --- a/languagetool/MessageBox-apichange.patch +++ b/external/languagetool/MessageBox-apichange.patch diff --git a/languagetool/Module_languagetool.mk b/external/languagetool/Module_languagetool.mk index 0574d55d6856..0574d55d6856 100644 --- a/languagetool/Module_languagetool.mk +++ b/external/languagetool/Module_languagetool.mk diff --git a/languagetool/README b/external/languagetool/README index 72d70412b641..72d70412b641 100644 --- a/languagetool/README +++ b/external/languagetool/README diff --git a/languagetool/UnpackedTarball_languagetool.mk b/external/languagetool/UnpackedTarball_languagetool.mk index d16617a17555..05f9e000b145 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: |