mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#70393: move rhino to a subdir of external

Browse Source 
Change-Id: I7d7858d84a62568d9b0c61403645da13658e78d2
Reviewed-on: https://gerrit.libreoffice.org/6552
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Khaled Hosny
2013-11-03 20:35:47 +02:00
committed by David Tardon
parent fa560217db
commit 90a19aeac6
12 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RepositoryModule_host.mk
View File

@@ -94,7 +94,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
remotebridges \ remotebridges \
reportbuilder \ reportbuilder \
$(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \ $(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \
$(call gb_Helper_optional,RHINO,rhino) \
ridljar \ ridljar \
rsc \ rsc \
sal \ sal \

1
external/Module_external.mk vendored
View File

@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,POSTGRESQL,postgresql) \ $(call gb_Helper_optional,POSTGRESQL,postgresql) \
$(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,REDLAND,redland) \ $(call gb_Helper_optional,REDLAND,redland) \
$(call gb_Helper_optional,RHINO,rhino) \
$(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \ $(call gb_Helper_optional,WPG,libwpg) \

0
rhino/ExternalPackage_rhino.mk → external/rhino/ExternalPackage_rhino.mk vendored
View File

0
rhino/ExternalProject_rhino.mk → external/rhino/ExternalProject_rhino.mk vendored
View File

2
rhino/Makefile → external/rhino/Makefile vendored
View File

@@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) 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: # vim: set noet sw=4 ts=4:

0
rhino/Module_rhino.mk → external/rhino/Module_rhino.mk vendored
View File

0
rhino/OfficeScriptInfo.java → external/rhino/OfficeScriptInfo.java vendored
View File

0
rhino/README → external/rhino/README vendored
View File

8
rhino/UnpackedTarball_rhino.mk → external/rhino/UnpackedTarball_rhino.mk vendored
View File

@@ -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_set_patchlevel,rhino,2))
$(eval $(call gb_UnpackedTarball_add_patches,rhino,\ $(eval $(call gb_UnpackedTarball_add_patches,rhino,\
rhino/rhino1_5R5.patch \ external/rhino/rhino1_5R5.patch \
rhino/rhino1_5R5-find_swing.patch \ external/rhino/rhino1_5R5-find_swing.patch \
rhino/rhino1_5R5-updateToolTip.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: # vim: set noet sw=4 ts=4:

0
rhino/rhino1_5R5-find_swing.patch → external/rhino/rhino1_5R5-find_swing.patch vendored
View File

0
rhino/rhino1_5R5-updateToolTip.patch → external/rhino/rhino1_5R5-updateToolTip.patch vendored
View File

0
rhino/rhino1_5R5.patch → external/rhino/rhino1_5R5.patch vendored
View File