Hi all, I would love to get these 2 patches to 3.4.1 if possible :-) They are needed to enable the online update service by default. The service is configurable, and can be disabled by the user. Can you please review?
It introduces a new switch, --enable-online-update, that is on by default on Windows and on Mac, and off by default on other platforms. That is because I don't expect eg. the Linux distros to be interested in this; but of course for the universal builds, this still might have its value - but there it should be explicitly turned on. When the option is enable, the build contains a Tools -> Options... entry for that, where one can tweak the settings. So far we do not have the server part of this, but it seems that it survives its absence just fine. Nevertheless, I want to get it running as soon as possible, so that we can see it live before the 3.4.1 is actually released. I need 3 reviews to get it to libreoffice-3-4-1. Thank you a lot, Kendy
>From 0ccd60391b1ddb291a458b4c5ee513823bb3a7ed Mon Sep 17 00:00:00 2001 From: Jan Holesovsky <[email protected]> Date: Thu, 16 Jun 2011 19:11:02 +0200 Subject: [PATCH] Check for updates by default. --- extensions/source/update/check/Jobs.xcu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extensions/source/update/check/Jobs.xcu b/extensions/source/update/check/Jobs.xcu index ed32465..840d630 100644 --- a/extensions/source/update/check/Jobs.xcu +++ b/extensions/source/update/check/Jobs.xcu @@ -8,7 +8,7 @@ </prop> <node oor:name="Arguments"> <prop oor:name="AutoCheckEnabled" oor:type="xs:boolean" oor:op="replace"> - <value>false</value> + <value>true</value> </prop> <prop oor:name="LastCheck" oor:type="xs:long" oor:op="replace"> <value>0</value> -- 1.6.0.2
>From 75d8eb39d90078c146cb9946619f860c8ada885e Mon Sep 17 00:00:00 2001 From: Jan Holesovsky <[email protected]> Date: Thu, 16 Jun 2011 19:12:35 +0200 Subject: [PATCH] Make the online update service configurable (via --enable-online-update). --- configure.in | 28 ++++++++++++++++++++++++++++ scp2/source/ooo/common_brand.scp | 2 +- scp2/source/ooo/makefile.mk | 4 ++++ scp2/util/makefile.mk | 4 ++-- set_soenv.in | 1 + 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 5ad2e37..c29f73f 100755 --- a/configure.in +++ b/configure.in @@ -475,6 +475,12 @@ AC_ARG_ENABLE(lomenubar, [Enable global menu support.]), ,) +AC_ARG_ENABLE(online-update, + AS_HELP_STRING([--enable-online-update], + [Enable the online update service that will check for new versions of + LibreOffice. By default, it is on on Windows and Mac, and off on Linux.]), +,) + dnl =================================================================== dnl Optional Packages (--with/without-) dnl =================================================================== @@ -7502,6 +7508,28 @@ fi AC_SUBST(ENABLE_LOMENUBAR) dnl =================================================================== +dnl Test whether to enable online update service +dnl =================================================================== +AC_MSG_CHECKING([whether to enable online update]) +ENABLE_ONLINE_UPDATE= +if test "z$enable_online_update" = "z" ; then + if test "$_os" = "WINNT" -o "$_os" = "Darwin" ; then + AC_MSG_RESULT([yes]) + ENABLE_ONLINE_UPDATE="TRUE" + else + AC_MSG_RESULT([no]) + fi +else + if test "z$enable_online_update" = "zyes" ; then + AC_MSG_RESULT([yes]) + ENABLE_ONLINE_UPDATE="TRUE" + else + AC_MSG_RESULT([no]) + fi +fi +AC_SUBST(ENABLE_ONLINE_UPDATE) + +dnl =================================================================== dnl Test whether to enable ActiveX embedding dnl =================================================================== if test "$_os" = "WINNT"; then diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 47e5f9f..2557f0d 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1152,7 +1152,7 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl Section = "Version"; Order = 15; Key = "UpdateURL"; - #if defined(BUILD_SPECIAL) + #if defined(ENABLE_ONLINE_UPDATE) #ifdef WNT Value = "${UPDATEURL}"; #else // defined WNT diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 86ef48c..e553440 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -45,6 +45,10 @@ SCPDEFS+=-D_MSC SCPDEFS+=-DBUILD_SPECIAL .ENDIF +.IF "$(ENABLE_ONLINE_UPDATE)"!="" +SCPDEFS+=-DENABLE_ONLINE_UPDATE +.ENDIF + .IF "$(BUILD_X64)"!="" SCPDEFS+=-DBUILD_X64 .ENDIF diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index a7873d1..9030699 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -215,7 +215,7 @@ SCP1FILES += cairocanvas.par SCP1FILES += layout.par .ENDIF # ENABLE_LAYOUT == TRUE -.IF "$(BUILD_SPECIAL)"!="" +.IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP1FILES += \ module_onlineupdate.par \ file_onlineupdate.par @@ -392,7 +392,7 @@ SCP2FILES += \ SCP2FILES += layout.par .ENDIF # ENABLE_LAYOUT == TRUE -.IF "$(BUILD_SPECIAL)"!="" +.IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP2FILES += \ module_onlineupdate.par \ file_onlineupdate.par diff --git a/set_soenv.in b/set_soenv.in index 779fb3e..f015bab 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1983,6 +1983,7 @@ ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" ); ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" ); ToFile( "ENABLE_LOMENUBAR", "@ENABLE_LOMENUBAR@", "e" ); +ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" ); ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" ); ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" ); ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" ); -- 1.6.0.2
_______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
