diff options
-rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
-rwxr-xr-x | scp2/inc/macros.inc | 7 | ||||
-rw-r--r-- | solenv/gbuild/AutoInstall.mk | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 8550649379e9..ca4b99d09ca5 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -17,7 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index d95c364bbe38..1ec649d652c6 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -158,6 +158,13 @@ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); \ End +#define LIBO_LIB_FILE_COMPONENTCONDITION(id,name,cond) \ + File id \ + Name = name; \ + PACKED_LIB_FILE_BODY; \ + ComponentCondition = cond; \ + End + #define STD_LIB_FILE(id,name) \ File id \ Name = LIBNAME(name); \ diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index de94507065c6..a7544857c48e 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -26,7 +26,7 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoI $(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \ $(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe))) $(foreach lib,$(gb_Library_MODULE_$*),\ - echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;) + echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;) @@ -53,6 +53,7 @@ $(call gb_AutoInstall_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) $(call gb_AutoInstall_get_target,$(1)) :| $(dir $(call gb_AutoInstall_get_target,$(1))).dir $(call gb_AutoInstall_get_target,$(1)) : SCP2LIBTEMPLATE := $(2) $(call gb_AutoInstall_get_target,$(1)) : SCP2EXETEMPLATE := $(3) +$(call gb_AutoInstall_get_target,$(1)) : SCP2COMPONENTCONDITION := $(4) endef |