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