summaryrefslogtreecommitdiff
path: root/Makefile.gbuild
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-08-30 05:19:06 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-05-19 03:43:21 +0200
commit5276e0fc8adc5ff96b91b8c31e19906ae0ba9bd2 (patch)
treeea6db81b901efda08265289300ed31086e509ff7 /Makefile.gbuild
parent837af5b873137c1a561791e36f01378934d48271 (diff)
improve the build system part for generating mar files
Change-Id: If28cca535da20e4633ce025e39a967820eae6945
Diffstat (limited to 'Makefile.gbuild')
-rw-r--r--Makefile.gbuild8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild
index 49fb3a604e0e..a9c4c0c2bcf2 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -30,10 +30,12 @@ create-update-info:
$(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H))
$(eval VERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX))
$(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH))
+ $(eval MAR_NAME_PREFIX := $(PRODUCTNAME)_$(VERSION)_$(PLATFORM)_$(BUILDID))
+ $(eval UPDATE_DIR := $(WORKDIR)/update-info)
$(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(UPDATE_CHANNEL)" "$(PLATFORM)" "$(WORKDIR)/update-info"
mkdir -p $(WORKDIR)/mar/current-build
- tar zxvf $(WORKDIR)/installation/$(PRODUCTNAME)/archive/install/en-US/*tar.gz -C $(WORKDIR)/mar/current-build/
- strip -g $(WORKDIR)/mar/current-build/*/program/* || true
- MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/make_full_update.sh $(WORKDIR)/update-info/$(PRODUCTNAME)_$(VERSION)_$(PLATFORM)_$(BUILDID)_complete.mar $(WORKDIR)/mar/current-build/*/
+ mkdir -p $(WORKDIR)/mar/language
+ MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar.py "$(PRODUCTNAME)" "$(WORKDIR)" "$(UPDATE_DIR)" "$(WORKDIR)/mar/current-build/" "$(MAR_NAME_PREFIX)" "$(UPDATE_CERTIFICATE_NAME)" "$(UPDATE_CERTIFICATE_PATH)"
+ MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar_for_languages.py "$(PRODUCTNAME)" "$(WORKDIR)" "$(UPDATE_DIR)" "$(WORKDIR)/mar/language" "$(MAR_NAME_PREFIX)" "$(UPDATE_CERTIFICATE_NAME)" "$(UPDATE_CERTIFICATE_PATH)"
# vim: set noet sw=4 ts=4: