[Libreoffice-commits] core.git: external/Module_external.mk external/rhino RepositoryModule_host.mk rhino/ExternalPackage_rhino.mk rhino/ExternalProject_rhino.mk rhino/Makefile rhino/Module_rhino.mk rhino/OfficeScriptInfo.java rhino/README rhino/rhino1_5R5-find_swing.patch rhino/rhino1_5R5.patch rhino/rhino1_5R5-updateToolTip.patch rhino/UnpackedTarball_rhino.mk

[Khaled Hosny]

 RepositoryModule_host.mk                      |    1 
 external/Module_external.mk                   |    1 
 external/rhino/ExternalPackage_rhino.mk       |   16 
 external/rhino/ExternalProject_rhino.mk       |   32 
 external/rhino/Makefile                       |    7 
 external/rhino/Module_rhino.mk                |   22 
 external/rhino/OfficeScriptInfo.java          |  118 ++
 external/rhino/README                         |   14 
 external/rhino/UnpackedTarball_rhino.mk       |   24 
 external/rhino/rhino1_5R5-find_swing.patch    |   19 
 external/rhino/rhino1_5R5-updateToolTip.patch |   23 
 external/rhino/rhino1_5R5.patch               | 1071 ++++++++++++++++++++++++++
 rhino/ExternalPackage_rhino.mk                |   16 
 rhino/ExternalProject_rhino.mk                |   32 
 rhino/Makefile                                |    7 
 rhino/Module_rhino.mk                         |   22 
 rhino/OfficeScriptInfo.java                   |  118 --
 rhino/README                                  |   14 
 rhino/UnpackedTarball_rhino.mk                |   24 
 rhino/rhino1_5R5-find_swing.patch             |   19 
 rhino/rhino1_5R5-updateToolTip.patch          |   23 
 rhino/rhino1_5R5.patch                        | 1071 --------------------------
 22 files changed, 1347 insertions(+), 1347 deletions(-)

New commits:
commit 90a19aeac6cad56e33574685219a85ef98469513
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Nov 3 20:35:47 2013 +0200

    fdo#70393: move rhino to a subdir of external
    
    Change-Id: I7d7858d84a62568d9b0c61403645da13658e78d2
    Reviewed-on: https://gerrit.libreoffice.org/6552
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 1f60a30..a8788240 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 aeba824..2a6977f 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
similarity index 100%
rename from rhino/ExternalPackage_rhino.mk
rename to external/rhino/ExternalPackage_rhino.mk
diff --git a/rhino/ExternalProject_rhino.mk b/external/rhino/ExternalProject_rhino.mk
similarity index 100%
rename from rhino/ExternalProject_rhino.mk
rename to external/rhino/ExternalProject_rhino.mk
diff --git a/rhino/Makefile b/external/rhino/Makefile
similarity index 71%
rename from rhino/Makefile
rename to external/rhino/Makefile
index ccb1c85..e4968cf 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
similarity index 100%
rename from rhino/Module_rhino.mk
rename to external/rhino/Module_rhino.mk
diff --git a/rhino/OfficeScriptInfo.java b/external/rhino/OfficeScriptInfo.java
similarity index 100%
rename from rhino/OfficeScriptInfo.java
rename to external/rhino/OfficeScriptInfo.java
diff --git a/rhino/README b/external/rhino/README
similarity index 100%
rename from rhino/README
rename to external/rhino/README
diff --git a/rhino/UnpackedTarball_rhino.mk b/external/rhino/UnpackedTarball_rhino.mk
similarity index 75%
rename from rhino/UnpackedTarball_rhino.mk
rename to external/rhino/UnpackedTarball_rhino.mk
index 4ee92d2..0a1492b 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
similarity index 100%
rename from rhino/rhino1_5R5-find_swing.patch
rename to external/rhino/rhino1_5R5-find_swing.patch
diff --git a/rhino/rhino1_5R5-updateToolTip.patch b/external/rhino/rhino1_5R5-updateToolTip.patch
similarity index 100%
rename from rhino/rhino1_5R5-updateToolTip.patch
rename to external/rhino/rhino1_5R5-updateToolTip.patch
diff --git a/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch
similarity index 100%
rename from rhino/rhino1_5R5.patch
rename to external/rhino/rhino1_5R5.patch