diff options
Diffstat (limited to 'scp2/source/ooo')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 7 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
4 files changed, 2 insertions, 16 deletions
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, |