Kaydet (Commit) f624144e authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen Kaydeden (comit) Fridrich Strba

move postprocess to gbuild

the gb_Postprocess* foo could also be in gb_Module* as it is
conceptionally close ('do things globally/productwide'). OTOH I see no
obvious reason for e.g. signing not to be done right along with building
a lib/executable anyway instead of in postprocess. The same is likely
true for the other stuff too.

Change-Id: I9c8f569564c056643af7ca39bfe038ed228dcd3d
Reviewed-on: https://gerrit.libreoffice.org/2426Reviewed-by: 's avatarMatúš Kukan <matus.kukan@gmail.com>
Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst c81e40d0
......@@ -146,6 +146,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
package \
padmin \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
postprocess \
psprint_config \
$(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,PYUNO,pyuno) \
......
......@@ -20,7 +20,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig_%.zip : \
$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
@true
$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : $(SRCDIR)/postprocess/packconfig/packconfig.pl
$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : \
$(SRCDIR)/postprocess/packconfig/packconfig.pl $(call gb_Postprocess_get_target,AllPackages)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
cd $(SRCDIR)/postprocess/packconfig \
&& $(PERL) packconfig.pl -i $(OUTDIR)/xml/uiconfig -o $(dir $@)
......
......@@ -39,7 +39,7 @@ $(call gb_CustomTarget_get_target,postprocess/images) : \
$(if $(filter default,$(WITH_THEMES)),$(packimages_DIR)/images.zip) \
$(foreach theme,$(filter-out default,$(WITH_THEMES)),$(packimages_DIR)/images_$(theme).zip)
$(packimages_DIR)/images.zip : \
$(packimages_DIR)/images.zip : $(call gb_Postprocess_get_target,AllResources) \
$(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Helper_abbreviate_dirs, \
......@@ -48,7 +48,7 @@ $(packimages_DIR)/images.zip : \
-l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
$(packimages_DIR)/images_%.zip : \
$(packimages_DIR)/images_%.zip : $(call gb_Postprocess_get_target,AllResources) \
$(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Helper_abbreviate_dirs, \
......
......@@ -499,6 +499,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).xcd : \
$(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).list : \
$(foreach file,$(postprocess_FILES_$(1)),$(OUTDIR)/xml/$(file)) \
$(SRCDIR)/postprocess/CustomTarget_registry.mk \
$(call gb_Postprocess_get_target,AllPackages) \
| $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
endef
......
......@@ -9,6 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,postprocess/signing))
$(eval $(call gb_CustomTarget_register_targets,postprocess/signing,\
signing.done \
))
......@@ -20,7 +21,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(SRCDIR)/postprocess/signing/signing.pl \
$(SRCDIR)/postprocess/signing/no_signing.txt \
$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done:
$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \
$(call gb_Postprocess_get_target,AllLibraries) $(call gb_Postprocess_get_target,AllExecutables)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
ifeq ($(COM),MSC)
ifneq ($(ENABLE_DBGUTIL),TRUE)
......
......@@ -9,9 +9,6 @@
$(eval $(call gb_Module_Module,postprocess))
# Do not add to tail_build!
# At least CustomTarget_config and CustomTarget_signing would miss dependencies.
# UGLY: postprocess_XCDS variable from CustomTarget_registry
# is reused in Package_registry!
......
......@@ -456,6 +456,7 @@ $(call gb_AllLangResTarget_get_target,%) :
mkdir -p $(dir $@) && touch $@)
define gb_AllLangResTarget_AllLangResTarget
$(call gb_Postprocess_get_target,AllResources) : $(call gb_AllLangResTarget_get_target,$(1))
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
$$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
......@@ -481,4 +482,8 @@ $(foreach lang,$(gb_AllLangResTarget_LANGS),\
endef
$(call gb_Postprocess_get_target,AllResources) :
$(call gb_Output_announce,All resources: $^,$(true),ALL)
$(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@) && touch $@)
# vim: set noet sw=4:
......@@ -48,6 +48,7 @@ $(call gb_Executable_get_clean_target,%) :
$(AUXTARGETS))
define gb_Executable_Executable
$(call gb_Postprocess_get_target,AllExecutables) : $(call gb_Executable_get_target,$(1))
ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN)))
$$(eval $$(call gb_Output_info,Currently known executables: $(sort $(gb_Executable_KNOWN)),ALL))
$$(eval $$(call gb_Output_error,Executable $(1) must be registered in Repository.mk))
......@@ -168,4 +169,8 @@ $(call gb_Executable_get_runtime_target,$(1)) : $(2)
endef
$(call gb_Postprocess_get_target,AllExecutables) :
$(call gb_Output_announce,All executables: $^,$(true),ALL)
$(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@) && touch $@)
# vim: set noet sw=4:
......@@ -49,6 +49,7 @@ $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
$(AUXTARGETS))
define gb_Library_Library
$(call gb_Postprocess_get_target,AllLibraries) : $(call gb_Library_get_target,$(1))
ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
$$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
$$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk))
......@@ -234,4 +235,8 @@ $(eval $(foreach method,\
$(call gb_Library__forward_to_Linktarget,$(method))\
))
$(call gb_Postprocess_get_target,AllLibraries) :
$(call gb_Output_announce,All libraries: $^,$(true),ALL)
$(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@) && touch $@)
# vim: set noet sw=4:
......@@ -76,6 +76,7 @@ $(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(
endef
define gb_Package_Package
$(if $(filter postprocess_config,$(1)),,$(call gb_Postprocess_get_target,AllPackages) : $(call gb_Package_get_target,$(1)))
$(call gb_Package_Package_internal,$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Package)
......@@ -133,4 +134,8 @@ $(call gb_Package_get_preparation_target,$(1)) :| $(call gb_ExternalProject_get_
endef
$(call gb_Postprocess_get_target,AllPackages) :
$(call gb_Output_announce,All packages: $^,$(true),ALL)
$(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@) && touch $@)
# vim: set noet sw=4:
......@@ -164,13 +164,14 @@ gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_Noex
gb_NoexPrecompiledHeader_get_timestamp = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
gb_Pagein_get_target = $(WORKDIR)/Pagein/$(1)
gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1)
gb_Package_get_target_for_build = $(WORKDIR_FOR_BUILD)/Package/$(1)
gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1)
gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
gb_PrecompiledHeader_get_timestamp = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
gb_Pagein_get_target = $(WORKDIR)/Pagein/$(1)
gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
......
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