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>

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 \

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) \

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:

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: