configure inclusion/exclusion of scripting providers

3 files changed, 50 insertions, 7 deletions

diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index e731d3371aef..92223522b66c 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 e8bdb819055d..b8919bcadf87 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 6cdd35d3a8c0..568b2e1eca7a 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