summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-08-28 16:04:35 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-05-19 03:43:20 +0200
commit1bff19a2c0de2825bec287ffd64bee6bace3f448 (patch)
treeaa152ef5273100f78a776318ee537b689d2adbc4
parentadd configure setting for the update channel (diff)
downloadcore-1bff19a2c0de2825bec287ffd64bee6bace3f448.tar.gz
core-1bff19a2c0de2825bec287ffd64bee6bace3f448.zip
add makefile part to generate mar file and update info
We still need some parts for the partial update files but we already generate the build information and the complete mar file. Change-Id: I2ae0de0b83518bc3093848b66b6f3054ebd388e1
-rw-r--r--Makefile.gbuild12
-rwxr-xr-xbin/update/create_build_config.py21
2 files changed, 33 insertions, 0 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild
index bcfa569954eb..be6788b59a83 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -23,4 +23,16 @@ $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side
upload-symbols:
bin/upload_symbols.py $(WORKDIR)/symbols.zip $(BREAKPAD_SYMBOL_CONFIG) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)"
+create-update-info:
+ rm -rf $(WORKDIR)/mar || true
+ rm -rf $(WORKDIR)/update-info || true
+ mkdir -p $(WORKDIR)/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))
+ $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(UPDATE_CHANNEL)" "$(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)_$(RTL_OS)_$(RTL_ARCH)_$(BUILDID)_complete.mar $(WORKDIR)/mar/current-build/*/
+
# vim: set noet sw=4 ts=4:
diff --git a/bin/update/create_build_config.py b/bin/update/create_build_config.py
new file mode 100755
index 000000000000..964c92256fb7
--- /dev/null
+++ b/bin/update/create_build_config.py
@@ -0,0 +1,21 @@
+#! /usr/bin/env python3
+
+import json
+import sys
+import os
+
+def main(argv):
+ if len(argv) < 6:
+ print("Usage: create_build_config.py $PRODUCTNAME $VERSION $BUILDID $UPDATECHANNEL $TARGETDIR")
+
+ data = { 'productName' : argv[1],
+ 'version' : argv[2],
+ 'buildNumber' : argv[3],
+ 'updateChannel' : argv[4]
+ }
+
+ with open(os.path.join(argv[5], "build_config.json"), "w") as f:
+ json.dump(data, f, indent=4)
+
+if __name__ == "__main__":
+ main(sys.argv)