[Libreoffice-commits] core.git: postprocess/Rdb_services.mk pyuno/Module_pyuno.mk pyuno/Rdb_pyuno.mk scp2/source

[Stephan Bergmann]

 postprocess/Rdb_services.mk          |    3 ---
 pyuno/Module_pyuno.mk                |    1 +
 pyuno/Rdb_pyuno.mk                   |   16 ++++++++++++++++
 scp2/source/python/file_python.scp   |    7 +++++++
 scp2/source/python/module_python.scp |    1 +
 5 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 7b91e84c72596d8d1dc3687292c9946f172c4df6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 28 11:47:57 2013 +0200

    Optional pyuno module should have its own services/pyuno.rdb
    
    ...this e.g. changes the error message when trying to register an extension that
    contains an (actively registered) Python component but no pyuno is installed
    from "Binary URP bridge disposed during call" to a less frightening "The service
    com.sun.star.loader.Python cannot be instantiated."
    
    Change-Id: I10f2b36b11395559ee95ce659878222b5ea99c11

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 56a341d..d68df0e 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -159,9 +159,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(DISABLE_NEON),, \
 		ucb/source/ucp/webdav-neon/ucpdav1 \
 	) \
-	$(if $(DISABLE_PYTHON),, \
-		pyuno/source/loader/pythonloader \
-	) \
 	$(if $(DISABLE_SCRIPTING),, \
 		basctl/util/basctl \
 		basic/util/sb \
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 05aefa6..de42e49 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Module_add_targets,pyuno,\
     Library_pythonloader \
     Package_pyunorc \
     Package_python_scripts \
+    Rdb_pyuno \
 ))
 
 ifneq ($(OS),WNT)
diff --git a/pyuno/Rdb_pyuno.mk b/pyuno/Rdb_pyuno.mk
new file mode 100644
index 0000000..4d4f5cabf
--- /dev/null
+++ b/pyuno/Rdb_pyuno.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Rdb_Rdb,pyuno))
+
+$(eval $(call gb_Rdb_add_components,pyuno, \
+    pyuno/source/loader/pythonloader \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index f57d2d0..23d4062 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -53,6 +53,13 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader )
 
+File gid_File_Pyuno_Rdb
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program_Services;
+    Name = "pyuno.rdb";
+    Styles = (PACKED);
+End
+
 File gid_File_Py_Unohelper
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 61451cf..6b3b7f0 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -44,6 +44,7 @@ Module gid_Module_Pyuno
             gid_Dir_Py_PythonCore_Bin,
             gid_Dir_Py_PythonCore_Lib);
     Files = (gid_File_Pyuno,
+             gid_File_Pyuno_Rdb,
              gid_File_Lib_Pyuno,
              gid_File_Lib_Pythonloader,
              gid_File_Py_Bin_Python,