Merge lp:~zeller-benjamin/ubuntu-sdk-ide/remove-devkit into lp:ubuntu-sdk-ide
- remove-devkit
- Merge into trunk
Proposed by
Benjamin Zeller
Status: | Merged |
---|---|
Merged at revision: | 110 |
Proposed branch: | lp:~zeller-benjamin/ubuntu-sdk-ide/remove-devkit |
Merge into: | lp:ubuntu-sdk-ide |
Diff against target: |
565 lines (+1/-488) 11 files modified
CMakeLists.txt (+0/-39) create_sdk.sh (+0/-46) debian/control (+0/-12) debian/rules (+1/-3) debian/ubuntu-sdk-dev.install (+0/-2) desktop_kit_configure (+0/-57) desktop_kit_qt.pro (+0/-81) get_qt_sources.py (+0/-117) getdsc.py (+0/-57) kit_config (+0/-32) ubuntu-sdk-shell.in (+0/-42) |
To merge this branch: | bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/remove-devkit |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Pending | ||
Review via email: mp+280689@code.launchpad.net |
Commit message
Remove the -dev package from the IDE build
Description of the change
Remove the -dev package from the IDE build
To post a comment you must log in.
- 103. By Benjamin Zeller
-
Merge trunk
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'CMakeLists.txt' | |||
2 | --- CMakeLists.txt 2015-11-25 12:56:07 +0000 | |||
3 | +++ CMakeLists.txt 2015-12-16 09:18:38 +0000 | |||
4 | @@ -26,9 +26,6 @@ | |||
5 | 26 | 26 | ||
6 | 27 | set (QT_VERSION "qt-everywhere-opensource-src-5.4.2") | 27 | set (QT_VERSION "qt-everywhere-opensource-src-5.4.2") |
7 | 28 | set (QT_SOURCE_DIR "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-5.4.2") | 28 | set (QT_SOURCE_DIR "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-5.4.2") |
8 | 29 | set (QT_KIT_PREFIX "${CMAKE_BINARY_DIR}/qt-api-build") | ||
9 | 30 | set (QT_KIT_SOURCE_DIR "${QT_KIT_PREFIX}/qt-everywhere-opensource-src-ubuntu") | ||
10 | 31 | set (QT_KIT_INSTALL_PREFIX "/usr/ubuntu-sdk-dev") | ||
11 | 32 | set (QT_BUILD_DIR "${CMAKE_BINARY_DIR}/qt-build/build") | 29 | set (QT_BUILD_DIR "${CMAKE_BINARY_DIR}/qt-build/build") |
12 | 33 | set (QT_INSTALL_DIR "${CMAKE_BINARY_DIR}/qt") | 30 | set (QT_INSTALL_DIR "${CMAKE_BINARY_DIR}/qt") |
13 | 34 | 31 | ||
14 | @@ -136,39 +133,3 @@ | |||
15 | 136 | #there is no install step required, the plugin is built directly into the installed plugins dir | 133 | #there is no install step required, the plugin is built directly into the installed plugins dir |
16 | 137 | INSTALL_COMMAND sh -c "exit 0" | 134 | INSTALL_COMMAND sh -c "exit 0" |
17 | 138 | ) | 135 | ) |
18 | 139 | |||
19 | 140 | |||
20 | 141 | ConcatStrings(QT_KIT_INSTALL_SCRIPT | ||
21 | 142 | "make qmake_all " | ||
22 | 143 | "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install " | ||
23 | 144 | "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt docs -j1 " | ||
24 | 145 | "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install_docs -j1" | ||
25 | 146 | ) | ||
26 | 147 | |||
27 | 148 | ExternalProject_Add(${QT_VERSION}-api | ||
28 | 149 | PREFIX "${QT_KIT_PREFIX}" | ||
29 | 150 | SOURCE_DIR "${QT_KIT_SOURCE_DIR}" | ||
30 | 151 | BINARY_DIR "${QT_KIT_PREFIX}/build" | ||
31 | 152 | INSTALL_DIR "${QT_KIT_PREFIX}/qt" | ||
32 | 153 | DOWNLOAD_COMMAND sh -c "cd ${QT_KIT_SOURCE_DIR} && ${CMAKE_SOURCE_DIR}/get_qt_sources.py" | ||
33 | 154 | UPDATE_COMMAND sh -c "exit 0" #nothing to update | ||
34 | 155 | PATCH_COMMAND sh -c "cp ${CMAKE_SOURCE_DIR}/desktop_kit_qt.pro ${QT_KIT_SOURCE_DIR}/qt.pro && cp ${CMAKE_SOURCE_DIR}/desktop_kit_configure ${QT_KIT_SOURCE_DIR}/configure" | ||
35 | 156 | CONFIGURE_COMMAND sh -c "${QT_KIT_SOURCE_DIR}/configure -prefix ${QT_KIT_INSTALL_PREFIX} `cat ${CMAKE_SOURCE_DIR}/kit_config`" | ||
36 | 157 | BUILD_COMMAND sh -c "make ${GENERATED_MAKE_FLAGS}" | ||
37 | 158 | INSTALL_COMMAND sh -c "${QT_KIT_INSTALL_SCRIPT}" | ||
38 | 159 | ) | ||
39 | 160 | |||
40 | 161 | |||
41 | 162 | SET (EXTRAS_PREFIX "${CMAKE_BINARY_DIR}/qt-extras") | ||
42 | 163 | ExternalProject_Add(${QT_VERSION}-extras | ||
43 | 164 | DEPENDS ${QT_VERSION}-api qtcreator_3.5.0 | ||
44 | 165 | PREFIX "${EXTRAS_PREFIX}" | ||
45 | 166 | SOURCE_DIR "${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras" | ||
46 | 167 | DOWNLOAD_COMMAND sh -c "bzr branch lp:ubuntu-sdk-qmake-extras ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras -Ossl.cert_reqs=none --use-existing-dir" | ||
47 | 168 | UPDATE_COMMAND sh -c "exit 0" #nothing to update | ||
48 | 169 | CONFIGURE_COMMAND sh -c "exit 0" | ||
49 | 170 | BUILD_COMMAND sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt/usr/ubuntu-sdk-dev/mkspecs/features" | ||
50 | 171 | INSTALL_COMMAND sh -c "cd ${CMAKE_BINARY_DIR} && ${CMAKE_SOURCE_DIR}/create_sdk.sh" | ||
51 | 172 | ) | ||
52 | 173 | |||
53 | 174 | configure_file(${CMAKE_SOURCE_DIR}/ubuntu-sdk-shell.in ${QT_KIT_PREFIX}/qt/usr/ubuntu-sdk-dev/bin/ubuntu-sdk-shell @ONLY) | ||
54 | 175 | 136 | ||
55 | === removed file 'create_sdk.sh' | |||
56 | --- create_sdk.sh 2015-10-22 10:36:47 +0000 | |||
57 | +++ create_sdk.sh 1970-01-01 00:00:00 +0000 | |||
58 | @@ -1,46 +0,0 @@ | |||
59 | 1 | #!/bin/bash | ||
60 | 2 | |||
61 | 3 | GCC_UID="" | ||
62 | 4 | QT_UID="UbuntuSDK-API-Qt" | ||
63 | 5 | |||
64 | 6 | case "$(dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null)" in | ||
65 | 7 | x86_64-linux-gnu) | ||
66 | 8 | GCC_UID="ProjectExplorer.ToolChain.Gcc:UbuntuSDKGCC-x86_64-linux-gnu" | ||
67 | 9 | ./ubuntu-sdk-ide/bin/sdktool addTC \ | ||
68 | 10 | --id "${GCC_UID}" \ | ||
69 | 11 | --name "GCC (x86 64bit in /usr/bin/g++)" \ | ||
70 | 12 | --path /usr/bin/g++ \ | ||
71 | 13 | --abi x86-linux-generic-elf-64bit \ | ||
72 | 14 | --supportedAbis x86-linux-generic-elf-64bit,x86-linux-generic-elf-32bit | ||
73 | 15 | ;; | ||
74 | 16 | |||
75 | 17 | i386-linux-gnu) | ||
76 | 18 | GCC_UID="ProjectExplorer.ToolChain.Gcc:UbuntuSDKGCC-x86-linux-generic-elf-32bit" | ||
77 | 19 | ./ubuntu-sdk-ide/bin/sdktool addTC \ | ||
78 | 20 | --id "${GCC_UID}" \ | ||
79 | 21 | --name "GCC (x86 32bit in /usr/bin/g++)" \ | ||
80 | 22 | --path /usr/bin/g++ \ | ||
81 | 23 | --abi x86-linux-generic-elf-32bit \ | ||
82 | 24 | --supportedAbis x86-linux-generic-elf-32bit | ||
83 | 25 | ;; | ||
84 | 26 | |||
85 | 27 | *) | ||
86 | 28 | echo "Unknown architecture" | ||
87 | 29 | exit 1 | ||
88 | 30 | ;; | ||
89 | 31 | esac | ||
90 | 32 | |||
91 | 33 | ./ubuntu-sdk-ide/bin/sdktool addQt \ | ||
92 | 34 | --id "${QT_UID}" \ | ||
93 | 35 | --name "Ubuntu SDK Desktop Qt" \ | ||
94 | 36 | --qmake /usr/ubuntu-sdk-dev/bin/qmake \ | ||
95 | 37 | --type Qt4ProjectManager.QtVersion.Desktop | ||
96 | 38 | |||
97 | 39 | ./ubuntu-sdk-ide/bin/sdktool addKit \ | ||
98 | 40 | --id "UbuntuSDK-API-Desktop-Kit" \ | ||
99 | 41 | --name "Ubuntu SDK Desktop Kit" \ | ||
100 | 42 | --debuggerengine 1 \ | ||
101 | 43 | --debugger /usr/bin/gdb \ | ||
102 | 44 | --devicetype Desktop \ | ||
103 | 45 | --toolchain "${GCC_UID}" \ | ||
104 | 46 | --qt "${QT_UID}" | ||
105 | 47 | 0 | ||
106 | === modified file 'debian/control' | |||
107 | --- debian/control 2015-11-11 12:06:36 +0000 | |||
108 | +++ debian/control 2015-12-16 09:18:38 +0000 | |||
109 | @@ -124,15 +124,3 @@ | |||
110 | 124 | deeper integration for developing applications for Ubuntu using the | 124 | deeper integration for developing applications for Ubuntu using the |
111 | 125 | Ubuntu UI Toolkit. It also introduces an Ubuntu themed welcome | 125 | Ubuntu UI Toolkit. It also introduces an Ubuntu themed welcome |
112 | 126 | screen. | 126 | screen. |
113 | 127 | |||
114 | 128 | Package: ubuntu-sdk-dev | ||
115 | 129 | Architecture: any | ||
116 | 130 | Multi-Arch: same | ||
117 | 131 | Depends: ${misc:Depends}, ${shlibs:Depends} | ||
118 | 132 | Description: Qt and Ubuntu APIs for application development | ||
119 | 133 | Qt is a cross-platform C++ application framework. Qt's primary feature | ||
120 | 134 | is its rich set of widgets that provide standard GUI functionality. | ||
121 | 135 | Qt Components for Ubuntu offers a set of reusable user interface | ||
122 | 136 | components for Qt Quick 2 / QML. | ||
123 | 137 | . | ||
124 | 138 | This package contains the Qt APIs and the Ubuntu Components QML plugin. | ||
125 | 139 | 127 | ||
126 | === modified file 'debian/rules' | |||
127 | --- debian/rules 2015-12-03 09:24:46 +0000 | |||
128 | +++ debian/rules 2015-12-16 09:18:38 +0000 | |||
129 | @@ -21,12 +21,10 @@ | |||
130 | 21 | 21 | ||
131 | 22 | override_dh_auto_install: | 22 | override_dh_auto_install: |
132 | 23 | mkdir -p $(CURDIR)/debian/tmp/usr/ | 23 | mkdir -p $(CURDIR)/debian/tmp/usr/ |
133 | 24 | mkdir -p $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev | ||
134 | 25 | mkdir -p $(CURDIR)/debian/tmp/usr/bin | 24 | mkdir -p $(CURDIR)/debian/tmp/usr/bin |
135 | 26 | ln -s /usr/bin/ubuntu-sdk-ide debian/tmp/usr/bin/ubuntu-sdk | 25 | ln -s /usr/bin/ubuntu-sdk-ide debian/tmp/usr/bin/ubuntu-sdk |
136 | 27 | cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr | 26 | cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr |
137 | 28 | cp -a $(CURDIR)/*/qt-api-build/qt/usr $(CURDIR)/debian/tmp | ||
138 | 29 | dh_auto_install --destdir=../../debian/tmp/usr | 27 | dh_auto_install --destdir=../../debian/tmp/usr |
139 | 30 | 28 | ||
140 | 31 | override_dh_shlibdeps: | 29 | override_dh_shlibdeps: |
142 | 32 | dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib/qtcreator/plugins:/usr/ubuntu-sdk-ide/lib:/usr/ubuntu-sdk-dev/lib | 30 | dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib/qtcreator/plugins:/usr/ubuntu-sdk-ide/lib |
143 | 33 | 31 | ||
144 | === removed file 'debian/ubuntu-sdk-dev.install' | |||
145 | --- debian/ubuntu-sdk-dev.install 2015-11-03 11:55:18 +0000 | |||
146 | +++ debian/ubuntu-sdk-dev.install 1970-01-01 00:00:00 +0000 | |||
147 | @@ -1,2 +0,0 @@ | |||
148 | 1 | usr/ubuntu-sdk-dev | ||
149 | 2 | usr/ubuntu-sdk-ide/share/qtcreator/QtProject | ||
150 | 3 | 0 | ||
151 | === removed file 'desktop_kit_configure' | |||
152 | --- desktop_kit_configure 2015-10-20 18:00:57 +0000 | |||
153 | +++ desktop_kit_configure 1970-01-01 00:00:00 +0000 | |||
154 | @@ -1,57 +0,0 @@ | |||
155 | 1 | #! /bin/sh | ||
156 | 2 | ############################################################################# | ||
157 | 3 | ## | ||
158 | 4 | ## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). | ||
159 | 5 | ## Contact: http://www.qt-project.org/legal | ||
160 | 6 | ## | ||
161 | 7 | ## This file is part of the build tools of the Qt Toolkit. | ||
162 | 8 | ## | ||
163 | 9 | ## $QT_BEGIN_LICENSE:LGPL$ | ||
164 | 10 | ## Commercial License Usage | ||
165 | 11 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
166 | 12 | ## accordance with the commercial license agreement provided with the | ||
167 | 13 | ## Software or, alternatively, in accordance with the terms contained in | ||
168 | 14 | ## a written agreement between you and Digia. For licensing terms and | ||
169 | 15 | ## conditions see http://qt.digia.com/licensing. For further information | ||
170 | 16 | ## use the contact form at http://qt.digia.com/contact-us. | ||
171 | 17 | ## | ||
172 | 18 | ## GNU Lesser General Public License Usage | ||
173 | 19 | ## Alternatively, this file may be used under the terms of the GNU Lesser | ||
174 | 20 | ## General Public License version 2.1 as published by the Free Software | ||
175 | 21 | ## Foundation and appearing in the file LICENSE.LGPL included in the | ||
176 | 22 | ## packaging of this file. Please review the following information to | ||
177 | 23 | ## ensure the GNU Lesser General Public License version 2.1 requirements | ||
178 | 24 | ## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. | ||
179 | 25 | ## | ||
180 | 26 | ## In addition, as a special exception, Digia gives you certain additional | ||
181 | 27 | ## rights. These rights are described in the Digia Qt LGPL Exception | ||
182 | 28 | ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. | ||
183 | 29 | ## | ||
184 | 30 | ## GNU General Public License Usage | ||
185 | 31 | ## Alternatively, this file may be used under the terms of the GNU | ||
186 | 32 | ## General Public License version 3.0 as published by the Free Software | ||
187 | 33 | ## Foundation and appearing in the file LICENSE.GPL included in the | ||
188 | 34 | ## packaging of this file. Please review the following information to | ||
189 | 35 | ## ensure the GNU General Public License version 3.0 requirements will be | ||
190 | 36 | ## met: http://www.gnu.org/copyleft/gpl.html. | ||
191 | 37 | ## | ||
192 | 38 | ## | ||
193 | 39 | ## $QT_END_LICENSE$ | ||
194 | 40 | ## | ||
195 | 41 | ############################################################################# | ||
196 | 42 | |||
197 | 43 | srcpath=`dirname $0` | ||
198 | 44 | srcpath=`(cd "$srcpath"; /bin/pwd)` | ||
199 | 45 | configure=$srcpath/qtbase/configure | ||
200 | 46 | if [ ! -e "$configure" ]; then | ||
201 | 47 | echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 | ||
202 | 48 | exit 1 | ||
203 | 49 | fi | ||
204 | 50 | |||
205 | 51 | mkdir -p qtbase || exit | ||
206 | 52 | |||
207 | 53 | echo "+ cd qtbase" | ||
208 | 54 | cd qtbase || exit | ||
209 | 55 | |||
210 | 56 | echo "+ $configure -top-level $@" | ||
211 | 57 | exec "$configure" -top-level "$@" | ||
212 | 58 | 0 | ||
213 | === removed file 'desktop_kit_qt.pro' | |||
214 | --- desktop_kit_qt.pro 2015-10-20 18:00:57 +0000 | |||
215 | +++ desktop_kit_qt.pro 1970-01-01 00:00:00 +0000 | |||
216 | @@ -1,81 +0,0 @@ | |||
217 | 1 | # Create the super cache so modules will add themselves to it. | ||
218 | 2 | cache(, super) | ||
219 | 3 | |||
220 | 4 | CONFIG += build_pass # hack to disable the .qmake.super auto-add | ||
221 | 5 | load(qt_build_config) | ||
222 | 6 | CONFIG -= build_pass # unhack, as it confuses Qt Creator | ||
223 | 7 | |||
224 | 8 | TEMPLATE = subdirs | ||
225 | 9 | |||
226 | 10 | defineReplace(moduleName) { | ||
227 | 11 | return(module_$$replace(1, -, _)) | ||
228 | 12 | } | ||
229 | 13 | |||
230 | 14 | # Arguments: module name, [mandatory deps], [optional deps], [project file] | ||
231 | 15 | defineTest(addModule) { | ||
232 | 16 | contains(QT_SKIP_MODULES, $$1): return(false) | ||
233 | 17 | mod = $$moduleName($$1) | ||
234 | 18 | |||
235 | 19 | isEmpty(4) { | ||
236 | 20 | !exists($$1/$${1}.pro): return(false) | ||
237 | 21 | $${mod}.subdir = $$1 | ||
238 | 22 | export($${mod}.subdir) | ||
239 | 23 | } else { | ||
240 | 24 | !exists($$1/$${4}): return(false) | ||
241 | 25 | $${mod}.file = $$1/$$4 | ||
242 | 26 | $${mod}.makefile = Makefile | ||
243 | 27 | export($${mod}.file) | ||
244 | 28 | export($${mod}.makefile) | ||
245 | 29 | } | ||
246 | 30 | |||
247 | 31 | for(d, 2) { | ||
248 | 32 | dn = $$moduleName($$d) | ||
249 | 33 | !contains(SUBDIRS, $$dn): \ | ||
250 | 34 | return(false) | ||
251 | 35 | $${mod}.depends += $$dn | ||
252 | 36 | } | ||
253 | 37 | for(d, 3) { | ||
254 | 38 | dn = $$moduleName($$d) | ||
255 | 39 | contains(SUBDIRS, $$dn): \ | ||
256 | 40 | $${mod}.depends += $$dn | ||
257 | 41 | } | ||
258 | 42 | !isEmpty($${mod}.depends): \ | ||
259 | 43 | export($${mod}.depends) | ||
260 | 44 | |||
261 | 45 | $${mod}.target = module-$$1 | ||
262 | 46 | export($${mod}.target) | ||
263 | 47 | |||
264 | 48 | SUBDIRS += $$mod | ||
265 | 49 | export(SUBDIRS) | ||
266 | 50 | return(true) | ||
267 | 51 | } | ||
268 | 52 | |||
269 | 53 | # only qtbase is required to exist. The others may not - but it is the | ||
270 | 54 | # users responsibility to ensure that all needed dependencies exist, or | ||
271 | 55 | # it may not build. | ||
272 | 56 | |||
273 | 57 | ANDROID_EXTRAS = | ||
274 | 58 | android: ANDROID_EXTRAS = qtandroidextras | ||
275 | 59 | |||
276 | 60 | addModule(qtbase) | ||
277 | 61 | addModule(qtsvg, qtbase) | ||
278 | 62 | addModule(qtxmlpatterns, qtbase) | ||
279 | 63 | addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns) | ||
280 | 64 | addModule(qtquickcontrols, qtdeclarative) | ||
281 | 65 | addModule(qtmultimedia, qtbase, qtdeclarative) | ||
282 | 66 | addModule(qt3d, qtdeclarative) | ||
283 | 67 | addModule(qtsystems, qtbase, qtdeclarative) | ||
284 | 68 | addModule(qtlocation, qtbase, qtsystems qtmultimedia) | ||
285 | 69 | addModule(qtsensors, qtbase, qtdeclarative) | ||
286 | 70 | addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative) | ||
287 | 71 | addModule(qtfeedback, qtdeclarative, qtmultimedia) | ||
288 | 72 | addModule(qtpim, qtdeclarative) | ||
289 | 73 | addModule(qtwebsockets, qtbase, qtdeclarative) | ||
290 | 74 | addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) | ||
291 | 75 | addModule(qtimageformats, qtbase) | ||
292 | 76 | addModule(qtgraphicaleffects, qtdeclarative) | ||
293 | 77 | addModule(qtscript, qtbase, qttools) | ||
294 | 78 | addModule(qtdocgallery, qtdeclarative) | ||
295 | 79 | addModule(qtserialport, qtbase) | ||
296 | 80 | addModule(qtenginio, qtdeclarative) | ||
297 | 81 | addModule(ubuntu-sdk,qtdeclarative qtfeedback qtpim) | ||
298 | 82 | 0 | ||
299 | === removed file 'get_qt_sources.py' | |||
300 | --- get_qt_sources.py 2015-12-15 08:32:52 +0000 | |||
301 | +++ get_qt_sources.py 1970-01-01 00:00:00 +0000 | |||
302 | @@ -1,117 +0,0 @@ | |||
303 | 1 | #!/usr/bin/python | ||
304 | 2 | from optparse import OptionParser | ||
305 | 3 | import re | ||
306 | 4 | import urlparse | ||
307 | 5 | from launchpadlib.launchpad import Launchpad | ||
308 | 6 | from subprocess import call | ||
309 | 7 | import sys | ||
310 | 8 | import os | ||
311 | 9 | import glob | ||
312 | 10 | |||
313 | 11 | qt_sources = ["qtsystems-opensource-src", | ||
314 | 12 | "qtbase-opensource-src", | ||
315 | 13 | "qtdeclarative-opensource-src", | ||
316 | 14 | "qtmultimedia-opensource-src", | ||
317 | 15 | "qtpim-opensource-src", | ||
318 | 16 | "ubuntu-ui-toolkit", | ||
319 | 17 | "qt3d-opensource-src", | ||
320 | 18 | "qtfeedback-opensource-src", | ||
321 | 19 | "qtlocation-opensource-src", | ||
322 | 20 | "qtscript-opensource-src", | ||
323 | 21 | "qtsensors-opensource-src", | ||
324 | 22 | "qtsvg-opensource-src", | ||
325 | 23 | "qttools-opensource-src", | ||
326 | 24 | "qtwebsockets-opensource-src", | ||
327 | 25 | "qtxmlpatterns-opensource-src", | ||
328 | 26 | "qtquickcontrols-opensource-src", | ||
329 | 27 | "qtconnectivity-opensource-src", | ||
330 | 28 | "qtimageformats-opensource-src", | ||
331 | 29 | "qtgraphicaleffects-opensource-src", | ||
332 | 30 | "qtserialport-opensource-src", | ||
333 | 31 | "qtenginio-opensource-src" | ||
334 | 32 | ] | ||
335 | 33 | |||
336 | 34 | hack_set = set(['qt3d', 'qtpim', 'qtfeedback', 'qtsystems', 'ubuntu-sdk']) | ||
337 | 35 | |||
338 | 36 | |||
339 | 37 | def create_webroot_url_from_self_link(self_link): | ||
340 | 38 | scheme, netloc, _, _, _ = urlparse.urlsplit(self_link) | ||
341 | 39 | netloc = netloc.lstrip("api.") | ||
342 | 40 | return u"%s://%s/" % (scheme, netloc) | ||
343 | 41 | |||
344 | 42 | |||
345 | 43 | def get_dsc(archive, package, series): | ||
346 | 44 | re_version = re.compile(r"^\d+\:") | ||
347 | 45 | x = archive.getPublishedSources(exact_match=True, source_name=package, | ||
348 | 46 | distro_series=series) | ||
349 | 47 | webroot = create_webroot_url_from_self_link(archive.self_link) | ||
350 | 48 | version = x[0].source_package_version | ||
351 | 49 | version = re_version.sub("", version, 1) | ||
352 | 50 | if archive.owner.name == "ubuntu-archive": | ||
353 | 51 | yield "%subuntu/+archive/primary/+files/%s_%s.dsc" \ | ||
354 | 52 | % (webroot, x[0].source_package_name, version) | ||
355 | 53 | else: | ||
356 | 54 | yield "%s/~ci-train-ppa-service/+archive/ubuntu/stable-phone-overlay/+files/%s_%s.dsc" \ | ||
357 | 55 | % (webroot, x[0].source_package_name, version) | ||
358 | 56 | |||
359 | 57 | |||
360 | 58 | def main(): | ||
361 | 59 | parser = OptionParser(usage="usage: %prog [options] source ...") | ||
362 | 60 | parser.add_option( | ||
363 | 61 | "-l", "--launchpad", dest="launchpad_instance", default="production") | ||
364 | 62 | options, args = parser.parse_args() | ||
365 | 63 | launchpad = Launchpad.login_anonymously('just testing', options.launchpad_instance) | ||
366 | 64 | ubuntu = launchpad.distributions["ubuntu"] | ||
367 | 65 | distro_archive = ubuntu.main_archive | ||
368 | 66 | overlay_archive = launchpad.people["ci-train-ppa-service"].\ | ||
369 | 67 | getPPAByName(name="stable-phone-overlay") | ||
370 | 68 | series = ubuntu.getSeries(name_or_version="xenial") | ||
371 | 69 | |||
372 | 70 | for qt_source_package in qt_sources: | ||
373 | 71 | re_version = re.compile(r"^\d+\:") | ||
374 | 72 | |||
375 | 73 | #first try the overlay archive | ||
376 | 74 | archive = overlay_archive | ||
377 | 75 | x = overlay_archive.getPublishedSources(exact_match=True, | ||
378 | 76 | source_name=qt_source_package, | ||
379 | 77 | distro_series=series) | ||
380 | 78 | if len(x) == 0: | ||
381 | 79 | archive = distro_archive | ||
382 | 80 | x = distro_archive.getPublishedSources(exact_match=True, | ||
383 | 81 | source_name=qt_source_package, | ||
384 | 82 | distro_series=series) | ||
385 | 83 | if len(x) == 0: | ||
386 | 84 | print("Could not find "+qt_source_package) | ||
387 | 85 | sys.exit(1) | ||
388 | 86 | else: | ||
389 | 87 | print(qt_source_package+" found in Archive") | ||
390 | 88 | else: | ||
391 | 89 | print(qt_source_package+" found in overlay ppa") | ||
392 | 90 | |||
393 | 91 | x = x[0].source_package_version | ||
394 | 92 | |||
395 | 93 | generator = get_dsc(archive, qt_source_package, series) | ||
396 | 94 | for i in generator: | ||
397 | 95 | if qt_source_package != 'ubuntu-ui-toolkit': | ||
398 | 96 | qt_module_name = re.sub(r'-opensource-src', | ||
399 | 97 | r'', | ||
400 | 98 | qt_source_package.rstrip()) | ||
401 | 99 | else: | ||
402 | 100 | qt_module_name = re.sub(r'ubuntu-ui-toolkit', | ||
403 | 101 | r'ubuntu-sdk', | ||
404 | 102 | qt_source_package.rstrip()) | ||
405 | 103 | call(["dget", i, "--quiet", "--download-only"]) | ||
406 | 104 | for dsc_file in glob.glob('%s*dsc' % qt_source_package): | ||
407 | 105 | call(["dpkg-source", "-x", dsc_file]) | ||
408 | 106 | for junk_files in glob.glob("*.?z"): | ||
409 | 107 | os.remove(junk_files) | ||
410 | 108 | for junk_files in glob.glob("*.dsc"): | ||
411 | 109 | os.remove(junk_files) | ||
412 | 110 | for fetched_module_directory in glob.glob('%s*' % qt_source_package): | ||
413 | 111 | os.rename(fetched_module_directory, qt_module_name) | ||
414 | 112 | if qt_module_name in hack_set: | ||
415 | 113 | git_dir = qt_module_name + "/.git" | ||
416 | 114 | if not os.path.exists(git_dir): | ||
417 | 115 | os.makedirs(git_dir) | ||
418 | 116 | |||
419 | 117 | main() | ||
420 | 118 | 0 | ||
421 | === removed file 'getdsc.py' | |||
422 | --- getdsc.py 2015-12-15 08:32:52 +0000 | |||
423 | +++ getdsc.py 1970-01-01 00:00:00 +0000 | |||
424 | @@ -1,57 +0,0 @@ | |||
425 | 1 | #!/usr/bin/python | ||
426 | 2 | |||
427 | 3 | from optparse import OptionParser | ||
428 | 4 | import re | ||
429 | 5 | import urlparse | ||
430 | 6 | from launchpadlib.launchpad import Launchpad | ||
431 | 7 | |||
432 | 8 | def create_webroot_url_from_self_link(self_link): | ||
433 | 9 | scheme, netloc, _, _, _ = urlparse.urlsplit(self_link) | ||
434 | 10 | netloc = netloc.lstrip("api.") | ||
435 | 11 | return u"%s://%s/" %(scheme, netloc) | ||
436 | 12 | |||
437 | 13 | def get_dsc(archive, package, series): | ||
438 | 14 | re_version = re.compile(r"^\d+\:") | ||
439 | 15 | # x = archive.getPublishedSources() | ||
440 | 16 | x = archive.getPublishedSources(exact_match=True, source_name=package, | ||
441 | 17 | distro_series=series) | ||
442 | 18 | webroot = create_webroot_url_from_self_link(archive.self_link) | ||
443 | 19 | # for i in x: | ||
444 | 20 | version = x[0].source_package_version | ||
445 | 21 | version = re_version.sub("", version, 1) | ||
446 | 22 | #yield "%s~%s/+archive/primary/+files/%s_%s.dsc" \ | ||
447 | 23 | yield "%subuntu/+archive/primary/+files/%s_%s.dsc" \ | ||
448 | 24 | %(webroot, x[0].source_package_name, version) | ||
449 | 25 | #%(webroot, archive.owner.name, x[0].source_package_name, version) | ||
450 | 26 | |||
451 | 27 | def main(): | ||
452 | 28 | parser = OptionParser(usage="usage: %prog [options] source ...") | ||
453 | 29 | parser.add_option( | ||
454 | 30 | "-l", "--launchpad", dest="launchpad_instance", default="production") | ||
455 | 31 | options, args = parser.parse_args() | ||
456 | 32 | if not args: | ||
457 | 33 | parser.error("You must specify at least one soure.") | ||
458 | 34 | |||
459 | 35 | options.launchpad = Launchpad.login_with( | ||
460 | 36 | "branch-seeds", options.launchpad_instance) | ||
461 | 37 | |||
462 | 38 | launchpad = Launchpad.login_anonymously('just testing', 'production') | ||
463 | 39 | ubuntu = launchpad.distributions["ubuntu"] | ||
464 | 40 | archive = ubuntu.main_archive | ||
465 | 41 | series = ubuntu.getSeries(name_or_version="xenial") | ||
466 | 42 | |||
467 | 43 | #distro = options.launchpad.distributions["ubuntu"] | ||
468 | 44 | |||
469 | 45 | for package in args: | ||
470 | 46 | #print(package) | ||
471 | 47 | #print(series) | ||
472 | 48 | #print(archive) | ||
473 | 49 | |||
474 | 50 | re_version = re.compile(r"^\d+\:") | ||
475 | 51 | x = archive.getPublishedSources(exact_match=True, source_name=package, distro_series=series)[0].source_package_version | ||
476 | 52 | |||
477 | 53 | generator = get_dsc(archive, package, series) | ||
478 | 54 | for i in generator: | ||
479 | 55 | print(i) | ||
480 | 56 | |||
481 | 57 | main() | ||
482 | 58 | 0 | ||
483 | === removed file 'kit_config' | |||
484 | --- kit_config 2015-10-20 08:49:47 +0000 | |||
485 | +++ kit_config 1970-01-01 00:00:00 +0000 | |||
486 | @@ -1,32 +0,0 @@ | |||
487 | 1 | -v | ||
488 | 2 | -confirm-license | ||
489 | 3 | -sysconfdir /etc/xdg | ||
490 | 4 | -opensource | ||
491 | 5 | -plugin-sql-mysql | ||
492 | 6 | -plugin-sql-odbc | ||
493 | 7 | -plugin-sql-psql | ||
494 | 8 | -plugin-sql-sqlite | ||
495 | 9 | -no-sql-sqlite2 | ||
496 | 10 | -plugin-sql-tds | ||
497 | 11 | -system-sqlite | ||
498 | 12 | -system-zlib | ||
499 | 13 | -system-libjpeg | ||
500 | 14 | -system-libpng | ||
501 | 15 | -openssl | ||
502 | 16 | -no-rpath | ||
503 | 17 | -glib | ||
504 | 18 | -verbose | ||
505 | 19 | -optimized-qmake | ||
506 | 20 | -no-strip | ||
507 | 21 | -no-separate-debug-info | ||
508 | 22 | -qpa xcb | ||
509 | 23 | -xcb | ||
510 | 24 | -icu | ||
511 | 25 | -accessibility | ||
512 | 26 | -no-directfb | ||
513 | 27 | -nomake examples | ||
514 | 28 | -nomake tests | ||
515 | 29 | -skip qtenginio | ||
516 | 30 | -skip qtlocation | ||
517 | 31 | -dbus-linked | ||
518 | 32 | -system-libjpeg | ||
519 | 33 | 0 | ||
520 | === removed file 'ubuntu-sdk-shell.in' | |||
521 | --- ubuntu-sdk-shell.in 2015-11-25 12:09:05 +0000 | |||
522 | +++ ubuntu-sdk-shell.in 1970-01-01 00:00:00 +0000 | |||
523 | @@ -1,42 +0,0 @@ | |||
524 | 1 | #!/bin/bash -i | ||
525 | 2 | # | ||
526 | 3 | # Copyright (C) 2015 Canonical Ltd. | ||
527 | 4 | # | ||
528 | 5 | # This program is free software; you can redistribute it and/or modify | ||
529 | 6 | # it under the terms of the GNU Lesser General Public License as published by | ||
530 | 7 | # the Free Software Foundation; version 3. | ||
531 | 8 | # | ||
532 | 9 | # This program is distributed in the hope that it will be useful, | ||
533 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
534 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
535 | 12 | # GNU Lesser General Public License for more details. | ||
536 | 13 | # | ||
537 | 14 | # You should have received a copy of the GNU Lesser General Public License | ||
538 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
539 | 16 | |||
540 | 17 | # This script spawns a new Bash shell with all the environment variables needed | ||
541 | 18 | # to run apps based on a specific Ubuntu SDK installation, as well as use the | ||
542 | 19 | # dev tools from it. | ||
543 | 20 | |||
544 | 21 | NAME='ubuntu-sdk-dev' | ||
545 | 22 | INSTALL_PREFIX='@QT_KIT_INSTALL_PREFIX@' | ||
546 | 23 | |||
547 | 24 | export PATH=${INSTALL_PREFIX}/bin${PATH:+:$PATH} | ||
548 | 25 | export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} | ||
549 | 26 | export QML2_IMPORT_PATH=${INSTALL_PREFIX}/qml${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH} | ||
550 | 27 | export UBUNTU_UI_TOOLKIT_THEMES_PATH=${INSTALL_PREFIX}/qml${UBUNTU_UI_TOOLKIT_THEMES_PATH:+:$UBUNTU_UI_TOOLKIT_THEMES_PATH} | ||
551 | 28 | export PYTHONPATH=${INSTALL_PREFIX}/lib/python3/dist-packages${PYTHONPATH:+:$PYTHONPATH} | ||
552 | 29 | |||
553 | 30 | TEMP_FILE=`mktemp -t bashrc.XXXXXXXX` | ||
554 | 31 | echo source $HOME/.bashrc >> $TEMP_FILE | ||
555 | 32 | echo PS1=\'[$NAME] $PS1\' >> $TEMP_FILE | ||
556 | 33 | SHELL_OPTIONS="--init-file $TEMP_FILE" | ||
557 | 34 | |||
558 | 35 | echo Entering $NAME shell. | ||
559 | 36 | bash $SHELL_OPTIONS | ||
560 | 37 | echo Leaving $NAME shell. Have a nice day! | ||
561 | 38 | |||
562 | 39 | if test ! -z "$TEMP_FILE" | ||
563 | 40 | then | ||
564 | 41 | rm $TEMP_FILE | ||
565 | 42 | fi |