diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-20 19:42:43 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-20 21:52:40 +0200 |
| commit | 22aaa9be2ef05358f672ce8fc9f6978664741e7f (patch) | |
| tree | 6693145618061ba247d90f1c8ff5e57284a38a0a /instsetoo_native | |
| parent | tdf#107129: correct showing order (diff) | |
| download | core-22aaa9be2ef05358f672ce8fc9f6978664741e7f.tar.gz core-22aaa9be2ef05358f672ce8fc9f6978664741e7f.zip | |
updater: move the update channel info from the config to versionrc
Change-Id: Id19578a889de51cacac869d7ec681c5c18c40cf9
Reviewed-on: https://gerrit.libreoffice.org/41365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 95eba463ef7c..2b312be018cf 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -156,6 +156,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'BuildVersion=$(BUILD_VER_STRING)' \ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ && echo 'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \ + && echo 'UpdateChannel=$(shell cd $(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG))' \ && echo 'ReferenceOOoMajorMinor=4.1' \ && echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \ && echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \ |