[Libreoffice-commits] core.git: Makefile.in solenv/gbuild

[Bjoern Michaelsen]

 Makefile.in                                     |    3 +++
 solenv/gbuild/extensions/post_PackageInfo.mk    |   17 ++++++++++++++++-
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |    2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit c6fe5c6f371328cb6cf61d68f016a04f8b635a48
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Dec 8 03:39:37 2013 +0100

    initial install-package-foo target for partial installs
    
    Change-Id: I4ee41fdb600cb3a89da387dffe64e6a30192761c

diff --git a/Makefile.in b/Makefile.in
index e3deee7..cc8a982 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -302,6 +302,9 @@ distro-pack-install: install
 	$(SRCDIR)/bin/distro-install-sdk
 	$(SRCDIR)/bin/distro-install-file-lists
 
+install-package-%:
+	$(GNUMAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
+
 id:
 	@create-ids
 
diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk
index 22c6c45..54d6c5f 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -74,11 +74,26 @@ $(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- res
 endef
 
 .PHONY: packageinfo
-packageinfo:
+$(foreach filelist,files executables libraries,$(gb_PackageInfo_get_target)/%.$(filelist)):
 	@rm -rf $(gb_PackageInfo_get_target) && mkdir $(gb_PackageInfo_get_target)
 	$(foreach installmodule,$(gb_PackageInfo_InstallModules),$(call gb_PackageInfo_emit_binaries_command,$(installmodule)))
 	$(foreach helplang,$(gb_HELP_LANGS),$(call gb_PackageInfo_emit_help_for_one_lang,$(helplang)))
 	$(foreach l10nlang,$(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US),$(call gb_PackageInfo_emit_l10n_for_one_lang,$(l10nlang)))
 
+packageinfo: $(gb_PackageInfo_get_target)/ure.files
+
+install-package-%: $(foreach filelist,files executables libraries,$(gb_PackageInfo_get_target)/%.$(filelist))
+	for executable in `cat $(gb_PackageInfo_get_target)/$*.executables`; \
+	do \
+		install -D $(INSTDIR)/$${executable} $(INSTALLDIR)/$${executable} ;\
+	done
+	for library in `cat $(gb_PackageInfo_get_target)/$*.libraries`; \
+	do \
+		install -D -m644 $(INSTDIR)/$${library} $(INSTALLDIR)/$${library}; \
+	done
+	for file in `cat $(gb_PackageInfo_get_target)/$*.files`; \
+	do \
+		install -D -m644 $(INSTDIR)/$${file} $(INSTALLDIR)/$${file}; \
+	done
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 3f3e562..4b97d46 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -24,7 +24,7 @@ ifneq ($(strip $(MAKECMDGOALS)),)
 # speed up depending on the target
 gb_SpeedUpTargets_LEVEL_4 := debugrun help translations
 gb_SpeedUpTargets_LEVEL_3 := showmodules $(gb_SpeedUpTargets_LEVEL_4)
-gb_SpeedUpTargets_LEVEL_2 := $(gb_SpeedUpTargets_LEVEL_3)
+gb_SpeedUpTargets_LEVEL_2 := $(gb_SpeedUpTargets_LEVEL_3) install-package-%
 gb_SpeedUpTargets_LEVEL_1 := clean showdeliverables $(gb_SpeedUpTargets_LEVEL_2)
 
 ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_1),$(MAKECMDGOALS)),,T))