[Libreoffice-commits] .: instsetoo_native/util scp2/source
David Tardon
dtardon at kemper.freedesktop.org
Fri Nov 5 23:17:01 PDT 2010
instsetoo_native/util/makefile.mk | 1
scp2/source/extensions/directory_extensions.scp | 17 ++++++++++
scp2/source/extensions/file_extensions.scp | 23 ++++++++++++++
scp2/source/extensions/module_extensions.scp | 39 ++++++++++++++++++++++++
scp2/source/extensions/module_extensions.ulf | 18 +++++++++++
scp2/source/ooo/file_ooo.scp | 6 ---
scp2/source/ooo/module_hidden_ooo.scp | 3 -
scp2/source/python/file_python.scp | 12 -------
scp2/source/python/module_python.scp | 2 -
9 files changed, 98 insertions(+), 23 deletions(-)
New commits:
commit c9697c475ae60926e13dc21c9cba773951950263
Author: David Tardon <dtardon at redhat.com>
Date: Fri Oct 29 17:55:38 2010 +0200
transform script providers into extensions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 5f18a52..117aba3 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -72,7 +72,6 @@ LOCALPYFILES= \
$(BIN)$/uno.py \
$(BIN)$/unohelper.py \
$(BIN)$/pythonloader.py \
- $(BIN)$/pythonscript.py \
$(BIN)$/officehelper.py \
$(BIN)$/mailmerge.py
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 0e072a9..a9fd5ec 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -249,3 +249,20 @@ End
#endif
+
+/* script providers */
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "script-provider-for-beanshell";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "script-provider-for-javascript";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "script-provider-for-python";
+End
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 79bbce9..0544531 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -302,4 +302,27 @@ File gid_File_Optional_Extensions_Sun_Template_Pack
UnixRights = 444;
End
+/* script providers */
+
+File gid_File_Oxt_Script_Provider_For_Beanshell
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
+ Name = "script-provider-for-beanshell.oxt";
+End
+
+File gid_File_Oxt_Script_Provider_For_Javascript
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
+ Name = "script-provider-for-javascript.oxt";
+End
+
+File gid_File_Oxt_Script_Provider_For_Python
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python;
+ Name = "script-provider-for-python.oxt";
+End
+
#endif
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 6f0af6d..7cd525f 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -377,3 +377,42 @@ Module gid_Module_Optional_Extensions_Sun_Template_Pack
End
#endif
#endif
+
+#ifdef WITH_EXTENSION_INTEGRATION
+Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_Script_Provider_For_Beanshell );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
+
+#ifdef WITH_EXTENSION_INTEGRATION
+Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_Script_Provider_For_Javascript );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
+
+#ifdef WITH_EXTENSION_INTEGRATION
+Module gid_Module_Optional_Extensions_Script_Provider_For_Python
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_Script_Provider_For_Python );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index 900065a..3bd36d5 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -158,3 +158,21 @@ en-US = "Sun Professional Template Pack"
[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
en-US = "Sun Professional Template Pack"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
+en-US = "Script provider for Python"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
+en-US = "Script provider for Python"
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d052261..0eb090c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -453,10 +453,6 @@ UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
#endif
#ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Js, js )
-#endif
-
-#ifdef SOLAR_JAVA
#ifndef MACOSX
@@ -501,9 +497,7 @@ End
#ifdef SOLAR_JAVA
UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
#endif
#ifdef SOLAR_JAVA
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 5ffe87a..4a4b2ff 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -91,7 +91,6 @@ Module gid_Module_Root_Files_3
gid_File_Jar_Hsqldb,
gid_File_Jar_Hsqldb_Sdbc,
gid_File_Jar_Accessbridge,
- gid_File_Jar_Js,
gid_File_Jar_Officebean,
gid_File_Jar_Report,
gid_File_Jar_Table,
@@ -104,9 +103,7 @@ Module gid_Module_Root_Files_3
gid_File_Jar_Commonwizards,
gid_File_Jar_Sandbox,
gid_File_Jar_Scriptframework,
- gid_File_Jar_Scriptproviderforbeanshell,
gid_File_Jar_Scriptproviderforjava,
- gid_File_Jar_Scriptproviderforjavascript,
gid_File_Jar_Xml_Apis,
gid_File_Jar_Bsh,
gid_File_Jar_Classes,
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index e586876..0876b53 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -104,18 +104,6 @@ End
#endif
#endif
-// Scripting Framework Python script proxy
-
-#ifndef AIX
-File gid_File_Py_Pythonscript
- TXT_FILE_BODY;
- Dir = gid_Dir_Program;
- Name = "pythonscript.py";
- RegistryID = gid_Starregistry_Services_Rdb;
- Styles = (PACKED,UNO_COMPONENT);
-End
-#endif
-
//Scripting Framework Python example scripts
File gid_File_Scripts_Python
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 3abeec2..d32f6f6 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -32,7 +32,7 @@ Module gid_Module_Optional_Pyuno
MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
ParentID = gid_Module_Optional;
Sortkey = "750";
- Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+ Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
Minimal = NO;
Default = YES;
Styles = ( );
More information about the Libreoffice-commits
mailing list