mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integrate the partial update info into the uploaded info

Browse Source 
Change-Id: I1b6fc7970d3010c63ae910d55103efb504e15b53
This commit is contained in:
Markus Mohrhard
2017-04-27 01:30:19 +02:00
parent fdb4b34489
commit ff3e72ae73
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.gbuild
View File

@@ -35,12 +35,12 @@ create-update-info:
mkdir -p $(MAR_DIR)/language
MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar.py "$(PRODUCTNAME)" "$(WORKDIR)" "$(MAR_NAME_PREFIX)" "$(UPDATE_CONFIG)"
MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_full_mar_for_languages.py "$(PRODUCTNAME)" "$(WORKDIR)" "$(MAR_NAME_PREFIX)" "$(UPDATE_CONFIG)"
$(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
upload-update-info:
$(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H))
$(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH))
$(eval UPDATE_DIR := $(WORKDIR)/update-info)
$(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
$(SRCDIR)/bin/update/upload_builds.py "$(PRODUCTNAME)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
$(SRCDIR)/bin/update/upload_build_config.py "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"

9
bin/update/create_build_config.py
View File

@@ -13,6 +13,13 @@ def update_all_url_entries(data, **kwargs):
for language in data['languages']:
language['complete']['url'] = replace_variables_in_string(language['complete']['url'], **kwargs)
if 'partials' in data:
for partial in data['partials']:
partial['file']['url'] = replace_variables_in_string(partial['file']['url'], **kwargs)
for lang, lang_file in partial['languages'].iter():
lang_file['url'] = replace_variables_in_string(lang_file['url'], **kwargs)
def main(argv):
if len(argv) < 7:
print("Usage: create_build_config.py $PRODUCTNAME $VERSION $BUILDID $PLATFORM $TARGETDIR $UPDATE_CONFIG")
@@ -26,7 +33,7 @@ def main(argv):
'platform' : argv[4]
}
extra_data_files = ['complete_info.json', 'complete_lang_info.json']
extra_data_files = ['complete_info.json', 'complete_lang_info.json', 'partial_update_info.json']
for extra_file in extra_data_files:
extra_file_path = os.path.join(argv[5], extra_file)