Makefile.gbuild | 2 +-
bin/update/create_build_config.py | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit aa84c2a70342bc99cf8b9ab2a1385dcc670594f1
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Apr 27 01:30:19 2017 +0200
integrate the partial update info into the uploaded info
Change-Id: I1b6fc7970d3010c63ae910d55103efb504e15b53
diff --git a/Makefile.gbuild b/Makefile.gbuild
index 44637577da52..61ad648aad79 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -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)"
diff --git a/bin/update/create_build_config.py
b/bin/update/create_build_config.py
index 8d0cf0e07cbe..163e94a4426f 100755
--- a/bin/update/create_build_config.py
+++ b/bin/update/create_build_config.py
@@ -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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
