diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-04-17 23:07:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-04-17 23:58:16 +0200 |
| commit | 559d82d9bf69eeebb02aa857657f959241c1ed8c (patch) | |
| tree | f49dc58e89f108dbaf1264e6c21edde72d88cddf /scp2 | |
| parent | 1ba03cff6f9f2ba3f3912818c301ce7a07bf6027 (diff) | |
scp2: move Jars from module ooo to AutoInstall
Change-Id: Ide08e2da5c129f5df502ac3955738f8bfca56d41
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 55 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 14 |
2 files changed, 1 insertions, 68 deletions
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 |