[Libreoffice-commits] .: configure.in scp2/source set_soenv.in
David Tardon
dtardon at kemper.freedesktop.org
Fri Feb 18 00:52:24 PST 2011
configure.in | 51 ++++++++++++++++++++++++
scp2/source/extensions/directory_extensions.scp | 18 ++++++++
scp2/source/extensions/file_extensions.scp | 19 ++++++++
scp2/source/extensions/module_extensions.scp | 20 +++++++--
set_soenv.in | 3 +
5 files changed, 104 insertions(+), 7 deletions(-)
New commits:
commit 906c6df7e77a8b5e119e852fa98fc84bcfba1795
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 18 09:34:44 2011 +0100
configure inclusion/exclusion of scripting providers
diff --git a/configure.in b/configure.in
index 45a22cd..20b3051 100755
--- a/configure.in
+++ b/configure.in
@@ -83,6 +83,21 @@ AC_ARG_ENABLE(ext-report-builder,
[Enables the build of the Report Builder extension.]),
,)
+AC_ARG_ENABLE(ext-scripting-beanshell,
+ AS_HELP_STRING([--enable-ext-scripting-beanshell],
+ [Enables support for scripts in BeanShell]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-javascript,
+ AS_HELP_STRING([--enable-ext-scripting-javascript],
+ [Enables support for scripts in JavaScript]),
+,)
+
+AC_ARG_ENABLE(ext-scripting-python,
+ AS_HELP_STRING([--enable-ext-scripting-python],
+ [Enables support for scripts in Python]),
+,)
+
AC_ARG_ENABLE(ext-typo,
AS_HELP_STRING([--enable-ext-typo],
[Enables the Typography Toolbar extension.]),
@@ -6682,6 +6697,42 @@ AC_SUBST(COMMONS_LANG_JAR)
AC_SUBST(COMMONS_HTTPCLIENT_JAR)
AC_SUBST(COMMONS_LOGGING_JAR)
+# scripting provider for BeanShell extension?
+AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell])
+AS_IF([test "x$enable_ext_scripting_beanshell" = "xyes"], [
+ AC_MSG_RESULT([yes])
+ ENABLE_SCRIPTING_BEANSHELL=YES
+],[
+ AC_MSG_RESULT([no])
+ ENABLE_SCRIPTING_BEANSHELL=NO
+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_BEANSHELL"
+])
+AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
+
+# scripting provider for JavaScript extension?
+AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript])
+AS_IF([test "x$enable_ext_scripting_javascript" = "xyes"], [
+ AC_MSG_RESULT([yes])
+ ENABLE_SCRIPTING_JAVASCRIPT=YES
+],[
+ AC_MSG_RESULT([no])
+ ENABLE_SCRIPTING_JAVASCRIPT=NO
+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT"
+])
+AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
+
+# scripting provider for Python extension?
+AC_MSG_CHECKING([whether to build extension for support of scripts in Python])
+AS_IF([test "x$enable_ext_scripting_python" = "xyes"], [
+ AC_MSG_RESULT([yes])
+ ENABLE_SCRIPTING_PYTHON=YES
+],[
+ AC_MSG_RESULT([no])
+ ENABLE_SCRIPTING_PYTHON=NO
+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_PYTHON"
+])
+AC_SUBST(ENABLE_SCRIPTING_PYTHON)
+
dnl ===================================================================
dnl Check whether the Qt3 and KDE3 libraries are available.
dnl ===================================================================
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index e731d33..9222352 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -267,21 +267,37 @@ End
#endif
-/* script providers */
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell
ParentID = gid_Brand_Dir_Share_Extensions;
DosName = "script-provider-for-beanshell";
End
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+
Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript
ParentID = gid_Brand_Dir_Share_Extensions;
DosName = "script-provider-for-javascript";
End
+#endif
+
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+
Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python
ParentID = gid_Brand_Dir_Share_Extensions;
DosName = "script-provider-for-python";
End
#endif
+
+#endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index e8bdb81..b8919bc 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -287,7 +287,6 @@ End
#endif
-
/* ** Sun Template Pack ** */
#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
@@ -306,7 +305,9 @@ End
#endif
-/* script providers */
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
File gid_File_Oxt_Script_Provider_For_Beanshell
TXT_FILE_BODY;
@@ -315,6 +316,12 @@ File gid_File_Oxt_Script_Provider_For_Beanshell
Name = "script-provider-for-beanshell.oxt";
End
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+
File gid_File_Oxt_Script_Provider_For_Javascript
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
@@ -322,6 +329,12 @@ File gid_File_Oxt_Script_Provider_For_Javascript
Name = "script-provider-for-javascript.oxt";
End
+#endif
+
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
+
File gid_File_Oxt_Script_Provider_For_Python
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
@@ -330,3 +343,5 @@ File gid_File_Oxt_Script_Provider_For_Python
End
#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 6cdd35d..568b2e1 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -343,9 +343,10 @@ Module gid_Module_Optional_Extensions_Sun_Template_Pack
End
#endif
-#endif
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
-#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);
@@ -356,9 +357,13 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
Default = YES;
Styles = ( );
End
+
#endif
-#ifdef WITH_EXTENSION_INTEGRATION
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+
Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
PackageInfo = "packinfo_extensions.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
@@ -369,9 +374,13 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
Default = YES;
Styles = ( );
End
+
#endif
-#ifdef WITH_EXTENSION_INTEGRATION
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
+
Module gid_Module_Optional_Extensions_Script_Provider_For_Python
PackageInfo = "packinfo_extensions.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON);
@@ -382,4 +391,7 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_Python
Default = YES;
Styles = ( );
End
+
+#endif
+
#endif
diff --git a/set_soenv.in b/set_soenv.in
index 2d810b3..e892837 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1635,6 +1635,9 @@ ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
+ToFile( "ENABLE_SCRIPTING_BEANSHELL","@ENABLE_SCRIPTING_BEANSHELL@","e" );
+ToFile( "ENABLE_SCRIPTING_JAVASCRIPT","@ENABLE_SCRIPTING_JAVASCRIPT@","e" );
+ToFile( "ENABLE_SCRIPTING_PYTHON","@ENABLE_SCRIPTING_PYTHON@","e" );
ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
ToFile( "WITH_THEMES", "@WITH_THEMES@", "e");
More information about the Libreoffice-commits
mailing list