create these rdbs directly in scripting

Change-Id: I8a44de06f9a16308a5ff82ad77d059e5dde544f9

postprocess/packcomponents/makefile.mk

@@ -412,36 +412,3 @@ $(MISC)/services.input : makefile.mk
         '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
         > $@
 
-.IF "$(ENABLE_SCRIPTING_BEANSHELL)" == "YES"
-ALLTAR : $(MISC)/scriptproviderforbeanshell.rdb
-
-$(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \
-        $(SOLARENV)/bin/packcomponents.xslt \
-        $(MISC)/scriptproviderforbeanshell.input \
-        $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForBeanShell.component
-    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-        $(SOLARENV)/bin/packcomponents.xslt \
-        $(MISC)/scriptproviderforbeanshell.input
-
-$(MISC)/scriptproviderforbeanshell.input : makefile.mk
-    echo \
-        '<list><filename>component/scripting/java/ScriptProviderForBeanShell.component</filename></list>' \
-        > $@
-.END
-
-.IF "$(ENABLE_SCRIPTING_JAVASCRIPT)" == "YES"
-ALLTAR : $(MISC)/scriptproviderforjavascript.rdb
-
-$(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \
-        $(SOLARENV)/bin/packcomponents.xslt \
-        $(MISC)/scriptproviderforjavascript.input \
-        $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForJavaScript.component
-    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-        $(SOLARENV)/bin/packcomponents.xslt \
-        $(MISC)/scriptproviderforjavascript.input
-
-$(MISC)/scriptproviderforjavascript.input : makefile.mk
-    echo \
-        '<list><filename>component/scripting/java/ScriptProviderForJavaScript.component</filename></list>' \
-        > $@
-.END

scripting/Module_scripting.mk

@@ -36,11 +36,15 @@ $(eval $(call gb_Module_add_targets,scripting,\
 		Jar_Highlight \
 		Jar_MemoryUsage \
 		Jar_ScriptFramework \
-        $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
-            Jar_ScriptProviderForBeanShell) \
+		$(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
+			Jar_ScriptProviderForBeanShell \
+			Rdb_scriptproviderforbeanshell \
+		) \
 		Jar_ScriptProviderForJava \
-        $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
-            Jar_ScriptProviderForJavaScript) \
+		$(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
+			Jar_ScriptProviderForJavaScript \
+			Rdb_scriptproviderforjavascript \
+		) \
 		Zip_ScriptsJava \
 	) \
 	$(if $(filter $(ENABLE_SCRIPTING_PYTHON),YES),\

scripting/Rdb_scriptproviderforbeanshell.mk

+# -*- 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,scriptproviderforbeanshell))
+
+$(eval $(call gb_Rdb_add_components,scriptproviderforbeanshell,\
+	scripting/java/ScriptProviderForBeanShell \
+))
+
+# vim: set noet sw=4 ts=4:

scripting/Rdb_scriptproviderforjavascript.mk

+# -*- 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,scriptproviderforjavascript))
+
+$(eval $(call gb_Rdb_add_components,scriptproviderforjavascript,\
+	scripting/java/ScriptProviderForJavaScript \
+))
+
+# vim: set noet sw=4 ts=4: