diff options
| -rw-r--r-- | Repository.mk | 29 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 55 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 14 |
3 files changed, 17 insertions, 81 deletions
diff --git a/Repository.mk b/Repository.mk index 3b6f3d9c9ab2..540e913862cd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -644,35 +644,38 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \ unoloader \ )) +$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \ + ScriptFramework \ + ScriptProviderForJava \ + XMergeBridge \ + commonwizards \ + form \ + $(if $(filter-out MACOSX,$(OS)),officebean) \ + query \ + report \ + sdbc_hsqldb \ + smoketest \ + table \ + unoil \ + xmerge \ +)) + $(eval $(call gb_Helper_register_jars,OOO, \ ConnectivityTools \ - ScriptFramework \ ScriptProviderForBeanShell \ - ScriptProviderForJava \ ScriptProviderForJavaScript \ - XMergeBridge \ XSLTFilter \ XSLTValidate \ - commonwizards \ agenda \ aportisdoc \ fax \ - form \ htmlsoff \ letter \ - officebean \ pexcel \ pocketword \ - query \ - report \ reportbuilder \ reportbuilderwizard \ - sdbc_hsqldb \ - smoketest \ - table \ - unoil \ web \ - xmerge \ )) $(eval $(call gb_Helper_register_jars,OXT, \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ac0e199eee7d..c5fbb31d06a7 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -278,61 +278,6 @@ End #endif -#ifdef ENABLE_JAVA - -#ifndef MACOSX - -File gid_File_Jar_Officebean - TXT_FILE_BODY; - Name = JARFILENAME(officebean); - Dir = gid_Dir_Classes; - Styles = (PACKED); -End - -#endif - -#endif - - -#ifdef ENABLE_JAVA -STD_JAR_FILE( gid_File_Jar_Report, report ) -STD_JAR_FILE( gid_File_Jar_Smoketest, smoketest ) -STD_JAR_FILE( gid_File_Jar_Table, table ) -STD_JAR_FILE( gid_File_Jar_Form, form ) -STD_JAR_FILE( gid_File_Jar_Query, query ) -STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge ) -STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) -#endif - -#ifdef ENABLE_JAVA -STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb ) -#endif - -#ifdef ENABLE_JAVA -File gid_File_Jar_Commonwizards - TXT_FILE_BODY; - Name = JARFILENAME(commonwizards); - Dir = gid_Dir_Classes; - Styles = (PACKED); -End -#endif - -#ifdef ENABLE_JAVA -STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) -STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) -#endif - -#ifdef ENABLE_JAVA - -File gid_File_Jar_Unoil - TXT_FILE_BODY; - Name = "unoil.jar"; - Dir = gid_Dir_Classes; - Styles = (PACKED); -End - -#endif - #ifndef AIX #ifndef DISABLE_PYUNO diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 010f3cf3c1a0..7b3c2cab93e3 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -106,24 +106,12 @@ Module gid_Module_Root_Files_3 Sortkey = "1300"; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Jar_Unoil, - gid_File_Jar_Hsqldb_Sdbc, - gid_File_Jar_Officebean, - gid_File_Jar_Report, - gid_File_Jar_Smoketest, - gid_File_Jar_Table, + Files = ( gid_File_Jar_Letter, - gid_File_Jar_Form, gid_File_Wizards_Common, gid_File_Wizards_Fax, gid_File_Jar_Agenda, gid_File_Jar_Web, - gid_File_Jar_Query, - gid_File_Jar_Commonwizards, - gid_File_Jar_Scriptframework, - gid_File_Jar_Scriptproviderforjava, - gid_File_Jar_Xmerge, - gid_File_Jar_Xmergebridge, gid_File_Rdb_Offapi, gid_Starregistry_Services_Rdb); End |