diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-08-28 02:23:37 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:19 +0200 |
| commit | 27e63fa4c95e5f756ac8dc5029e7bdba36e69a8b (patch) | |
| tree | 26519faefaffed8fd83486c78261b538b41558d8 | |
| parent | 132c9f88f55e2ce2ee9e66b9c6bbd9cd6037b36a (diff) | |
add configure setting for the update channel
This only makes sense with the mar based updater and is currently only
used for uploading the builds.
Change-Id: I8baec67419bd1042e89d0373ca868973b23d8a5f
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 8edf57e7c0a7..a898ef716196 100644 --- a/Makefile.in +++ b/Makefile.in @@ -420,6 +420,9 @@ create-mar: upload-symbols: $(MAKE) -f $(SRCDIR)/Makefile.gbuild upload-symbols +create-update-info: + $(MAKE) -f $(SRCDIR)/Makefile.gbuild create-update-info + dump-deps: @$(SRCDIR)/bin/module-deps.pl $(MAKE) $(SRCDIR)/Makefile.gbuild diff --git a/config_host.mk.in b/config_host.mk.in index 880895e3c00f..8322f3175b8b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -575,6 +575,7 @@ export TOUCH=@TOUCH@ export UCRTSDKDIR=@UCRTSDKDIR@ export UCRTVERSION=@UCRTVERSION@ export UNOWINREG_DLL=@UNOWINREG_DLL@ +export UPDATE_CHANNEL=@UPDATE_CHANNEL@ export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@ export USE_XINERAMA=@USE_XINERAMA@ export UUIDGEN=@UUIDGEN@ diff --git a/configure.ac b/configure.ac index 8e38624282f7..a5ad53b18e24 100644 --- a/configure.ac +++ b/configure.ac @@ -1382,6 +1382,10 @@ libo_FUZZ_ARG_ENABLE(online-update, If the value is "mar", the experimental Mozilla-like update will be enabled instead of the traditional update mechanism.]), ,) +AC_ARG_WITH(update-channel, + AS_HELP_STRING([--with-update-channel=master-daily], + [Defines the update channel used by the updater.]), +,with_update_channel=master-daily) libo_FUZZ_ARG_ENABLE(extension-update, AS_HELP_STRING([--disable-extension-update], @@ -11303,6 +11307,7 @@ dnl =================================================================== AC_MSG_CHECKING([whether to enable online update]) ENABLE_ONLINE_UPDATE= ENABLE_ONLINE_UPDATE_MAR= +UPDATE_CHANNEL= if test "$enable_online_update" = ""; then if test "$_os" = "WINNT" -o "$_os" = "Darwin"; then AC_MSG_RESULT([yes]) @@ -11315,6 +11320,7 @@ else AC_MSG_RESULT([yes - MAR-based online update]) ENABLE_ONLINE_UPDATE_MAR="TRUE" AC_DEFINE(HAVE_FEATURE_UPDATE_MAR) + UPDATE_CHANNEL="$with_update_channel" elif test "$enable_online_update" = "yes"; then AC_MSG_RESULT([yes]) ENABLE_ONLINE_UPDATE="TRUE" @@ -11324,6 +11330,7 @@ else fi AC_SUBST(ENABLE_ONLINE_UPDATE) AC_SUBST(ENABLE_ONLINE_UPDATE_MAR) +AC_SUBST(UPDATE_CHANNEL) dnl =================================================================== dnl Test whether we need bzip2 |