diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2012-05-05 12:13:37 +0200 |
|---|---|---|
| committer | Tomas Chvatal <tchvatal@suse.cz> | 2012-05-05 12:15:38 +0200 |
| commit | 0815a87c0c3fc1705170d8500056b2fae980e1e2 (patch) | |
| tree | 731f5f56b919a0436fe60a80c536ee97d1134c6d /scp2 | |
| parent | e10adabc55194cd47f26e726137d2fd036f3cadb (diff) | |
Do not check for beanshell if not needed
Do not install the benashell/javascript stuff if they are not actually
bult.
Build rhino only when required by javascript extension.
Change-Id: Icc378524008389af35631c64a1a0288eb4f271be
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 33279783e9ba..62361e65e11c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -707,25 +707,29 @@ File gid_File_Share_Registry_Ctlseqcheck_Xcd Name (th) = "ctlseqcheck.xcd"; End -File gid_File_Scripts_Beanshell +#ifdef SOLAR_JAVA +File gid_File_Scripts_Java Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; - Name = "ScriptsBeanShell.zip"; + Name = "ScriptsJava.zip"; End -#ifdef SOLAR_JAVA -File gid_File_Scripts_Java +#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +File gid_File_Scripts_Beanshell Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; - Name = "ScriptsJava.zip"; + Name = "ScriptsBeanShell.zip"; End #endif +#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT File gid_File_Scripts_Javascript Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; Name = "ScriptsJavaScript.zip"; End +#endif +#endif // new user interface configuration files File gid_File_Share_Config_Sofficecfg_uiconfig_Zip |