diff options
author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-02-10 17:28:49 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-17 16:44:56 +0000 |
commit | 2130deb2d13f7cbb5b5e55c061ad794e47e6999d (patch) | |
tree | 8d612af075ed67d74a69aa1294159ed7de18c21d /scp2 | |
parent | get clucene building under windows-msvc (diff) | |
download | core-2130deb2d13f7cbb5b5e55c061ad794e47e6999d.tar.gz core-2130deb2d13f7cbb5b5e55c061ad794e47e6999d.zip |
Introduce headless switch for X / cairo / toolkit less build
The plan is to reduce dependencies to be easier to deploy
libreoffice server side in headless mode.
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 14 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 6c6fb66f2e50..301d63d96d1d 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -522,7 +522,7 @@ File gid_Brand_File_Bin_Soffice #endif End -#if defined(UNX) && !defined(QUARTZ) +#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS) File gid_Brand_File_Bin_Spadmin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 3d463393c557..5bfe68575cf4 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -548,6 +548,8 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) +#ifndef HEADLESS + #ifndef SYSTEM_CAIRO File gid_File_Lib_Cairo @@ -588,6 +590,8 @@ End #endif +#endif + STD_LIB_FILE( gid_File_Lib_Frm , frm) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno ) @@ -930,7 +934,7 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -#if defined(UNX) && ! defined(QUARTZ) +#if defined(UNX) && ! defined(QUARTZ) && ! defined(HEADLESS) File gid_File_Lib_Desktop_Detector Name = LIBNAME(desktop_detector); LIB_FILE_BODY; @@ -1156,7 +1160,7 @@ End STD_LIB_FILE( gid_File_Lib_Sot, sot ) -#if defined(UNX) && !defined(QUARTZ) +#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS) File gid_File_Lib_Spa Name = LIBNAME(spa); @@ -1174,9 +1178,11 @@ File gid_File_Lib_Spell Dir = SCP2_OOO_BIN_DIR; End +#if !defined HEADLESS STD_LIB_FILE( gid_File_Lib_Spl, spl) +#endif -#if defined UNX && !defined MACOSX +#if defined UNX && !defined MACOSX && !defined HEADLESS STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) #endif @@ -1697,6 +1703,7 @@ File gid_File_Lib_Libcroco End #endif +#if ! defined HEADLESS #if ! defined SYSTEM_PANGO File gid_File_Lib_Libpango LIB_FILE_BODY; @@ -1727,6 +1734,7 @@ File gid_File_Lib_Libpangowin32 End #endif #endif +#endif #if ! defined SYSTEM_LIBGSF File gid_File_Lib_Libgsf diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 33432aaae214..c181a0fdb7b1 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -223,7 +223,7 @@ File gid_File_Bin_Senddoc #endif End -#if defined(UNX) && !defined(QUARTZ) +#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS) File gid_File_Bin_Spadmin_Bin BIN_FILE_BODY; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 311dd9fe158c..05353f16b5ff 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -76,7 +76,7 @@ STD_RES_FILE( gid_File_Res_Sd, sd ) STD_RES_FILE( gid_File_Res_Sfx, sfx ) -#if defined(UNX) && !defined(QUARTZ) +#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS) STD_RES_FILE( gid_File_Res_Spa, spa ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 67499de6f876..90ec4eaa3714 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -689,6 +689,7 @@ Module gid_Module_Root_Files_7 gid_File_Mozilla_Runtime); End +#ifndef HEADLESS Module gid_Module_Root_Files_Images PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root; @@ -719,6 +720,7 @@ Module gid_Module_Root_Files_Images #endif ); End +#endif #ifndef WITHOUT_FONTS Module gid_Module_Root_Fonts_OOo_Hidden |