strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add configure setting for the update channel

Browse source 
This only makes sense with the mar based updater and is currently only
used for uploading the builds.

Change-Id: I8baec67419bd1042e89d0373ca868973b23d8a5f
This commit is contained in:
Markus Mohrhard 2016-08-28 02:23:37 +02:00
parent 132c9f88f5
commit 27e63fa4c9
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.in
View file

@ -420,6 +420,9 @@ create-mar:
upload-symbols: upload-symbols:
$(MAKE) -f $(SRCDIR)/Makefile.gbuild upload-symbols $(MAKE) -f $(SRCDIR)/Makefile.gbuild upload-symbols
create-update-info:
$(MAKE) -f $(SRCDIR)/Makefile.gbuild create-update-info
dump-deps: dump-deps:
@$(SRCDIR)/bin/module-deps.pl $(MAKE) $(SRCDIR)/Makefile.gbuild @$(SRCDIR)/bin/module-deps.pl $(MAKE) $(SRCDIR)/Makefile.gbuild

1
config_host.mk.in
View file

@ -575,6 +575,7 @@ export TOUCH=@TOUCH@
export UCRTSDKDIR=@UCRTSDKDIR@ export UCRTSDKDIR=@UCRTSDKDIR@
export UCRTVERSION=@UCRTVERSION@ export UCRTVERSION=@UCRTVERSION@
export UNOWINREG_DLL=@UNOWINREG_DLL@ export UNOWINREG_DLL=@UNOWINREG_DLL@
export UPDATE_CHANNEL=@UPDATE_CHANNEL@
export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@ export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
export USE_XINERAMA=@USE_XINERAMA@ export USE_XINERAMA=@USE_XINERAMA@
export UUIDGEN=@UUIDGEN@ export UUIDGEN=@UUIDGEN@

7
configure.ac
View file

@ -1382,6 +1382,10 @@ libo_FUZZ_ARG_ENABLE(online-update,
If the value is "mar", the experimental Mozilla-like update will be If the value is "mar", the experimental Mozilla-like update will be
enabled instead of the traditional update mechanism.]), 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, libo_FUZZ_ARG_ENABLE(extension-update,
AS_HELP_STRING([--disable-extension-update], AS_HELP_STRING([--disable-extension-update],
@ -11303,6 +11307,7 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to enable online update]) AC_MSG_CHECKING([whether to enable online update])
ENABLE_ONLINE_UPDATE= ENABLE_ONLINE_UPDATE=
ENABLE_ONLINE_UPDATE_MAR= ENABLE_ONLINE_UPDATE_MAR=
UPDATE_CHANNEL=
if test "$enable_online_update" = ""; then if test "$enable_online_update" = ""; then
if test "$_os" = "WINNT" -o "$_os" = "Darwin"; then if test "$_os" = "WINNT" -o "$_os" = "Darwin"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
@ -11315,6 +11320,7 @@ else
AC_MSG_RESULT([yes - MAR-based online update]) AC_MSG_RESULT([yes - MAR-based online update])
ENABLE_ONLINE_UPDATE_MAR="TRUE" ENABLE_ONLINE_UPDATE_MAR="TRUE"
AC_DEFINE(HAVE_FEATURE_UPDATE_MAR) AC_DEFINE(HAVE_FEATURE_UPDATE_MAR)
UPDATE_CHANNEL="$with_update_channel"
elif test "$enable_online_update" = "yes"; then elif test "$enable_online_update" = "yes"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_ONLINE_UPDATE="TRUE" ENABLE_ONLINE_UPDATE="TRUE"
@ -11324,6 +11330,7 @@ else
fi fi
AC_SUBST(ENABLE_ONLINE_UPDATE) AC_SUBST(ENABLE_ONLINE_UPDATE)
AC_SUBST(ENABLE_ONLINE_UPDATE_MAR) AC_SUBST(ENABLE_ONLINE_UPDATE_MAR)
AC_SUBST(UPDATE_CHANNEL)
dnl =================================================================== dnl ===================================================================
dnl Test whether we need bzip2 dnl Test whether we need bzip2