ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

also include the platform into the build config

Browse Source 
Change-Id: Ia586e813b33dde0e0b2468c54bed9471c03e8c5a
This commit is contained in:
Markus Mohrhard
2017-05-19 03:43:20 +02:00
parent 1cb3736774
commit a2a62b3385
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.gbuild
+3 -2
View File
@@ -29,10 +29,11 @@ create-update-info:
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"
$(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH))
$(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)_$(RTL_OS)_$(RTL_ARCH)_$(BUILDID)_complete.mar $(WORKDIR)/mar/current-build/*/
MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/make_full_update.sh $(WORKDIR)/update-info/$(PRODUCTNAME)_$(VERSION)_$(PLATFORM)_$(BUILDID)_complete.mar $(WORKDIR)/mar/current-build/*/
# vim: set noet sw=4 ts=4:
bin/update/create_build_config.py
+5 -4
View File
@@ -5,16 +5,17 @@ import sys
import os
def main(argv):
if len(argv) < 6:
print("Usage: create_build_config.py $PRODUCTNAME $VERSION $BUILDID $UPDATECHANNEL $TARGETDIR")
if len(argv) < 7:
print("Usage: create_build_config.py $PRODUCTNAME $VERSION $BUILDID $UPDATECHANNEL $PLATFORM $TARGETDIR")
data = { 'productName' : argv[1],
'version' : argv[2],
'buildNumber' : argv[3],
'updateChannel' : argv[4]
'updateChannel' : argv[4],
'platform' : argv[5]
}
with open(os.path.join(argv[5], "build_config.json"), "w") as f:
with open(os.path.join(argv[6], "build_config.json"), "w") as f:
json.dump(data, f, indent=4)
if __name__ == "__main__":