[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin32.conf extensions/qa extensions/source

[Jan Holesovsky]

 distro-configs/LibreOfficeLinux.conf              |    1 +
 distro-configs/LibreOfficeMacOSX.conf             |    1 +
 distro-configs/LibreOfficeWin32.conf              |    1 +
 extensions/qa/update/test_update.cxx              |    1 -
 extensions/source/update/check/updateprotocol.cxx |   16 +++-------------
 extensions/source/update/check/updateprotocol.hxx |    1 -
 6 files changed, 6 insertions(+), 15 deletions(-)

New commits:
commit cf7317a1cd0181ff57a236cb393388561c2bb2e8
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jan 2 19:14:06 2012 +0100

    Online update: Enable online update even for the Linux release builds.
    
    [and mention it explicitly in the Windows and Mac distro configs, to be
    safe :-)]

diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 1a4ab2e..f498df0 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -41,6 +41,7 @@
 --enable-cairo
 --enable-binfilter
 --enable-python=internal
+--enable-online-update
 --disable-unix-qstart-libpng
 --disable-randr-link
 --disable-kde4
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 59ea95b..7e7af46 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -12,4 +12,5 @@
 --enable-ext-nlpsolver
 --enable-ext-postgresql-sdbc
 --enable-extension-integration
+--enable-online-update
 --without-system-postgresql
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 10d7f12..fc267e2 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -17,3 +17,4 @@
 --enable-ext-pdfimport
 --enable-ext-nlpsolver
 --enable-ext-postgresql-sdbc
+--enable-online-update
commit 01b5b09d7f77c45adf5363cad1769dcdd17e18d6
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jan 2 19:02:46 2012 +0100

    Online update: Don't check for buildid at the user's end.
    
    We want more freedom in what to offer to the user; at some stage we would like
    to offer 3.6 to the users using 3.5 which would be harder with this buildid
    check.
    
    This makes the server side responsible for offering the correct version; but
    that should be fine because all the versions that we are able to update must
    be listed on the server: what is not listed is considered up-to-date.

diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx
index 84cbc4f..bed67d3 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -131,7 +131,6 @@ protected:
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Linux" ) ),
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "x86" ) ),
                     m_aRepositoryList,
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "100" ) ),
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InstallSetID" ) ) ) )
         {
             CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index bbe5494..b0a20ab 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -59,14 +59,8 @@ namespace xml = css::xml ;
 static bool
 getBootstrapData(
     uno::Sequence< ::rtl::OUString > & rRepositoryList,
-    ::rtl::OUString & rBuildID,
     ::rtl::OUString & rInstallSetID)
 {
-    rBuildID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" );
-    rtl::Bootstrap::expandMacros( rBuildID );
-    if ( ! rBuildID.getLength() )
-        return false;
-
     rInstallSetID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
     rtl::Bootstrap::expandMacros( rInstallSetID );
     if ( ! rInstallSetID.getLength() )
@@ -103,15 +97,14 @@ checkForUpdates(
     rtl::Bootstrap::get(UNISTRING("_ARCH"), myArch);
 
     uno::Sequence< ::rtl::OUString > aRepositoryList;
-    ::rtl::OUString aBuildID;
     ::rtl::OUString aInstallSetID;
 
-    if( ! ( getBootstrapData(aRepositoryList, aBuildID, aInstallSetID) && (aRepositoryList.getLength() > 0) ) )
+    if( ! ( getBootstrapData(aRepositoryList, aInstallSetID) && (aRepositoryList.getLength() > 0) ) )
         return false;
 
     return checkForUpdates( o_rUpdateInfo, rxContext, rxInteractionHandler, rUpdateInfoProvider,
             myOS, myArch,
-            aRepositoryList, aBuildID, aInstallSetID );
+            aRepositoryList, aInstallSetID );
 }
 
 bool
@@ -123,7 +116,6 @@ checkForUpdates(
     const rtl::OUString &rOS,
     const rtl::OUString &rArch,
     const uno::Sequence< rtl::OUString > &rRepositoryList,
-    const rtl::OUString &rBuildID,
     const rtl::OUString &rInstallSetID )
 {
     if( !rxContext.is() )
@@ -155,9 +147,7 @@ checkForUpdates(
         aBuffer.append( rOS );
         aBuffer.appendAscii("\' and inst:arch=\'");
         aBuffer.append( rArch );
-        aBuffer.appendAscii("\' and inst:buildid>");
-        aBuffer.append( rBuildID );
-        aBuffer.appendAscii("]");
+        aBuffer.appendAscii("\']");
 
         rtl::OUString aXPathExpression = aBuffer.makeStringAndClear();
 
diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx
index 9488373..e155837 100644
--- a/extensions/source/update/check/updateprotocol.hxx
+++ b/extensions/source/update/check/updateprotocol.hxx
@@ -51,7 +51,6 @@ checkForUpdates(
     const rtl::OUString &rOS,
     const rtl::OUString &rArch,
     const ::com::sun::star::uno::Sequence< rtl::OUString > &rRepositoryList,
-    const rtl::OUString &rBuildID,
     const rtl::OUString &rInstallID
 );