diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-25 11:56:21 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-02-26 15:06:50 +0000 |
| commit | f624144e41291c11f3892dda1027221989d704be (patch) | |
| tree | 222303c07eea7c33877dcec8d577fcd9e1af9aa4 /postprocess | |
| parent | c81e40d02610b665a9edcc73b57ac7e783913988 (diff) | |
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/2426
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_config.mk | 3 | ||||
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 4 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 1 | ||||
| -rw-r--r-- | postprocess/CustomTarget_signing.mk | 4 | ||||
| -rw-r--r-- | postprocess/Module_postprocess.mk | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/postprocess/CustomTarget_config.mk b/postprocess/CustomTarget_config.mk index 89c606c01012..ca64a5ed74f1 100644 --- a/postprocess/CustomTarget_config.mk +++ b/postprocess/CustomTarget_config.mk @@ -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 $@) diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index a7a0ee802d16..ed6e7f77f912 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -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, \ diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index d6812e8a03c6..19be15c67826 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -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 diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 25b5482b9db6..a9c4a45cfb91 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -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) diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 0716ae780fe5..808d7f3a18bb 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -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! |