webbrowser-app

Merge lp:~osomon/webbrowser-app/separate-plugin-app into lp:webbrowser-app

  1. separate-plugin-app
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 203
Merged at revision: 204
Proposed branch: lp:~osomon/webbrowser-app/separate-plugin-app
Merge into: lp:webbrowser-app
Diff against target: 233 lines (+34/-20)
17 files modified
.bzrignore (+2/-0)
debian/control (+15/-5)
debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install (+2/-0)
debian/rules (+1/-1)
debian/webbrowser-app.install (+0/-2)
src/CMakeLists.txt (+1/-1)
src/Ubuntu/CMakeLists.txt (+1/-1)
src/Ubuntu/Components/CMakeLists.txt (+1/-0)
src/Ubuntu/Components/Extras/Browser/Browser.qml (+1/-1)
src/Ubuntu/Components/Extras/Browser/CMakeLists.txt (+2/-2)
src/Ubuntu/Components/Extras/Browser/plugin.cpp (+1/-1)
src/Ubuntu/Components/Extras/Browser/qmldir (+2/-2)
src/Ubuntu/Components/Extras/CMakeLists.txt (+1/-0)
src/config.h.in (+1/-1)
src/test.qml (+1/-1)
tests/unittests/tst_AddressBar.qml (+1/-1)
tests/unittests/tst_Chrome.qml (+1/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/separate-plugin-app
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ugo Riboni (community) Approve
Review via email: mp+172480@code.launchpad.net

Commit message

Separate the app and the plugin into two packages,
and rename the plugin and move it under Ubuntu.Components.Extras.Browser.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/163/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/546
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/546/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/492

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/163/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/557
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/503

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/165/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

Changes are ok as discussed, it builds and runs fine and jenkins seems to be happy about it too.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/33
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/576
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/576/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/516

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/34
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/586
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/586/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/524

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2013-06-06 10:51:04 +0000
+++ .bzrignore 2013-07-02 08:04:28 +0000
@@ -25,7 +25,9 @@
25obj-*25obj-*
26debian/files26debian/files
27debian/tmp/27debian/tmp/
28debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/
28debian/webbrowser-app/29debian/webbrowser-app/
30debian/webbrowser-app-assets/
29debian/webbrowser-app-autopilot/31debian/webbrowser-app-autopilot/
30debian/*.debhelper32debian/*.debhelper
31debian/*.debhelper.log33debian/*.debhelper.log
3234
=== modified file 'debian/control'
--- debian/control 2013-06-19 23:31:08 +0000
+++ debian/control 2013-07-02 08:04:28 +0000
@@ -25,16 +25,26 @@
25Architecture: any25Architecture: any
26Depends: ${misc:Depends},26Depends: ${misc:Depends},
27 ${shlibs:Depends},27 ${shlibs:Depends},
28 qtdeclarative5-hud1.0,28 qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
29 webbrowser-app-assets (= ${binary:Version}),
30Description: Ubuntu web browser
31 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
32 engine and using the Ubuntu UI components.
33
34Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin
35Architecture: any
36Depends: ${misc:Depends},
37 ${shlibs:Depends},
29 libqt5sql5-sqlite,38 libqt5sql5-sqlite,
30 libqt5webkit5-qmlwebkitplugin,39 libqt5webkit5-qmlwebkitplugin,
40 qtdeclarative5-hud1.0,
31 qtdeclarative5-qtquick2-plugin,41 qtdeclarative5-qtquick2-plugin,
32 qtdeclarative5-ubuntu-ui-toolkit-plugin,42 qtdeclarative5-ubuntu-ui-toolkit-plugin,
33 qtdeclarative5-window-plugin,43 qtdeclarative5-window-plugin,
34 webbrowser-app-assets (>= ${binary:Version}),44Description: Ubuntu web browser QML plugin
35Description: Ubuntu web browser
36 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering45 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
37 engine and using the Ubuntu UI components.46 engine and using the Ubuntu UI components. This package contains a standalone
47 QML plugin that applications can use to embed a browser control.
3848
39Package: webbrowser-app-assets49Package: webbrowser-app-assets
40Architecture: all50Architecture: all
@@ -49,7 +59,7 @@
49Depends: ${misc:Depends},59Depends: ${misc:Depends},
50 libautopilot-qt,60 libautopilot-qt,
51 libqt5test5,61 libqt5test5,
52 webbrowser-app (>= ${binary:Version}),62 webbrowser-app (= ${binary:Version}),
53Description: Ubuntu web browser autopilot tests63Description: Ubuntu web browser autopilot tests
54 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering64 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
55 engine and using the Ubuntu UI components. This package contains autopilot65 engine and using the Ubuntu UI components. This package contains autopilot
5666
=== added file 'debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install'
--- debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install 1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install 2013-07-02 08:04:28 +0000
@@ -0,0 +1,2 @@
1usr/lib/*/qt5/qml/Ubuntu/Components/Extras/Browser/*
2usr/share/locale/*/LC_MESSAGES/webbrowser-app.mo
03
=== modified file 'debian/rules'
--- debian/rules 2013-06-20 00:24:11 +0000
+++ debian/rules 2013-07-02 08:04:28 +0000
@@ -11,7 +11,7 @@
1111
12override_dh_install:12override_dh_install:
13 ln -sf /usr/share/webbrowser-app/assets \13 ln -sf /usr/share/webbrowser-app/assets \
14 $(CURDIR)/debian/tmp/usr/lib/*/qt5/qml/Ubuntu/Browser14 $(CURDIR)/debian/tmp/usr/lib/*/qt5/qml/Ubuntu/Components/Extras/Browser
15 dh_install --fail-missing15 dh_install --fail-missing
1616
17override_dh_translations:17override_dh_translations:
1818
=== modified file 'debian/webbrowser-app.install'
--- debian/webbrowser-app.install 2013-05-16 22:21:35 +0000
+++ debian/webbrowser-app.install 2013-07-02 08:04:28 +0000
@@ -1,5 +1,3 @@
1usr/bin/webbrowser-app1usr/bin/webbrowser-app
2usr/lib/*/qt5/qml/Ubuntu/Browser/*
3usr/share/applications/webbrowser-app.desktop2usr/share/applications/webbrowser-app.desktop
4usr/share/icons/hicolor/scalable/apps/webbrowser-app.svg3usr/share/icons/hicolor/scalable/apps/webbrowser-app.svg
5usr/share/locale/*/LC_MESSAGES/webbrowser-app.mo
64
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2013-06-12 07:04:55 +0000
+++ src/CMakeLists.txt 2013-07-02 08:04:28 +0000
@@ -5,7 +5,7 @@
5 OUTPUT_VARIABLE QT_INSTALL_QML5 OUTPUT_VARIABLE QT_INSTALL_QML
6 OUTPUT_STRIP_TRAILING_WHITESPACE6 OUTPUT_STRIP_TRAILING_WHITESPACE
7)7)
8set(WEBBROWSER_IMPORTS_DIR "${QT_INSTALL_QML}/Ubuntu/Browser")8set(WEBBROWSER_IMPORTS_DIR "${QT_INSTALL_QML}/Ubuntu/Components/Extras/Browser")
99
10add_subdirectory(Ubuntu)10add_subdirectory(Ubuntu)
1111
1212
=== modified file 'src/Ubuntu/CMakeLists.txt'
--- src/Ubuntu/CMakeLists.txt 2013-01-15 16:09:55 +0000
+++ src/Ubuntu/CMakeLists.txt 2013-07-02 08:04:28 +0000
@@ -1,1 +1,1 @@
1add_subdirectory(Browser)1add_subdirectory(Components)
22
=== added directory 'src/Ubuntu/Components'
=== added file 'src/Ubuntu/Components/CMakeLists.txt'
--- src/Ubuntu/Components/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/CMakeLists.txt 2013-07-02 08:04:28 +0000
@@ -0,0 +1,1 @@
1add_subdirectory(Extras)
02
=== added directory 'src/Ubuntu/Components/Extras'
=== renamed directory 'src/Ubuntu/Browser' => 'src/Ubuntu/Components/Extras/Browser'
=== modified file 'src/Ubuntu/Components/Extras/Browser/Browser.qml'
--- src/Ubuntu/Browser/Browser.qml 2013-06-12 08:35:59 +0000
+++ src/Ubuntu/Components/Extras/Browser/Browser.qml 2013-07-02 08:04:28 +0000
@@ -18,8 +18,8 @@
1818
19import QtQuick 2.019import QtQuick 2.0
20import QtWebKit 3.020import QtWebKit 3.0
21import Ubuntu.Browser 0.1
22import Ubuntu.Components 0.121import Ubuntu.Components 0.1
22import Ubuntu.Components.Extras.Browser 0.1
23import Ubuntu.HUD 1.0 as HUD23import Ubuntu.HUD 1.0 as HUD
2424
25FocusScope {25FocusScope {
2626
=== modified file 'src/Ubuntu/Components/Extras/Browser/CMakeLists.txt'
--- src/Ubuntu/Browser/CMakeLists.txt 2013-06-26 23:32:14 +0000
+++ src/Ubuntu/Components/Extras/Browser/CMakeLists.txt 2013-07-02 08:04:28 +0000
@@ -1,6 +1,6 @@
1project(webbrowser-plugin)1project(webbrowser-plugin)
22
3set(PLUGIN ubuntubrowser)3set(PLUGIN ubuntu-ui-extras-browser-plugin)
44
5set(PLUGIN_SRC5set(PLUGIN_SRC
6 history-model.cpp6 history-model.cpp
@@ -21,5 +21,5 @@
2121
22# copy qml files over to build dir to be able to import them in tests22# copy qml files over to build dir to be able to import them in tests
23foreach(qmlFile ${QML_FILES})23foreach(qmlFile ${QML_FILES})
24 file(COPY ${qmlFile} DESTINATION ${CMAKE_BINARY_DIR}/src/Ubuntu/Browser/)24 file(COPY ${qmlFile} DESTINATION ${CMAKE_BINARY_DIR}/src/Ubuntu/Components/Extras/Browser/)
25endforeach(qmlFile)25endforeach(qmlFile)
2626
=== modified file 'src/Ubuntu/Components/Extras/Browser/plugin.cpp'
--- src/Ubuntu/Browser/plugin.cpp 2013-06-12 07:04:55 +0000
+++ src/Ubuntu/Components/Extras/Browser/plugin.cpp 2013-07-02 08:04:28 +0000
@@ -39,7 +39,7 @@
3939
40void UbuntuBrowserPlugin::registerTypes(const char* uri)40void UbuntuBrowserPlugin::registerTypes(const char* uri)
41{41{
42 Q_ASSERT(uri == QLatin1String("Ubuntu.Browser"));42 Q_ASSERT(uri == QLatin1String("Ubuntu.Components.Extras.Browser"));
43 qmlRegisterType<HistoryModel>(uri, 0, 1, "HistoryModel");43 qmlRegisterType<HistoryModel>(uri, 0, 1, "HistoryModel");
44 qmlRegisterType<HistoryMatchesModel>(uri, 0, 1, "HistoryMatchesModel");44 qmlRegisterType<HistoryMatchesModel>(uri, 0, 1, "HistoryMatchesModel");
45 qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel");45 qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel");
4646
=== modified file 'src/Ubuntu/Components/Extras/Browser/qmldir'
--- src/Ubuntu/Browser/qmldir 2013-05-23 16:46:51 +0000
+++ src/Ubuntu/Components/Extras/Browser/qmldir 2013-07-02 08:04:28 +0000
@@ -1,5 +1,5 @@
1module Ubuntu.Browser1module Ubuntu.Components.Extras.Browser
2plugin ubuntubrowser2plugin ubuntu-ui-extras-browser-plugin
3AddressBar 0.1 AddressBar.qml3AddressBar 0.1 AddressBar.qml
4Chrome 0.1 Chrome.qml4Chrome 0.1 Chrome.qml
5ChromeButton 0.1 ChromeButton.qml5ChromeButton 0.1 ChromeButton.qml
66
=== added file 'src/Ubuntu/Components/Extras/CMakeLists.txt'
--- src/Ubuntu/Components/Extras/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Extras/CMakeLists.txt 2013-07-02 08:04:28 +0000
@@ -0,0 +1,1 @@
1add_subdirectory(Browser)
02
=== modified file 'src/config.h.in'
--- src/config.h.in 2013-06-04 07:19:58 +0000
+++ src/config.h.in 2013-07-02 08:04:28 +0000
@@ -37,7 +37,7 @@
37 if (isRunningInstalled()) {37 if (isRunningInstalled()) {
38 return QString("@WEBBROWSER_IMPORTS_DIR@");38 return QString("@WEBBROWSER_IMPORTS_DIR@");
39 } else {39 } else {
40 return QString("@CMAKE_SOURCE_DIR@/src/Ubuntu/Browser");40 return QString("@CMAKE_SOURCE_DIR@/src/Ubuntu/Components/Extras/Browser");
41 }41 }
42}42}
4343
4444
=== modified file 'src/test.qml'
--- src/test.qml 2013-03-08 10:53:16 +0000
+++ src/test.qml 2013-07-02 08:04:28 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import Ubuntu.Browser 0.1
20import Ubuntu.Components 0.119import Ubuntu.Components 0.1
20import Ubuntu.Components.Extras.Browser 0.1
2121
22Browser {22Browser {
23 // phone form factor23 // phone form factor
2424
=== modified file 'tests/unittests/tst_AddressBar.qml'
--- tests/unittests/tst_AddressBar.qml 2013-05-31 16:21:40 +0000
+++ tests/unittests/tst_AddressBar.qml 2013-07-02 08:04:28 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.019import QtQuick 2.0
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Browser 0.121import Ubuntu.Components.Extras.Browser 0.1
2222
23TestCase {23TestCase {
24 name: "AddressBar"24 name: "AddressBar"
2525
=== modified file 'tests/unittests/tst_Chrome.qml'
--- tests/unittests/tst_Chrome.qml 2013-03-08 10:53:16 +0000
+++ tests/unittests/tst_Chrome.qml 2013-07-02 08:04:28 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.019import QtQuick 2.0
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Browser 0.121import Ubuntu.Components.Extras.Browser 0.1
2222
23TestCase {23TestCase {
24 name: "Chrome"24 name: "Chrome"

Subscribers

People subscribed via source and target branches

to status/vote changes: