Merge lp:~osomon/oxide/versions into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Add a 'version' and a 'chromiumVersion' properties to the Oxide global object.

[Chris Coulson (chrisccoulson)]

Thanks for this.

My main issue with this is that it leaves a build artefact in the source tree - pre-processed headers should be in the build directory really. It may be non-trivial with the current approach (using cmake to create a header for the core library, configured with gyp) to include a header from the build-directory - you'd probably need to pass an include path to gyp just for this.

It might be better to generate this the same way that chrome_version.h is already generated (from gyp, using third_party/chromium/src/build/util/version.py and having the file in qt/core/common). I just verified that it's possible to re-use Chromium's version.py (qt/VERSION is formatted to work with this already).

I've left a couple of comments inline too.

review: Needs Fixing

[lp:~osomon/oxide/versions]

1432. By Olivier Tilloy on 2016-04-14

No static constructors.

1433. By Olivier Tilloy on 2016-04-14

Rename oxideGetOxideVersion() to oxideGetVersion().

1434. By Olivier Tilloy on 2016-04-14

Generate oxide_version.h from gyp to avoid leaving a build artefact in the source tree.

[Olivier Tilloy (osomon)]

Comments addressed.

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'qt/core/api/oxideqglobal.cc'
--- qt/core/api/oxideqglobal.cc	2016-04-02 13:30:04 +0000
+++ qt/core/api/oxideqglobal.cc	2016-04-14 13:18:24 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014 Canonical Ltd.
+// Copyright (C) 2014-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,9 @@
 
 #include "qt/core/browser/oxide_qt_browser_platform_integration.h"
 #include "qt/core/browser/oxide_qt_browser_startup.h"
+#include "qt/core/common/oxide_version.h"
 #include "shared/browser/oxide_browser_process_main.h"
+#include "shared/common/chrome_version.h"
 
 using namespace oxide::qt;
 
@@ -113,3 +115,13 @@
 
   content::RenderProcessHost::SetMaxRendererProcessCount(count);
 }
+
+QString oxideGetChromeVersion() {
+  static QString kChromeVersion = QStringLiteral(CHROME_VERSION_STRING);
+  return kChromeVersion;
+}
+
+QString oxideGetVersion() {
+  static QString kOxideVersion = QStringLiteral(OXIDE_VERSION_STRING);
+  return kOxideVersion;
+}

=== modified file 'qt/core/api/oxideqglobal.h'
--- qt/core/api/oxideqglobal.h	2016-01-13 18:16:11 +0000
+++ qt/core/api/oxideqglobal.h	2016-04-14 13:18:24 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014 Canonical Ltd.
+// Copyright (C) 2014-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -57,4 +57,7 @@
 OXIDE_QTCORE_EXPORT size_t oxideGetMaxRendererProcessCount();
 OXIDE_QTCORE_EXPORT void oxideSetMaxRendererProcessCount(size_t count);
 
-#endif // OXIDE_QTCORe_GLOBAL
+OXIDE_QTCORE_EXPORT QString oxideGetChromeVersion();
+OXIDE_QTCORE_EXPORT QString oxideGetVersion();
+
+#endif // OXIDE_QTCORE_GLOBAL

=== added directory 'qt/core/common'
=== added file 'qt/core/common/oxide_version.h.in'
--- qt/core/common/oxide_version.h.in	1970-01-01 00:00:00 +0000
+++ qt/core/common/oxide_version.h.in	2016-04-14 13:18:24 +0000
@@ -0,0 +1,23 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2016 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef OXIDE_QTCORE_COMMON_VERSION
+#define OXIDE_QTCORE_COMMON_VERSION
+
+#define OXIDE_VERSION_STRING "@MAJOR@.@MINOR@.@PATCH@"
+
+#endif // OXIDE_QTCORE_COMMON_VERSION

=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2016-04-09 18:08:10 +0000
+++ qt/core/core.gyp	2016-04-14 13:18:24 +0000
@@ -59,6 +59,7 @@
         '<(INTERMEDIATE_DIR)',
         'api/includes',
         '<(DEPTH)',
+        '<(SHARED_INTERMEDIATE_DIR)/oxide',
       ],
       'ldflags': [
         '-Wl,-rpath=\$$ORIGIN/<(oxide_libexecdir)',
@@ -323,6 +324,23 @@
           'moc_input': 'browser/oxide_qt_url_request_delegated_job.cc',
           'includes': [ 'moc.gypi' ]
         },
