From 9d54f0e1dec4d84f914f17c8c2445dfc53190d8a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 7 Apr 2013 09:45:19 +0200 Subject: add gbuild class PackageSet This is intended for bundling filelists of multiple Packages together, to simplify the scp2 configuration. Change-Id: I6f700f691b37375a09a5400166aac80a8bb2a2b4 Reviewed-on: https://gerrit.libreoffice.org/3230 Reviewed-by: David Tardon Tested-by: David Tardon --- solenv/bin/modules/installer/environment.pm | 2 +- solenv/gbuild/PackageSet.mk | 75 +++++++++++++++++++++++++++++ solenv/gbuild/TargetLocations.mk | 2 + solenv/gbuild/gbuild.mk | 1 + 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 solenv/gbuild/PackageSet.mk (limited to 'solenv') diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index cfc8fdf084c4..613c86bfd47b 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -67,7 +67,7 @@ sub create_pathvariables my $platformname = $environment->{'OUTPATH'}; $variables{'platformname'} = $platformname; - my $filelistpath = $environment->{'WORKDIR'} . $installer::globals::separator . 'Package'; + my $filelistpath = $environment->{'WORKDIR'}; $variables{'filelistpath'} = $filelistpath; return \%variables; diff --git a/solenv/gbuild/PackageSet.mk b/solenv/gbuild/PackageSet.mk new file mode 100644 index 000000000000..8ba3273f459b --- /dev/null +++ b/solenv/gbuild/PackageSet.mk @@ -0,0 +1,75 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# class PackageSet + +# Allows to bundle a set of packages under one name. +# +# This is intended to be used by gbuild classes that want to provide a +# filelist for installer, but for implementation reasons have to use +# several Packages internally (e.g., because of different source dirs). + +$(dir $(call gb_PackageSet_get_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_PackageSet_get_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(call gb_PackageSet_get_target,%) : + $(call gb_Output_announce,$*,$(true),PKS,2) + cat $(sort $(FILELISTS)) > $@ + +.PHONY : $(call gb_PackageSet_get_clean_target,%) +$(call gb_PackageSet_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),PKS,2) + rm -f $(call gb_PackageSet_get_target,$*) + +# Create and register a package set. +# +# gb_PackageSet_PackageSet set +define gb_PackageSet_PackageSet +$(call gb_PackageSet_PackageSet_internal,$(1)) + +$$(eval $$(call gb_Module_register_target,$(call gb_PackageSet_get_target,$(1)),$(call gb_PackageSet_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),PackageSet) + +endef + +# Create a package set. +# +# gb_PackageSet_PackageSet_internal set +define gb_PackageSet_PackageSet_internal +$(call gb_PackageSet_get_target,$(1)) : FILELISTS := + +$(call gb_PackageSet_get_target,$(1)) :| $(dir $(call gb_PackageSet_get_target,$(1))).dir + +endef + +# Add a package to the set. +# +# A package can be added more than once. +# +# gb_PackageSet_add_package set package +define gb_PackageSet_add_package +$(call gb_PackageSet_get_target,$(1)) : FILELISTS += $(call gb_Package_get_target,$(2)) + +$(call gb_PackageSet_get_target,$(1)) : $(call gb_Package_get_target,$(2)) +$(call gb_PackageSet_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2)) + +endef + +# Add several packages to the set at once. +# +# gb_PackageSet_add_packages set package(s) +define gb_PackageSet_add_packages +$(foreach package,$(2),$(call gb_PackageSet_add_package,$(1),$(package))) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 923f7b616151..381c5d76c880 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -166,6 +166,7 @@ gb_Pagein_get_target = $(WORKDIR)/Pagein/$(1) gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1) gb_Package_get_target = $(WORKDIR)/Package/$(1).filelist gb_Package_get_target_for_build = $(WORKDIR_FOR_BUILD)/Package/$(1).filelist +gb_PackageSet_get_target = $(WORKDIR)/PackageSet/$(1).filelist gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1) gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch @@ -288,6 +289,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ NoexPrecompiledHeader \ PackagePart \ Package \ + PackageSet \ Pagein \ PrecompiledHeader \ Pyuno \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a138cd1827c0..1fa46350279a 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -344,6 +344,7 @@ include $(foreach class, \ InstallScript \ AutoInstallLibs \ Postprocess \ + PackageSet \ ,$(GBUILDDIR)/$(class).mk) $(eval $(call gb_Helper_process_executable_registrations)) -- cgit