diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:35:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:45:23 -0600 |
| commit | 90a19aeac6cad56e33574685219a85ef98469513 (patch) | |
| tree | 5de6b0adb52e08ae83b6ce6f90df542956504531 | |
| parent | fa560217dbd4c15abb3f7623d99cf7017dcb3f2a (diff) | |
fdo#70393: move rhino to a subdir of external
Change-Id: I7d7858d84a62568d9b0c61403645da13658e78d2
Reviewed-on: https://gerrit.libreoffice.org/6552
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/rhino/ExternalPackage_rhino.mk (renamed from rhino/ExternalPackage_rhino.mk) | 0 | ||||
| -rw-r--r-- | external/rhino/ExternalProject_rhino.mk (renamed from rhino/ExternalProject_rhino.mk) | 0 | ||||
| -rw-r--r-- | external/rhino/Makefile (renamed from rhino/Makefile) | 2 | ||||
| -rw-r--r-- | external/rhino/Module_rhino.mk (renamed from rhino/Module_rhino.mk) | 0 | ||||
| -rw-r--r-- | external/rhino/OfficeScriptInfo.java (renamed from rhino/OfficeScriptInfo.java) | 0 | ||||
| -rw-r--r-- | external/rhino/README (renamed from rhino/README) | 0 | ||||
| -rw-r--r-- | external/rhino/UnpackedTarball_rhino.mk (renamed from rhino/UnpackedTarball_rhino.mk) | 8 | ||||
| -rw-r--r-- | external/rhino/rhino1_5R5-find_swing.patch (renamed from rhino/rhino1_5R5-find_swing.patch) | 0 | ||||
| -rw-r--r-- | external/rhino/rhino1_5R5-updateToolTip.patch (renamed from rhino/rhino1_5R5-updateToolTip.patch) | 0 | ||||
| -rw-r--r-- | external/rhino/rhino1_5R5.patch (renamed from rhino/rhino1_5R5.patch) | 0 |
12 files changed, 6 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 1f60a3031695..a878824005cb 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -94,7 +94,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ remotebridges \ reportbuilder \ $(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \ - $(call gb_Helper_optional,RHINO,rhino) \ ridljar \ rsc \ sal \ diff --git a/external/Module_external.mk b/external/Module_external.mk index aeba824032e7..2a6977fdd753 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,POSTGRESQL,postgresql) \ $(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,REDLAND,redland) \ + $(call gb_Helper_optional,RHINO,rhino) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ diff --git a/rhino/ExternalPackage_rhino.mk b/external/rhino/ExternalPackage_rhino.mk index 0ee1d60e309d..0ee1d60e309d 100644 --- a/rhino/ExternalPackage_rhino.mk +++ b/external/rhino/ExternalPackage_rhino.mk diff --git a/rhino/ExternalProject_rhino.mk b/external/rhino/ExternalProject_rhino.mk index 3243ad93d538..3243ad93d538 100644 --- a/rhino/ExternalProject_rhino.mk +++ b/external/rhino/ExternalProject_rhino.mk diff --git a/rhino/Makefile b/external/rhino/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/rhino/Makefile +++ b/external/rhino/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/rhino/Module_rhino.mk b/external/rhino/Module_rhino.mk index 201d3ba9fc90..201d3ba9fc90 100644 --- a/rhino/Module_rhino.mk +++ b/external/rhino/Module_rhino.mk diff --git a/rhino/OfficeScriptInfo.java b/external/rhino/OfficeScriptInfo.java index eb1d78641d23..eb1d78641d23 100644 --- a/rhino/OfficeScriptInfo.java +++ b/external/rhino/OfficeScriptInfo.java diff --git a/rhino/README b/external/rhino/README index 83e4135d0b89..83e4135d0b89 100644 --- a/rhino/README +++ b/external/rhino/README diff --git a/rhino/UnpackedTarball_rhino.mk b/external/rhino/UnpackedTarball_rhino.mk index 4ee92d2bade9..0a1492b88da6 100644 --- a/rhino/UnpackedTarball_rhino.mk +++ b/external/rhino/UnpackedTarball_rhino.mk @@ -14,11 +14,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,rhino,$(RHINO_TARBALL),,rhino)) $(eval $(call gb_UnpackedTarball_set_patchlevel,rhino,2)) $(eval $(call gb_UnpackedTarball_add_patches,rhino,\ - rhino/rhino1_5R5.patch \ - rhino/rhino1_5R5-find_swing.patch \ - rhino/rhino1_5R5-updateToolTip.patch \ + external/rhino/rhino1_5R5.patch \ + external/rhino/rhino1_5R5-find_swing.patch \ + external/rhino/rhino1_5R5-updateToolTip.patch \ )) -$(eval $(call gb_UnpackedTarball_add_file,rhino,toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java,rhino/OfficeScriptInfo.java)) +$(eval $(call gb_UnpackedTarball_add_file,rhino,toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java,external/rhino/OfficeScriptInfo.java)) # vim: set noet sw=4 ts=4: diff --git a/rhino/rhino1_5R5-find_swing.patch b/external/rhino/rhino1_5R5-find_swing.patch index f074fa845490..f074fa845490 100644 --- a/rhino/rhino1_5R5-find_swing.patch +++ b/external/rhino/rhino1_5R5-find_swing.patch diff --git a/rhino/rhino1_5R5-updateToolTip.patch b/external/rhino/rhino1_5R5-updateToolTip.patch index 16857d35fca6..16857d35fca6 100644 --- a/rhino/rhino1_5R5-updateToolTip.patch +++ b/external/rhino/rhino1_5R5-updateToolTip.patch diff --git a/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch index 5b10c320d015..5b10c320d015 100644 --- a/rhino/rhino1_5R5.patch +++ b/external/rhino/rhino1_5R5.patch |