Kaydet (Commit) 79ab9d7b authored tarafından Michael Stahl's avatar Michael Stahl

fdo#74495: gbuild: AutoInstall: add support for ComponentCondition

... via new scp2 macro LIBO_LIB_FILE_COMPONENTCONDITION.

(regression from 2feb756d)

Change-Id: I6ab30cc1c14c34bd7dc1325e3f98d972544e7eea
üst f985e3ad
......@@ -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))
......
......@@ -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); \
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment