diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-26 23:19:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-27 01:33:17 +0100 |
| commit | 5e85d8406bbd069c022975ca4e1b7d74914062b5 (patch) | |
| tree | 2bf737149784453019cc32c5e32cfd6503b92d51 | |
| parent | 5fcb553c862d407aadb0320925723d3c2f70bfef (diff) | |
gbuild: add ZipPackage target
This is basically a Zip and a Package in one, so it's not necessary to
enumerate the content twice. The zip is sadly the easiest way to get a
large number of files through scp2 and into instsets.
Change-Id: Idadcced76bf10317fc348ac91203c15c47e8762d
| -rw-r--r-- | solenv/gbuild/ZipPackage.mk | 40 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk new file mode 100644 index 000000000000..79c14d5fc40d --- /dev/null +++ b/solenv/gbuild/ZipPackage.mk @@ -0,0 +1,40 @@ +# -*- 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/. +# + +# ZipPackage class +# this is a bit of a hack, hopefully needed only temporarily because +# scp2 can easily deal with zip files but not so easily with 100s of +# individual files; ideally the Package itself should be sufficient. + +# sigh... WTF does that scp2/installer look for these in bin and not pck??? +gb_Zip_get_outdir_bin_target = $(OUTDIR)/bin/$(1).zip + +define gb_ZipPackage_ZipPackage +$(call gb_Package_Package,$(1),$(2)) +$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1)) +$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_outdir_bin_target,$(1)) +$(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1)) + cp $$< $$@ +$(call gb_Package_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1)) + +endef + +# sadly Package delivers to inc/ but ODK path is include/ so need to +# copy files twice +# $(1) package +# $(2) dir in package +# $(3) dir in zip +# $(4) file list +define gb_ZipPackage_add_files +$(call gb_Package_add_files,$(1),$(2),$(4)) +$(foreach file,$(4),$(call gb_Zip_add_file,$(1),$(3)/$(notdir $(file)),$(gb_Package_SOURCEDIR_$(1))/$(file))) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 7c9d5ec0e9e9..b0b6f92b7925 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -334,6 +334,7 @@ include $(foreach class, \ CliNativeLibrary \ CliUnoApi \ Zip \ + ZipPackage \ AllLangZip \ Configuration \ HelpTarget \ |