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 /postprocess | |
| 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 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 8 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 488e3228470b..711e1a0b557f 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -167,9 +167,7 @@ my_components += \ component/extensions/source/propctrlr/pcr \ component/extensions/source/resource/res \ component/extensions/source/scanner/scn \ - component/extensions/source/update/check/updchk.uno \ component/extensions/source/update/feed/updatefeed \ - component/extensions/source/update/ui/updchk \ component/fpicker/source/generic/fpicker \ component/fpicker/source/office/fps_office \ syssh \ @@ -262,6 +260,12 @@ my_components += kdebe1 my_components += kde4be1 .END +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" +my_components += \ + component/extensions/source/update/check/updchk.uno \ + component/extensions/source/update/ui/updchk +.END + .IF "$(ENABLE_OPENGL)" == "TRUE" my_components += component/slideshow/source/engine/OGLTrans/ogltrans .END diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index f17b9446d32d..c9a73bd90c5f 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -46,7 +46,6 @@ MY_XCDS = \ $(MISC)/lingucomponent.xcd \ $(MISC)/main.xcd \ $(MISC)/math.xcd \ - $(MISC)/onlineupdate.xcd \ $(MISC)/palm.xcd \ $(MISC)/pocketexcel.xcd \ $(MISC)/pocketword.xcd \ @@ -362,13 +361,6 @@ MY_FILES_math = \ $(MY_MOD)/org/openoffice/Office/Embedding-math.xcu \ $(MY_MOD)/org/openoffice/Setup-math.xcu -.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" -MY_DEPS_onlineupdate = main -MY_FILES_onlineupdate = \ - $(MY_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \ - $(MY_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu -.ENDIF - MY_DEPS_palm = main MY_FILES_palm = \ $(MY_MOD)/fcfg_palm_filters.xcu \ @@ -465,6 +457,14 @@ MY_FILES_gnome += \ .END .END +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" +MY_XCDS += $(MISC)/onlineupdate.xcd \ +MY_DEPS_onlineupdate = main +MY_FILES_onlineupdate = \ + $(MY_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \ + $(MY_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu +.ENDIF + .IF "$(ENABLE_OPENGL)" == "TRUE" MY_XCDS += $(MISC)/ogltrans.xcd MY_DEPS_ogltrans = main |