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
1=== modified file '.bzrignore'
2--- .bzrignore 2013-06-06 10:51:04 +0000
3+++ .bzrignore 2013-07-02 08:04:28 +0000
4@@ -25,7 +25,9 @@
5 obj-*
6 debian/files
7 debian/tmp/
8+debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/
9 debian/webbrowser-app/
10+debian/webbrowser-app-assets/
11 debian/webbrowser-app-autopilot/
12 debian/*.debhelper
13 debian/*.debhelper.log
14
15=== modified file 'debian/control'
16--- debian/control 2013-06-19 23:31:08 +0000
17+++ debian/control 2013-07-02 08:04:28 +0000
18@@ -25,16 +25,26 @@
19 Architecture: any
20 Depends: ${misc:Depends},
21 ${shlibs:Depends},
22- qtdeclarative5-hud1.0,
23+ qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
24+ webbrowser-app-assets (= ${binary:Version}),
25+Description: Ubuntu web browser
26+ A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
27+ engine and using the Ubuntu UI components.
28+
29+Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin
30+Architecture: any
31+Depends: ${misc:Depends},
32+ ${shlibs:Depends},
33 libqt5sql5-sqlite,
34 libqt5webkit5-qmlwebkitplugin,
35+ qtdeclarative5-hud1.0,
36 qtdeclarative5-qtquick2-plugin,
37 qtdeclarative5-ubuntu-ui-toolkit-plugin,
38 qtdeclarative5-window-plugin,
39- webbrowser-app-assets (>= ${binary:Version}),
40-Description: Ubuntu web browser
41+Description: Ubuntu web browser QML plugin
42 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
43- engine and using the Ubuntu UI components.
44+ engine and using the Ubuntu UI components. This package contains a standalone
45+ QML plugin that applications can use to embed a browser control.
46
47 Package: webbrowser-app-assets
48 Architecture: all
49@@ -49,7 +59,7 @@
50 Depends: ${misc:Depends},
51 libautopilot-qt,
52 libqt5test5,
53- webbrowser-app (>= ${binary:Version}),
54+ webbrowser-app (= ${binary:Version}),
55 Description: Ubuntu web browser autopilot tests
56 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
57 engine and using the Ubuntu UI components. This package contains autopilot
58
59=== added file 'debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install'
60--- debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install 1970-01-01 00:00:00 +0000
61+++ debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install 2013-07-02 08:04:28 +0000
62@@ -0,0 +1,2 @@
63+usr/lib/*/qt5/qml/Ubuntu/Components/Extras/Browser/*
64+usr/share/locale/*/LC_MESSAGES/webbrowser-app.mo
65
66=== modified file 'debian/rules'
67--- debian/rules 2013-06-20 00:24:11 +0000
68+++ debian/rules 2013-07-02 08:04:28 +0000
69@@ -11,7 +11,7 @@
70
71 override_dh_install:
72 ln -sf /usr/share/webbrowser-app/assets \
73- $(CURDIR)/debian/tmp/usr/lib/*/qt5/qml/Ubuntu/Browser
74+ $(CURDIR)/debian/tmp/usr/lib/*/qt5/qml/Ubuntu/Components/Extras/Browser
75 dh_install --fail-missing
76
77 override_dh_translations:
78
79=== modified file 'debian/webbrowser-app.install'
80--- debian/webbrowser-app.install 2013-05-16 22:21:35 +0000
81+++ debian/webbrowser-app.install 2013-07-02 08:04:28 +0000
82@@ -1,5 +1,3 @@
83 usr/bin/webbrowser-app
84-usr/lib/*/qt5/qml/Ubuntu/Browser/*
85 usr/share/applications/webbrowser-app.desktop
86 usr/share/icons/hicolor/scalable/apps/webbrowser-app.svg
87-usr/share/locale/*/LC_MESSAGES/webbrowser-app.mo
88
89=== modified file 'src/CMakeLists.txt'
90--- src/CMakeLists.txt 2013-06-12 07:04:55 +0000
91+++ src/CMakeLists.txt 2013-07-02 08:04:28 +0000
92@@ -5,7 +5,7 @@
93 OUTPUT_VARIABLE QT_INSTALL_QML
94 OUTPUT_STRIP_TRAILING_WHITESPACE
95 )
96-set(WEBBROWSER_IMPORTS_DIR "${QT_INSTALL_QML}/Ubuntu/Browser")
97+set(WEBBROWSER_IMPORTS_DIR "${QT_INSTALL_QML}/Ubuntu/Components/Extras/Browser")
98
99 add_subdirectory(Ubuntu)
100
101
102=== modified file 'src/Ubuntu/CMakeLists.txt'
103--- src/Ubuntu/CMakeLists.txt 2013-01-15 16:09:55 +0000
104+++ src/Ubuntu/CMakeLists.txt 2013-07-02 08:04:28 +0000
105@@ -1,1 +1,1 @@
106-add_subdirectory(Browser)
107+add_subdirectory(Components)
108
109=== added directory 'src/Ubuntu/Components'
110=== added file 'src/Ubuntu/Components/CMakeLists.txt'
111--- src/Ubuntu/Components/CMakeLists.txt 1970-01-01 00:00:00 +0000
112+++ src/Ubuntu/Components/CMakeLists.txt 2013-07-02 08:04:28 +0000
113@@ -0,0 +1,1 @@
114+add_subdirectory(Extras)
115
116=== added directory 'src/Ubuntu/Components/Extras'
117=== renamed directory 'src/Ubuntu/Browser' => 'src/Ubuntu/Components/Extras/Browser'
118=== modified file 'src/Ubuntu/Components/Extras/Browser/Browser.qml'
119--- src/Ubuntu/Browser/Browser.qml 2013-06-12 08:35:59 +0000
120+++ src/Ubuntu/Components/Extras/Browser/Browser.qml 2013-07-02 08:04:28 +0000
121@@ -18,8 +18,8 @@
122
123 import QtQuick 2.0
124 import QtWebKit 3.0
125-import Ubuntu.Browser 0.1
126 import Ubuntu.Components 0.1
127+import Ubuntu.Components.Extras.Browser 0.1
128 import Ubuntu.HUD 1.0 as HUD
129
130 FocusScope {
131
132=== modified file 'src/Ubuntu/Components/Extras/Browser/CMakeLists.txt'
133--- src/Ubuntu/Browser/CMakeLists.txt 2013-06-26 23:32:14 +0000
134+++ src/Ubuntu/Components/Extras/Browser/CMakeLists.txt 2013-07-02 08:04:28 +0000
135@@ -1,6 +1,6 @@
136 project(webbrowser-plugin)
137
138-set(PLUGIN ubuntubrowser)
139+set(PLUGIN ubuntu-ui-extras-browser-plugin)
140
141 set(PLUGIN_SRC
142 history-model.cpp
143@@ -21,5 +21,5 @@
144
145 # copy qml files over to build dir to be able to import them in tests
146 foreach(qmlFile ${QML_FILES})
147- file(COPY ${qmlFile} DESTINATION ${CMAKE_BINARY_DIR}/src/Ubuntu/Browser/)
148+ file(COPY ${qmlFile} DESTINATION ${CMAKE_BINARY_DIR}/src/Ubuntu/Components/Extras/Browser/)
149 endforeach(qmlFile)
150
151=== modified file 'src/Ubuntu/Components/Extras/Browser/plugin.cpp'
152--- src/Ubuntu/Browser/plugin.cpp 2013-06-12 07:04:55 +0000
153+++ src/Ubuntu/Components/Extras/Browser/plugin.cpp 2013-07-02 08:04:28 +0000
154@@ -39,7 +39,7 @@
155
156 void UbuntuBrowserPlugin::registerTypes(const char* uri)
157 {
158- Q_ASSERT(uri == QLatin1String("Ubuntu.Browser"));
159+ Q_ASSERT(uri == QLatin1String("Ubuntu.Components.Extras.Browser"));
160 qmlRegisterType<HistoryModel>(uri, 0, 1, "HistoryModel");
161 qmlRegisterType<HistoryMatchesModel>(uri, 0, 1, "HistoryMatchesModel");
162 qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel");
163
164=== modified file 'src/Ubuntu/Components/Extras/Browser/qmldir'
165--- src/Ubuntu/Browser/qmldir 2013-05-23 16:46:51 +0000
166+++ src/Ubuntu/Components/Extras/Browser/qmldir 2013-07-02 08:04:28 +0000
167@@ -1,5 +1,5 @@
168-module Ubuntu.Browser
169-plugin ubuntubrowser
170+module Ubuntu.Components.Extras.Browser
171+plugin ubuntu-ui-extras-browser-plugin
172 AddressBar 0.1 AddressBar.qml
173 Chrome 0.1 Chrome.qml
174 ChromeButton 0.1 ChromeButton.qml
175
176=== added file 'src/Ubuntu/Components/Extras/CMakeLists.txt'
177--- src/Ubuntu/Components/Extras/CMakeLists.txt 1970-01-01 00:00:00 +0000
178+++ src/Ubuntu/Components/Extras/CMakeLists.txt 2013-07-02 08:04:28 +0000
179@@ -0,0 +1,1 @@
180+add_subdirectory(Browser)
181
182=== modified file 'src/config.h.in'
183--- src/config.h.in 2013-06-04 07:19:58 +0000
184+++ src/config.h.in 2013-07-02 08:04:28 +0000
185@@ -37,7 +37,7 @@
186 if (isRunningInstalled()) {
187 return QString("@WEBBROWSER_IMPORTS_DIR@");
188 } else {
189- return QString("@CMAKE_SOURCE_DIR@/src/Ubuntu/Browser");
190+ return QString("@CMAKE_SOURCE_DIR@/src/Ubuntu/Components/Extras/Browser");
191 }
192 }
193
194
195=== modified file 'src/test.qml'
196--- src/test.qml 2013-03-08 10:53:16 +0000
197+++ src/test.qml 2013-07-02 08:04:28 +0000
198@@ -16,8 +16,8 @@
199 * along with this program. If not, see <http://www.gnu.org/licenses/>.
200 */
201
202-import Ubuntu.Browser 0.1
203 import Ubuntu.Components 0.1
204+import Ubuntu.Components.Extras.Browser 0.1
205
206 Browser {
207 // phone form factor
208
209=== modified file 'tests/unittests/tst_AddressBar.qml'
210--- tests/unittests/tst_AddressBar.qml 2013-05-31 16:21:40 +0000
211+++ tests/unittests/tst_AddressBar.qml 2013-07-02 08:04:28 +0000
212@@ -18,7 +18,7 @@
213
214 import QtQuick 2.0
215 import QtTest 1.0
216-import Ubuntu.Browser 0.1
217+import Ubuntu.Components.Extras.Browser 0.1
218
219 TestCase {
220 name: "AddressBar"
221
222=== modified file 'tests/unittests/tst_Chrome.qml'
223--- tests/unittests/tst_Chrome.qml 2013-03-08 10:53:16 +0000
224+++ tests/unittests/tst_Chrome.qml 2013-07-02 08:04:28 +0000
225@@ -18,7 +18,7 @@
226
227 import QtQuick 2.0
228 import QtTest 1.0
229-import Ubuntu.Browser 0.1
230+import Ubuntu.Components.Extras.Browser 0.1
231
232 TestCase {
233 name: "Chrome"

Subscribers

People subscribed via source and target branches

to status/vote changes: