diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-04-05 21:03:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-04-05 21:10:57 +0200 |
| commit | 7a56eef989b828c495d34c34de99d1b863f223e2 (patch) | |
| tree | bd7a94bcdf5f7c3dff745438123b6c1ac4ec0485 /scp2 | |
| parent | 0de1b33bf73f075cff12fbe288129b2afff8216d (diff) | |
Clean up optional online update module
* The updatecheckui lib is part of that module; should its scp entry also be
marked ComponentCondition="ISCHECKFORPRODUCTUPDATES=1"?
* unpack_update (and other scripts as well?) need only be generated if
ENABLE_ONLINE_UPDATE.
* It is inconsistent that there is a distinct onlineupdate.xcd not merged into
main.xcd, while the updchk and updatecheckui component files are merged into
the global services.rdb.
* The updchk res file should also go into (a resource sub-module of) the
optional online update module.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/onlineupdate/file_onlineupdate.scp | 2 | ||||
| -rw-r--r-- | scp2/source/onlineupdate/module_onlineupdate.scp | 5 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
5 files changed, 8 insertions, 4 deletions
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 63d19687425f..023097ff7a08 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -35,6 +35,8 @@ File gid_File_Lib_Updchk ComponentCondition="ISCHECKFORPRODUCTUPDATES=1"; End +STD_LIB_FILE(gid_File_Lib_Updchkui, updatecheckui) + File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index 6685450774f2..b33235b78e4a 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -34,5 +34,8 @@ Module gid_Module_Optional_Onlineupdate ParentID = gid_Module_Optional; Default = YES; Styles = (DONTSHOWINUSERINSTALL); - Files = (gid_File_Lib_Updchk, gid_File_Share_Registry_Onlineupdate_Xcd, gid_File_Bin_UnpackUpdate); + Files = (gid_File_Bin_UnpackUpdate, + gid_File_Lib_Updchk, + gid_File_Lib_Updchkui, + gid_File_Share_Registry_Onlineupdate_Xcd); End diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 689a71bd7aeb..50562f3d970d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1498,8 +1498,6 @@ End STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) -STD_LIB_FILE( gid_File_Lib_Updchkui , updatecheckui ) - SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) #ifndef SYSTEM_OPENSSL diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 2f26dd75d7a3..5cda7bced96e 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -115,7 +115,9 @@ STD_RES_FILE( gid_File_Res_AVMedia, avmedia ) STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec ) +#if defined ENABLE_ONLINE_UPDATE STD_RES_FILE( gid_File_Res_UpdChk, updchk ) +#endif STD_RES_FILE( gid_File_Res_Upd, upd ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 438dcdea6233..cdcd157ef52e 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -478,7 +478,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Hatchwindowfactory, gid_File_Lib_Passwordcontainer, gid_File_Lib_Svtmisc, - gid_File_Lib_Updchkui, gid_File_Lib_Updatefeed, gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly, |