diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-22 21:02:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-22 21:02:05 +0200 |
| commit | 70cba374f6862bb6b3568927267fc9e1fe3c0922 (patch) | |
| tree | a95d34aa7e5d9cf13cfa4326991b5b78c96a037a | |
| parent | 06850097f74e1ef93a90d45a8c3426976f3fe902 (diff) | |
scp2: add AutoInstall support for executables with COMPONENTCONDITION
Change-Id: I36f14d9ba08ab2473a555681b934b8b35cfa06b2
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/inc/macros.inc | 9 | ||||
| -rw-r--r-- | solenv/gbuild/AutoInstall.mk | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 5a7c4f9e7a82..7d2a3472fe57 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -31,7 +31,7 @@ $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) +$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE)) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 6f8e6ab086de..47f59f17e9e3 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -538,6 +538,15 @@ End Styles = (PACKED); \ End +#define LIBO_EXECUTABLE_COMPONENTCONDITION(id,name,cond) \ + File id \ + BIN_FILE_BODY; \ + Dir = gid_Brand_Dir_Program; \ + Name = name; \ + Styles = (PACKED); \ + ComponentCondition = cond; \ + End + #define SDK_EXECUTABLE(id,name) \ File id \ BIN_FILE_BODY; \ diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index 282b02a93e9a..11ff644ee8a3 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -60,7 +60,7 @@ endif $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\ echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../program/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ - echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe)))" >> $@;) + echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))" >> $@;) $(foreach jar,$(gb_Jar_MODULE_$*),\ echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(subst .,_,$(subst -,_,$(jar))),$(jar).jar)' >> $@;) $(foreach pkg,$(gb_Package_MODULE_$*),\ |