[Libreoffice-commits] core.git: 6 commits - external/liblangtag postprocess/CustomTarget_registry.mk solenv/gbuild sysui/CustomTarget_share.mk
Michael Stahl
mstahl at redhat.com
Mon Nov 11 15:24:59 PST 2013
external/liblangtag/ExternalPackage_liblangtag_data.mk | 4 +-
postprocess/CustomTarget_registry.mk | 1
solenv/gbuild/ExtensionPackage.mk | 3 +
solenv/gbuild/HelpTarget.mk | 2 +
solenv/gbuild/UIConfig.mk | 2 -
sysui/CustomTarget_share.mk | 32 +++++++++++------
6 files changed, 29 insertions(+), 15 deletions(-)
New commits:
commit 3f706189eacf763d75b9c42d1f79b8dd2bb2260a
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 11 23:58:07 2013 +0100
postprocess: remove dependency on AllPackages
This was introduced with f624144e41291c11f3892dda1027221989d704be
but hopefully should no longer be necessary nowadays because the
dependencies on the individual xcd files should be sufficient; it
can lead to not really necessary rebuilds of the registry xcd files.
Change-Id: I189c54d9c61eb0a1f8ec286b0a4e55e83eb08c26
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index c48fdba..064228e 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -514,7 +514,6 @@ $(call gb_XcdTarget_get_target,$(1)).xcd : \
$(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).list : \
$(postprocess_FILES_$(1)) \
$(SRCDIR)/postprocess/CustomTarget_registry.mk \
- $(call gb_Postprocess_get_target,AllPackages) \
| $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
endef
commit ed49a7242ab6daf5fb5c8bbe5241c8f128091f64
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 11 23:08:08 2013 +0100
langtag: language-subtag-registry.xml is a generated file
... so need to use gb_ExternalPackage_add_files for it to get the right
dependencies.
Change-Id: I9358217d47c08d4e7c85f1b89f39320f32c03e3c
diff --git a/external/liblangtag/ExternalPackage_liblangtag_data.mk b/external/liblangtag/ExternalPackage_liblangtag_data.mk
index 24375f2..d1468e2 100644
--- a/external/liblangtag/ExternalPackage_liblangtag_data.mk
+++ b/external/liblangtag/ExternalPackage_liblangtag_data.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\
+$(eval $(call gb_ExternalPackage_use_external_project,liblangtag_data,langtag))
+
+$(eval $(call gb_ExternalPackage_add_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\
data/language-subtag-registry.xml \
))
commit 23785d911b9438dd69929f0f95c8da67d05229ed
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 11 22:57:57 2013 +0100
gbuild: ExtensionPackage: fix incremental builds wrt. Package here too
Change-Id: If37bd98faa6ec043ceb73a0cdfb8dddef7a6359e
diff --git a/solenv/gbuild/ExtensionPackage.mk b/solenv/gbuild/ExtensionPackage.mk
index 73e1aa9..e2c99a4 100644
--- a/solenv/gbuild/ExtensionPackage.mk
+++ b/solenv/gbuild/ExtensionPackage.mk
@@ -43,7 +43,8 @@ endef
# call gb_ExtensionPackage_ExtensionPackage,package,oxt
define gb_ExtensionPackage_ExtensionPackage
$(call gb_ExtensionPackage_ExtensionPackage_internal,$(1),$(2))
-$(2) :| $(call gb_ExtensionPackage_get_preparation_target,$(1))
+$(2) : $(call gb_ExtensionPackage_get_preparation_target,$(1))
+ touch $$@
$$(eval $$(call gb_Module_register_target,$(call gb_ExtensionPackage_get_target,$(1)),$(call gb_ExtensionPackage_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),ExtensionPackage)
commit aa141f4ed3fca69668f3d3c962898c7e765c046a
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 11 21:07:15 2013 +0100
gbuild: HelpTarget: more incremental rebuild fixing
gb_HelpLinkTarget_add_renamed_file also adds a file to Package and there
neeeds to be a rule for it.
Change-Id: Iefbcb082248e4e565b821e9b9a676b2b487cfc98
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 584c7fa..142f00e 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -405,6 +405,8 @@ endef
define gb_HelpLinkTarget_add_renamed_file
$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES += $(strip $(2)),$(strip $(3))
$(call gb_HelpLinkTarget_get_target,$(1)) : $(3)
+$(call gb_HelpTarget_get_workdir,$(1))/$(2) : $(call gb_HelpLinkTarget_get_target,$(1))
+ touch $$@
endef
commit 2c258d0689195af1533f0e08a6c4463986dc8b77
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 11 20:44:22 2013 +0100
sysui: fix incremental builds in CustomTarget_share
The libreoffice/*.desktop need to have a target and rule to propagate
out-of-date-ness.
Change-Id: If341cc67ed6e24ceee7c00efba2750864aad4a70
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 79eea3a..7851156 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -124,16 +124,16 @@ $(eval $(call gb_CustomTarget_CustomTarget,sysui/share))
$(eval $(call gb_CustomTarget_register_targets,sysui/share,\
$(ULFS) \
$(foreach product,$(PRODUCTLIST),\
- $(product)/build.flag \
- $(product)/openoffice.org.xml \
- $(product)/openoffice.mime \
- $(product)/openoffice.applications \
- $(product)/openoffice.keys \
- $(product)/openoffice.sh \
- $(product)/printeradmin.sh \
- $(product)/create_tree.sh \
- $(product)/mimelnklist \
- $(product)/launcherlist) \
+ $(product)/build.flag \
+ $(product)/openoffice.org.xml \
+ $(product)/openoffice.mime \
+ $(product)/openoffice.applications \
+ $(product)/openoffice.keys \
+ $(product)/openoffice.sh \
+ $(product)/printeradmin.sh \
+ $(product)/create_tree.sh \
+ $(product)/mimelnklist \
+ $(product)/launcherlist) \
))
$(share_WORKDIR)/%/openoffice.org.xml: $(share_WORKDIR)/documents.ulf $(MIMEDESKTOPS) $(share_SRCDIR)/share/create_mime_xml.pl
@@ -203,8 +203,18 @@ $(share_WORKDIR)/%/openoffice.applications: $(share_SRCDIR)/mimetypes/openoffice
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
cat $< | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME.$*)/" -e "s/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION.$*)/" > $@
+# these .desktop files are written by brand.pl below
+# need to have a rule for these because they are targets in Package_share
+define sysui_Desktop_rule
+$(share_WORKDIR)/%/$(1).desktop : $(share_WORKDIR)/%/build.flag
+ touch $$@
+
+endef
+
+$(foreach launcher,$(LAUNCHERLIST),$(eval $(call sysui_Desktop_rule,$(launcher))))
+
$(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \
- $(share_TRANSLATE) $(addprefix $(share_WORKDIR)/,$(ULFS))
+ $(share_TRANSLATE) $(addprefix $(share_WORKDIR)/,$(ULFS))
mkdir -p $(dir $@)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(PERL) $(share_SRCDIR)/share/brand.pl -p '$${PRODUCTNAME} $${PRODUCTVERSION}' -u $(UNIXFILENAME.$*) \
commit 81f416ba1b10788f37fd6391c6e7b787347d28fe
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 11 19:23:26 2013 +0100
gbuild: UIConfig: fix incremental builds
The files added by gb_UIConfig_add_uifiles get re-built but not
delivered to instdir (only in a second make invocation); try to fix that
with a dependency from the file in workdir/UILocalizeTarget to the
UILocalizeTarget that builds them.
Change-Id: Ifb41d4b9f6f6a671cc8cc5a7f6800857ac355064
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 0f1ee1a..657d362 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -261,7 +261,7 @@ endef
# gb_UIConfig__add_uifile_for_lang target file lang
define gb_UIConfig__add_uifile_for_lang
$(call gb_UIConfig__package_uifile,$(1),$(call gb_UIConfig_get_packagename_for_lang,$(1),$(3)),res/$(3)/$(notdir $(2)),$(2)/$(3).ui)
-$(call gb_Package_get_preparation_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(3))) : $(call gb_UILocalizeTarget_get_target,$(2))
+$(call gb_Package_SOURCEDIR_$(call gb_UIConfig_get_packagename_for_lang,$(1),$(3)))/$(2)/$(3).ui : $(call gb_UILocalizeTarget_get_target,$(2))
endef
More information about the Libreoffice-commits
mailing list