+        {
+          'action_name': 'oxide_version_header',
+          'inputs': [
+            'common/oxide_version.h.in',
+            '../VERSION'
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/oxide/qt/core/common/oxide_version.h'
+          ],
+          'action': [
+            'python',
+            '<(DEPTH)/build/util/version.py',
+            '-f', '../VERSION',
+            '-i', '<@(_inputs)',
+            '-o', '<@(_outputs)'
+          ]
+        },
       ],
       'conditions': [
         ['component=="shared_library"', {

=== modified file 'qt/qmlplugin/oxide.qmltypes'
--- qt/qmlplugin/oxide.qmltypes	2016-04-04 15:11:30 +0000
+++ qt/qmlplugin/oxide.qmltypes	2016-04-14 13:18:24 +0000
@@ -253,6 +253,8 @@
         Property { name: "maxRendererProcessCount"; type: "int" }
         Property { name: "availableAudioCaptureDevices"; type: "QVariant"; isReadonly: true }
         Property { name: "availableVideoCaptureDevices"; type: "QVariant"; isReadonly: true }
+        Property { name: "chromiumVersion"; type: "string"; isReadonly: true }
+        Property { name: "version"; type: "string"; isReadonly: true }
         Method { name: "defaultWebContext"; type: "OxideQQuickWebContext*" }
     }
     Component {

=== modified file 'qt/quick/api/oxideqquickglobal.cc'
--- qt/quick/api/oxideqquickglobal.cc	2016-01-13 18:16:11 +0000
+++ qt/quick/api/oxideqquickglobal.cc	2016-04-14 13:18:24 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2015 Canonical Ltd.
+// Copyright (C) 2013-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -211,4 +211,12 @@
   return d->video_capture_devices_;
 }
 
+QString OxideQQuickGlobal::chromiumVersion() const {
+  return oxideGetChromeVersion();
+}
+
+QString OxideQQuickGlobal::oxideVersion() const {
+  return oxideGetVersion();
+}
+
 #include "moc_oxideqquickglobal_p.cpp"

=== modified file 'qt/quick/api/oxideqquickglobal_p.h'
--- qt/quick/api/oxideqquickglobal_p.h	2016-01-13 18:16:11 +0000
+++ qt/quick/api/oxideqquickglobal_p.h	2016-04-14 13:18:24 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2015 Canonical Ltd.
+// Copyright (C) 2013-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -37,6 +37,9 @@
   Q_PROPERTY(QVariant availableAudioCaptureDevices READ availableAudioCaptureDevices NOTIFY availableAudioCaptureDevicesChanged)
   Q_PROPERTY(QVariant availableVideoCaptureDevices READ availableVideoCaptureDevices NOTIFY availableVideoCaptureDevicesChanged)
 
+  Q_PROPERTY(QString chromiumVersion READ chromiumVersion CONSTANT)
+  Q_PROPERTY(QString version READ oxideVersion CONSTANT)
+
   Q_ENUMS(ProcessModel)
 
   Q_DECLARE_PRIVATE(OxideQQuickGlobal)
@@ -66,6 +69,9 @@
   QVariant availableAudioCaptureDevices();
   QVariant availableVideoCaptureDevices();
 
+  QString chromiumVersion() const;
+  QString oxideVersion() const;
+
   Q_INVOKABLE OxideQQuickWebContext* defaultWebContext();
 
  Q_SIGNALS:

=== modified file 'qt/tests/qmltests/api/tst_OxideGlobal.qml'
--- qt/tests/qmltests/api/tst_OxideGlobal.qml	2016-03-24 23:23:20 +0000
+++ qt/tests/qmltests/api/tst_OxideGlobal.qml	2016-04-14 13:18:24 +0000
@@ -28,4 +28,12 @@
     compare(devices[0].displayName.substr(0, 13), "fake_device_0");
     compare(devices[0].position, "unspecified");
   }
+
+  function test_OxideGlobal3_chromiumVersion() {
+    verify(/^\d+\.\d+\.\d+\.\d+$/.test(Oxide.chromiumVersion));
+  }
+
+  function test_OxideGlobal3_oxideVersion() {
+    verify(/^\d+\.\d+\.\d+$/.test(Oxide.version));
+  }
 }