diff options
| -rw-r--r-- | extensions/Module_extensions.mk | 7 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 8 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 16 | ||||
| -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 | ||||
| -rw-r--r-- | setup_native/scripts/makefile.mk | 5 |
9 files changed, 32 insertions, 16 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 00b7d7c4662b..30144de68361 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -52,10 +52,14 @@ endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extensions,\ + Library_updatefeed \ +)) + +ifeq ($(ENABLE_ONLINE_UPDATE),TRUE) +$(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_updchk \ Configuration_updchk \ Library_updatecheckui \ - Library_updatefeed \ Library_updchk \ )) @@ -63,6 +67,7 @@ $(eval $(call gb_Module_add_check_targets,extensions,\ CppunitTest_extensions_test_update \ )) endif +endif ifeq ($(OS),WNT) 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 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, diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index 61dc0b786bf3..7a03660ad858 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -42,10 +42,13 @@ UNIXTEXT= \ $(BIN)$/javaloader.sh \ $(BIN)$/register_extensions \ $(BIN)$/deregister_extensions \ - $(BIN)$/unpack_update.sh \ $(BIN)$/update.sh \ $(BIN)$/downloadscript.sh +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" +UNIXTEXT += $(BIN)$/unpack_update.sh +.END + NOARCH=$(BIN)$/noarch FAKEDB=$(NOARCH)/fake-db-1.0-0.noarch.rpm FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root |