[Libreoffice-commits] core.git: scp2/AutoInstall.mk scp2/inc solenv/gbuild

[Michael Stahl]

 scp2/AutoInstall.mk          |    2 +-
 scp2/inc/macros.inc          |    7 +++++++
 solenv/gbuild/AutoInstall.mk |    3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 79ab9d7b6ede19bc494770bba6cc59bd4618d5ae
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 4 16:49:08 2014 +0100

    fdo#74495: gbuild: AutoInstall: add support for ComponentCondition
    
    ... via new scp2 macro LIBO_LIB_FILE_COMPONENTCONDITION.
    
    (regression from 2feb756dd5ff486a3972cf676f6f1d07017bf0f6)
    
    Change-Id: I6ab30cc1c14c34bd7dc1325e3f98d972544e7eea

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 8550649..ca4b99d 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 d95c364..1ec649d 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 de94507..a754485 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