summaryrefslogtreecommitdiffstats
path: root/scp2
diff options
context:
space:
mode:
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/extensions/directory_extensions.scp22
-rw-r--r--scp2/source/extensions/file_extensions.scp30
-rw-r--r--scp2/source/extensions/makefile.mk4
-rw-r--r--scp2/source/extensions/module_extensions.scp12
-rw-r--r--scp2/source/ooo/common_brand.scp7
-rw-r--r--scp2/source/ooo/file_ooo.scp6
-rw-r--r--scp2/source/ooo/makefile.mk4
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
8 files changed, 34 insertions, 52 deletions
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 0ccc3f3b44f2..abb299982975 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -262,28 +262,6 @@ End
#endif
-/* ** 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_JAVASCRIPT
-
-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_PYTHON
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 4397c3716e9a..502bcf1b02b2 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -302,26 +302,36 @@ End
/* ** Script provider for BeanShell ** */
-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
-File gid_File_Oxt_Script_Provider_For_Beanshell
+#if !defined SYSTEM_BSH
+STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
+#endif
+
+STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
+
+File gid_File_Rdb_Scriptproviderforbeanshell
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
- Name = "script-provider-for-beanshell.oxt";
+ Name = "scriptproviderforbeanshell.rdb";
+ Dir = gid_Brand_Dir_Program_Services;
+ Styles = (PACKED);
End
#endif
/* ** Script provider for JavaScript ** */
-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
-File gid_File_Oxt_Script_Provider_For_Javascript
+STD_JAR_FILE( gid_File_Jar_Js, js )
+
+STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
+
+File gid_File_Rdb_Scriptproviderforjavascript
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
- Name = "script-provider-for-javascript.oxt";
+ Name = "scriptproviderforjavascript.rdb";
+ Dir = gid_Brand_Dir_Program_Services;
+ Styles = (PACKED);
End
#endif
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
index 1c856401aa37..00b23aeec030 100644
--- a/scp2/source/extensions/makefile.mk
+++ b/scp2/source/extensions/makefile.mk
@@ -39,6 +39,10 @@ TARGETTYPE=CUI
.INCLUDE : settings.mk
+.IF "$(SYSTEM_BSH)" == "YES"
+SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
+.ENDIF
+
SCP_PRODUCT_TYPE=osl
PARFILES= \
module_extensions.par \
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 255930178b38..e3514bc4e94c 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -339,14 +339,16 @@ End
/* ** Script provider for BeanShell ** */
-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
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 );
+ gid_File_Jar_Bsh,
+ gid_File_Jar_Scriptproviderforbeanshell,
+ gid_File_Rdb_Scriptproviderforbeanshell );
Minimal = NO;
Default = YES;
Styles = ( );
@@ -356,14 +358,16 @@ End
/* ** Script provider for JavaScript ** */
-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+#if defined SOLAR_JAVA && !defined 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);
ParentID = gid_Module_Optional_Extensions;
Files = (
- gid_File_Oxt_Script_Provider_For_Javascript );
+ gid_File_Jar_Js,
+ gid_File_Jar_Scriptproviderforjavascript,
+ gid_File_Rdb_Scriptproviderforjavascript );
Minimal = NO;
Default = YES;
Styles = ( );
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 710cdb8863ad..794359cc429d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1209,14 +1209,11 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
Section = "Bootstrap";
Key = "URE_MORE_JAVA_CLASSPATH_URLS";
Value = "";
-#ifdef SYSTEM_BSH
- ValueList1 = BSH_JAR;
-#endif
#ifdef SYSTEM_HSQLDB
- ValueList2 = HSQLDB_JAR;
+ ValueList1 = HSQLDB_JAR;
#endif
#ifdef SYSTEM_SAXON
- ValueList3 = SAXON_JAR;
+ ValueList2 = SAXON_JAR;
#endif
End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a8e0d88ebc47..b53c69dee678 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -391,12 +391,6 @@ End
#endif
#ifdef SOLAR_JAVA
-#ifndef SYSTEM_BSH
-STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
-#endif
-#endif
-
-#ifdef SOLAR_JAVA
#ifndef SYSTEM_LUCENE
STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 )
STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 )
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index ce2ab526fb22..bf17b8485694 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -184,10 +184,6 @@ SCPDEFS+=\
-DREDLAND_MAJOR=$(REDLAND_MAJOR)
.ENDIF
-.IF "$(SYSTEM_BSH)" == "YES"
-SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
-.ENDIF
-
.IF "$(SYSTEM_HSQLDB)" == "YES"
SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
.ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 20d9b166fcef..cc080b5faa68 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -148,7 +148,6 @@ Module gid_Module_Root_Files_3
gid_File_Jar_Scriptframework,
gid_File_Jar_Scriptproviderforjava,
gid_File_Jar_Xml_Apis,
- gid_File_Jar_Bsh,
gid_File_Jar_Classes,
gid_File_Jar_Xsltfilter,
gid_File_Jar_Xsltvalidate,
generated by cgit (git 2.34.1) at 2024-07-24 11:25:35 +0000