Merge lp:~bzoltan/ubuntu-sdk-ide/merge-click into lp:ubuntu-sdk-ide
- merge-click
- Merge into trunk
Proposed by
Zoltan Balogh
Status: | Merged |
---|---|
Approved by: | Benjamin Zeller |
Approved revision: | 156 |
Merged at revision: | 158 |
Proposed branch: | lp:~bzoltan/ubuntu-sdk-ide/merge-click |
Merge into: | lp:ubuntu-sdk-ide |
Diff against target: |
541 lines (+490/-0) 9 files modified
click/apparmor.json (+5/-0) click/manifest.json (+15/-0) click/sdk.desktop (+17/-0) click/ubuntu-sdk-ide-click (+23/-0) create-ubuntu-sdk-ide-click.README (+28/-0) create-ubuntu-sdk-ide-click.py (+290/-0) create_kit.sh (+76/-0) setup/gui/ubuntu-sdk-ide.desktop (+13/-0) snapcraft.yaml (+23/-0) |
To merge this branch: | bzr merge lp:~bzoltan/ubuntu-sdk-ide/merge-click |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Benjamin Zeller | Approve | ||
Review via email: mp+305085@code.launchpad.net |
Commit message
Manual merge from the lp:ubuntu-sdk-ide-click with kalikiana's fix
Description of the change
Manual merge from the lp:ubuntu-sdk-ide-click with kalikiana's fix
To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
review:
Approve
(continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:156
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'click' | |||
2 | === added file 'click/apparmor.json' | |||
3 | --- click/apparmor.json 1970-01-01 00:00:00 +0000 | |||
4 | +++ click/apparmor.json 2016-09-07 08:57:20 +0000 | |||
5 | @@ -0,0 +1,5 @@ | |||
6 | 1 | { | ||
7 | 2 | "policy_version": 1.3, | ||
8 | 3 | "template": "unconfined", | ||
9 | 4 | "policy_groups": [] | ||
10 | 5 | } | ||
11 | 0 | 6 | ||
12 | === added file 'click/manifest.json' | |||
13 | --- click/manifest.json 1970-01-01 00:00:00 +0000 | |||
14 | +++ click/manifest.json 2016-09-07 08:57:20 +0000 | |||
15 | @@ -0,0 +1,15 @@ | |||
16 | 1 | { | ||
17 | 2 | "architecture": "armhf", | ||
18 | 3 | "description": "Ubuntu SDK IDE and DevKit", | ||
19 | 4 | "framework": "ubuntu-sdk-15.04", | ||
20 | 5 | "hooks": { | ||
21 | 6 | "sdk": { | ||
22 | 7 | "apparmor": "apparmor.json", | ||
23 | 8 | "desktop": "sdk.desktop" | ||
24 | 9 | } | ||
25 | 10 | }, | ||
26 | 11 | "maintainer": "Zoltán Balogh <zoltan.balogh@ubuntu.com>", | ||
27 | 12 | "name": "com.ubuntu.sdk", | ||
28 | 13 | "title": "Ubuntu SDK IDE and DevKit", | ||
29 | 14 | "version": "27" | ||
30 | 15 | } | ||
31 | 0 | 16 | ||
32 | === added file 'click/sdk.desktop' | |||
33 | --- click/sdk.desktop 1970-01-01 00:00:00 +0000 | |||
34 | +++ click/sdk.desktop 2016-09-07 08:57:20 +0000 | |||
35 | @@ -0,0 +1,17 @@ | |||
36 | 1 | [Desktop Entry] | ||
37 | 2 | Name=Ubuntu SDK IDE and DevKit | ||
38 | 3 | Exec=ubuntu-sdk-ide-click %F | ||
39 | 4 | Terminal=false | ||
40 | 5 | Type=Application | ||
41 | 6 | X-Ubuntu-Touch=true | ||
42 | 7 | X-Ubuntu-Gettext-Domain=com.ubuntu.sdk | ||
43 | 8 | X-Ubuntu-XMir-Enable=true | ||
44 | 9 | # Added Icon and Path as a workaround for http://pad.lv/1227359. | ||
45 | 10 | # TODO remove them once that bug is fixed. --elopio - 2013-09-18 | ||
46 | 11 | Icon=ubuntu-sdk-ide.png | ||
47 | 12 | GenericName=Integrated Development Environment | ||
48 | 13 | MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;application/x-qmlproject; | ||
49 | 14 | Categories=Qt;Development;IDE; | ||
50 | 15 | InitialPreference=9 | ||
51 | 16 | Keywords=IDE;Ubuntu SDK IDE;buntu SDK;SDK;Ubuntu Touch;Qt Creator;Qt | ||
52 | 17 | |||
53 | 0 | 18 | ||
54 | === added file 'click/ubuntu-sdk-ide-click' | |||
55 | --- click/ubuntu-sdk-ide-click 1970-01-01 00:00:00 +0000 | |||
56 | +++ click/ubuntu-sdk-ide-click 2016-09-07 08:57:20 +0000 | |||
57 | @@ -0,0 +1,23 @@ | |||
58 | 1 | #!/bin/sh | ||
59 | 2 | |||
60 | 3 | export PERL5LIB=//opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/share/perl5/:/opt/click.ubuntu.com/com.ubuntu.sdk/23/usr/lib/arm-linux-gnueabihf/perl/5.20.2/ | ||
61 | 4 | export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/lib | ||
62 | 5 | export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/lib/arm-linux-gnueabihf | ||
63 | 6 | /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/bin/matchbox-window-manager -theme ../../..//opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/share/themes/Default/ -use_titlebar no & | ||
64 | 7 | |||
65 | 8 | #XKB config | ||
66 | 9 | #export XKB_CONFIG_ROOT=/usr/share/X11/xkb | ||
67 | 10 | |||
68 | 11 | # Qt Platform to Mir | ||
69 | 12 | export QT_QPA_PLATFORM=xcb | ||
70 | 13 | #export QTCHOOSER_NO_GLOBAL_DIR=1 | ||
71 | 14 | |||
72 | 15 | |||
73 | 16 | export LD_LIBRARY_PATH=/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/lib/arm-linux-gnueabihf:/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-ide/lib/qtcreator/:/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-ide/qtcreator/lib:/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/lib:$LD_LIBRARY_PATH | ||
74 | 17 | |||
75 | 18 | # Qt Modules | ||
76 | 19 | export QT_PLUGIN_PATH=/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-ide/bin/plugins/ | ||
77 | 20 | #export QML2_IMPORT_PATH=/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-dev/qml | ||
78 | 21 | |||
79 | 22 | exec /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-ide/bin/qtcreator | ||
80 | 23 | |||
81 | 0 | 24 | ||
82 | === added file 'click/ubuntu-sdk-ide.png' | |||
83 | 1 | Binary files click/ubuntu-sdk-ide.png 1970-01-01 00:00:00 +0000 and click/ubuntu-sdk-ide.png 2016-09-07 08:57:20 +0000 differ | 25 | Binary files click/ubuntu-sdk-ide.png 1970-01-01 00:00:00 +0000 and click/ubuntu-sdk-ide.png 2016-09-07 08:57:20 +0000 differ |
84 | === added file 'create-ubuntu-sdk-ide-click.README' | |||
85 | --- create-ubuntu-sdk-ide-click.README 1970-01-01 00:00:00 +0000 | |||
86 | +++ create-ubuntu-sdk-ide-click.README 2016-09-07 08:57:20 +0000 | |||
87 | @@ -0,0 +1,28 @@ | |||
88 | 1 | Modify /usr/bin/libertine-xmir with an export TMPDIR=/tmp" before the exec line. | ||
89 | 2 | |||
90 | 3 | Change the GU in the /etc/ubuntu-touch-session.d/[DEVICE].conf to a smaller value. | ||
91 | 4 | |||
92 | 5 | Testing from terminal the Xmir session can be started like this: | ||
93 | 6 | $ Xmir :1 -mirSocket $XDG_RUNTIME_DIR/mir_socket --desktop_file_hint=dialer-app | ||
94 | 7 | |||
95 | 8 | the display need to be directed to the Xmir | ||
96 | 9 | $ export DISPLAY=:1 | ||
97 | 10 | |||
98 | 11 | Set the Qt Platform | ||
99 | 12 | $ export QT_QPA_PLATFORM=xcb | ||
100 | 13 | |||
101 | 14 | Hack around the library path | ||
102 | 15 | |||
103 | 16 | # Qt Libs | ||
104 | 17 | $ export LD_LIBRARY_PATH=/usr/lib/arm-linux-gnueabihf/:/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-ide/qtcreator/lib:/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/lib:$LD_LIBRARY_PATH | ||
105 | 18 | $ export LD_LIBRARY_PATH=/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-dev/lib:$LD_LIBRARY_PATH | ||
106 | 19 | |||
107 | 20 | |||
108 | 21 | |||
109 | 22 | Set Qt Modules | ||
110 | 23 | $ export QT_PLUGIN_PATH=/opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-ide/bin/plugins/ | ||
111 | 24 | |||
112 | 25 | |||
113 | 26 | Execute /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/ubuntu-sdk-ide/bin/qtcreator | ||
114 | 27 | |||
115 | 28 | |||
116 | 0 | 29 | ||
117 | === added file 'create-ubuntu-sdk-ide-click.py' | |||
118 | --- create-ubuntu-sdk-ide-click.py 1970-01-01 00:00:00 +0000 | |||
119 | +++ create-ubuntu-sdk-ide-click.py 2016-09-07 08:57:20 +0000 | |||
120 | @@ -0,0 +1,290 @@ | |||
121 | 1 | #!/usr/bin/python | ||
122 | 2 | from optparse import OptionParser | ||
123 | 3 | import re | ||
124 | 4 | import urlparse | ||
125 | 5 | from launchpadlib.launchpad import Launchpad | ||
126 | 6 | from subprocess import call | ||
127 | 7 | import subprocess | ||
128 | 8 | import sys | ||
129 | 9 | import os | ||
130 | 10 | import glob | ||
131 | 11 | import shutil | ||
132 | 12 | import requests | ||
133 | 13 | |||
134 | 14 | ide_packages = [ | ||
135 | 15 | "ubuntu-sdk-ide", | ||
136 | 16 | "ubuntu-sdk-dev", | ||
137 | 17 | "ubuntu-clicksdk-qmake", | ||
138 | 18 | "apparmor", | ||
139 | 19 | "apparmor-easyprof", | ||
140 | 20 | "apparmor-easyprof-ubuntu", | ||
141 | 21 | "at", | ||
142 | 22 | "autoconf", | ||
143 | 23 | "automake", | ||
144 | 24 | "autotools-dev", | ||
145 | 25 | "base-files", | ||
146 | 26 | "binutils", | ||
147 | 27 | "bsdmainutils", | ||
148 | 28 | "build-essential", | ||
149 | 29 | "busybox-initramfs", | ||
150 | 30 | "bzip2", | ||
151 | 31 | "ca-certificates", | ||
152 | 32 | "click", | ||
153 | 33 | "click-apparmor", | ||
154 | 34 | "click-dev", | ||
155 | 35 | "click-reviewers-tools", | ||
156 | 36 | "cmake", | ||
157 | 37 | "cmake-data", | ||
158 | 38 | "cmake-extras", | ||
159 | 39 | "cpio", | ||
160 | 40 | "cpp", | ||
161 | 41 | "cpp-4.9", | ||
162 | 42 | "cron", | ||
163 | 43 | "dbus", | ||
164 | 44 | "dctrl-tools", | ||
165 | 45 | "debhelper", | ||
166 | 46 | "debootstrap", | ||
167 | 47 | "devscripts", | ||
168 | 48 | "dh-apparmor", | ||
169 | 49 | "dh-make", | ||
170 | 50 | "dh-python", | ||
171 | 51 | "diffstat", | ||
172 | 52 | "distro-info-data", | ||
173 | 53 | "dpkg-dev", | ||
174 | 54 | "libdpkg-perl", | ||
175 | 55 | "dput", | ||
176 | 56 | "fakeroot", | ||
177 | 57 | "file", | ||
178 | 58 | "g++", | ||
179 | 59 | "g++-4.9", | ||
180 | 60 | "gcc", | ||
181 | 61 | "gcc-4.9", | ||
182 | 62 | "gdb", | ||
183 | 63 | "gdb-multiarch", | ||
184 | 64 | "gdbserver", | ||
185 | 65 | "gettext", | ||
186 | 66 | "gettext-base", | ||
187 | 67 | "gir1.2-click-0.4", | ||
188 | 68 | "gir1.2-gee-0.8", | ||
189 | 69 | "gir1.2-glib-2.0", | ||
190 | 70 | "gir1.2-json-1.0", | ||
191 | 71 | "groff-base", | ||
192 | 72 | "hardening-includes", | ||
193 | 73 | "ifupdown", | ||
194 | 74 | "init-system-helpers", | ||
195 | 75 | "initramfs-tools", | ||
196 | 76 | "initramfs-tools-bin", | ||
197 | 77 | "intltool", | ||
198 | 78 | "intltool-debian", | ||
199 | 79 | "iproute2", | ||
200 | 80 | "isc-dhcp-client", | ||
201 | 81 | "isc-dhcp-common", | ||
202 | 82 | "iso-codes", | ||
203 | 83 | "klibc-utils", | ||
204 | 84 | "kmod", | ||
205 | 85 | "krb5-locales", | ||
206 | 86 | "libalgorithm-c3-perl", | ||
207 | 87 | "libalgorithm-diff-perl", | ||
208 | 88 | "libalgorithm-diff-xs-perl", | ||
209 | 89 | "libalgorithm-merge-perl", | ||
210 | 90 | "libapparmor-perl", | ||
211 | 91 | "libapt-pkg-perl", | ||
212 | 92 | "libarchive-extract-perl", | ||
213 | 93 | "libarchive-zip-perl", | ||
214 | 94 | "libarchive13", | ||
215 | 95 | "libasan1", | ||
216 | 96 | "libasn1-8-heimdal", | ||
217 | 97 | "libasprintf-dev", | ||
218 | 98 | "libasprintf0c2", | ||
219 | 99 | "libatm1", | ||
220 | 100 | "libatomic1", | ||
221 | 101 | "libauthen-sasl-perl", | ||
222 | 102 | "libbabeltrace-ctf1", | ||
223 | 103 | "libbabeltrace1", | ||
224 | 104 | "libboost-filesystem1.55.0", | ||
225 | 105 | "libboost-iostreams1.55.0", | ||
226 | 106 | "libboost-program-options1.55.0", | ||
227 | 107 | "libboost-system1.55.0", | ||
228 | 108 | "libbotan-1.10-0", | ||
229 | 109 | "libc-dev-bin", | ||
230 | 110 | "libc6-dbg", | ||
231 | 111 | "libc6-dev", | ||
232 | 112 | "libcap-ng0", | ||
233 | 113 | "libcgi-fast-perl", | ||
234 | 114 | "libcgi-pm-perl", | ||
235 | 115 | "libclass-accessor-perl", | ||
236 | 116 | "libclass-c3-perl", | ||
237 | 117 | "libclass-c3-xs-perl", | ||
238 | 118 | "libclick-0.4-0", | ||
239 | 119 | "libclone-perl", | ||
240 | 120 | "libcloog-isl4", | ||
241 | 121 | "libcommon-sense-perl", | ||
242 | 122 | "libcpan-meta-perl", | ||
243 | 123 | "libcroco3", | ||
244 | 124 | "libcurl3", | ||
245 | 125 | "libcurl3-gnutls", | ||
246 | 126 | "libdata-optlist-perl", | ||
247 | 127 | "libdata-section-perl", | ||
248 | 128 | "libdbus-1-3", | ||
249 | 129 | "libdbus-glib-1-2", | ||
250 | 130 | "libdigest-hmac-perl", | ||
251 | 131 | "libdistro-info-perl", | ||
252 | 132 | "libdns-export100", | ||
253 | 133 | "libdpkg-perl", | ||
254 | 134 | "libemail-valid-perl", | ||
255 | 135 | "libencode-locale-perl", | ||
256 | 136 | "liberror-perl", | ||
257 | 137 | "libmpfr4", | ||
258 | 138 | "libmpc3", | ||
259 | 139 | "perl", | ||
260 | 140 | "libisl13", | ||
261 | 141 | "make", | ||
262 | 142 | "matchbox-common", | ||
263 | 143 | "matchbox-window-manager", | ||
264 | 144 | "matchbox-desktop", | ||
265 | 145 | "matchbox-panel", | ||
266 | 146 | "matchbox-panel-manager", | ||
267 | 147 | "matchbox-keyboard", | ||
268 | 148 | "libfakekey0", | ||
269 | 149 | "libmatchbox1", | ||
270 | 150 | "libxsettings-client0", | ||
271 | 151 | "ttf-dejavu", | ||
272 | 152 | "matchbox-keyboard-im", | ||
273 | 153 | "libpango1.0-0", | ||
274 | 154 | "libpangox-1.0-0", | ||
275 | 155 | "libpangoxft-1.0-0", | ||
276 | 156 | "libstartup-notification0", | ||
277 | 157 | "libxft2", | ||
278 | 158 | "libpthread-stubs0-dev", | ||
279 | 159 | "libxau-dev", | ||
280 | 160 | "libxcb-xinerama0", | ||
281 | 161 | "libxcb1-dev", | ||
282 | 162 | "libxdmcp-dev", | ||
283 | 163 | "x11proto-core-dev", | ||
284 | 164 | "xorg-sgml-doctools", | ||
285 | 165 | "zlib1g", | ||
286 | 166 | "gcc-4.9-base", | ||
287 | 167 | "libstdc++-4.9-dev" | ||
288 | 168 | |||
289 | 169 | ] | ||
290 | 170 | |||
291 | 171 | |||
292 | 172 | def create_webroot_url_from_self_link(self_link): | ||
293 | 173 | scheme, netloc, _, _, _ = urlparse.urlsplit(self_link) | ||
294 | 174 | netloc = netloc.lstrip("api.") | ||
295 | 175 | return u"%s://%s/" % (scheme, netloc) | ||
296 | 176 | |||
297 | 177 | |||
298 | 178 | def get_deb(archive, package, series, arch): | ||
299 | 179 | re_version = re.compile(r"^\d+\:") | ||
300 | 180 | arch_series = series.getDistroArchSeries(archtag=arch) | ||
301 | 181 | x = archive.getPublishedBinaries(binary_name=package, | ||
302 | 182 | distro_arch_series=arch_series, | ||
303 | 183 | status="Published", pocket='Release', | ||
304 | 184 | exact_match=True) | ||
305 | 185 | |||
306 | 186 | webroot = create_webroot_url_from_self_link(archive.self_link) | ||
307 | 187 | version = x[0].binary_package_version | ||
308 | 188 | version = re_version.sub("", version, 1) | ||
309 | 189 | if archive.owner.name == "ubuntu-archive": | ||
310 | 190 | yield "%subuntu/+archive/primary/+files/%s_%s_%s.deb" \ | ||
311 | 191 | % (webroot, x[0].binary_package_name, version, arch) | ||
312 | 192 | else: | ||
313 | 193 | yield "%s/~ubuntu-sdk-team/+archive/ubuntu/ppa/+files/%s_%s_%s.deb" \ | ||
314 | 194 | % (webroot, x[0].binary_package_name, version, arch) | ||
315 | 195 | |||
316 | 196 | |||
317 | 197 | def main(): | ||
318 | 198 | parser = OptionParser(usage="usage: %prog [options] source ...") | ||
319 | 199 | parser.add_option( | ||
320 | 200 | "-l", "--launchpad", dest="launchpad_instance", default="production") | ||
321 | 201 | parser.add_option( | ||
322 | 202 | "-a", "--arch", dest="arch", default="armhf", choices=['armhf', 'i386', 'amd64',], help="architecture of the package") | ||
323 | 203 | |||
324 | 204 | options, args = parser.parse_args() | ||
325 | 205 | arch = options.arch | ||
326 | 206 | launchpad = Launchpad.login_anonymously('just testing', | ||
327 | 207 | options.launchpad_instance) | ||
328 | 208 | ubuntu = launchpad.distributions["ubuntu"] | ||
329 | 209 | distro_archive = ubuntu.main_archive | ||
330 | 210 | overlay_archive = launchpad.people["ubuntu-sdk-team"].\ | ||
331 | 211 | getPPAByName(name="ppa") | ||
332 | 212 | series = ubuntu.getSeries(name_or_version="vivid") | ||
333 | 213 | |||
334 | 214 | arch_series = series.getDistroArchSeries(archtag=arch) | ||
335 | 215 | |||
336 | 216 | build_directory = "./click-%s/" % arch | ||
337 | 217 | if not os.path.exists(build_directory): | ||
338 | 218 | os.makedirs(build_directory) | ||
339 | 219 | src="./click/" | ||
340 | 220 | src_files = os.listdir(src) | ||
341 | 221 | for file_name in src_files: | ||
342 | 222 | full_file_name = os.path.join(src, file_name) | ||
343 | 223 | if (os.path.isfile(full_file_name)): | ||
344 | 224 | shutil.copy(full_file_name, build_directory) | ||
345 | 225 | |||
346 | 226 | for ide_package in ide_packages: | ||
347 | 227 | re_version = re.compile(r"^\d+\:") | ||
348 | 228 | archive = overlay_archive | ||
349 | 229 | x = overlay_archive.getPublishedBinaries( | ||
350 | 230 | binary_name=ide_package, | ||
351 | 231 | distro_arch_series=arch_series, | ||
352 | 232 | status="Published", pocket='Release', | ||
353 | 233 | exact_match=True) | ||
354 | 234 | |||
355 | 235 | if len(x) == 0: | ||
356 | 236 | archive = distro_archive | ||
357 | 237 | x = distro_archive.getPublishedBinaries( | ||
358 | 238 | binary_name=ide_package, | ||
359 | 239 | distro_arch_series=arch_series, | ||
360 | 240 | status="Published", pocket='Release', | ||
361 | 241 | exact_match=True) | ||
362 | 242 | if len(x) == 0: | ||
363 | 243 | print("Could not find "+ide_package) | ||
364 | 244 | sys.exit(1) | ||
365 | 245 | else: | ||
366 | 246 | print(ide_package+" found in Archive") | ||
367 | 247 | else: | ||
368 | 248 | print(ide_package+" found in SDK PPA") | ||
369 | 249 | |||
370 | 250 | x = x[0].binary_package_version | ||
371 | 251 | |||
372 | 252 | generator = get_deb(archive, ide_package, series, arch) | ||
373 | 253 | for i in generator: | ||
374 | 254 | request = requests.get(i) | ||
375 | 255 | if request.status_code != 200: | ||
376 | 256 | i = re.sub('_%s.deb' % arch, '_all.deb', i) | ||
377 | 257 | |||
378 | 258 | if ide_package != 'ubuntu-ui-toolkit': | ||
379 | 259 | binary_package_name = re.sub(r'-opensource-src', | ||
380 | 260 | r'', | ||
381 | 261 | ide_package.rstrip()) | ||
382 | 262 | else: | ||
383 | 263 | binary_package_name = re.sub(r'ubuntu-ui-toolkit', | ||
384 | 264 | r'ubuntu-sdk', | ||
385 | 265 | ide_package.rstrip()) | ||
386 | 266 | call(["wget", i, "-nv"]) | ||
387 | 267 | for deb_file in glob.glob('%s*deb' % ide_package): | ||
388 | 268 | call(["dpkg-deb", "-x", deb_file, build_directory]) | ||
389 | 269 | for junk_files in glob.glob("*.deb"): | ||
390 | 270 | os.remove(junk_files) | ||
391 | 271 | # click_package_rev = subprocess.Popen(["bzr", "revno"], stdout=subprocess.PIPE).communicate()[0] | ||
392 | 272 | # click_package_rev = click_package_rev.rstrip() | ||
393 | 273 | # manifest_file = open('click/manifest.json','r') | ||
394 | 274 | # manifest_with_orig_version = manifest_file.read() | ||
395 | 275 | # manifest_file.close() | ||
396 | 276 | # manifest_with_new_version = re.sub("\"version\":\s+\".*\"", "\"version\": \"%s\"" % click_package_rev, manifest_with_orig_version) | ||
397 | 277 | # manifest_file = open('click/manifest.json','w') | ||
398 | 278 | # manifest_file.write(manifest_with_new_version) | ||
399 | 279 | # manifest_file.close() | ||
400 | 280 | |||
401 | 281 | |||
402 | 282 | |||
403 | 283 | call(["create_kit.sh","-a",arch]) | ||
404 | 284 | s=open("%s/manifest.json" % build_directory).read() | ||
405 | 285 | s=s.replace('armhf', '%s' % arch) | ||
406 | 286 | f=open("%s/manifest.json" % build_directory, 'w') | ||
407 | 287 | f.write(s) | ||
408 | 288 | f.close() | ||
409 | 289 | call(["click", "build", build_directory]) | ||
410 | 290 | main() | ||
411 | 0 | 291 | ||
412 | === added file 'create_kit.sh' | |||
413 | --- create_kit.sh 1970-01-01 00:00:00 +0000 | |||
414 | +++ create_kit.sh 2016-09-07 08:57:20 +0000 | |||
415 | @@ -0,0 +1,76 @@ | |||
416 | 1 | #!/bin/bash | ||
417 | 2 | |||
418 | 3 | ARCH="armhf" | ||
419 | 4 | while getopts "ha:" opt; do | ||
420 | 5 | case $opt in | ||
421 | 6 | a) | ||
422 | 7 | ARCH=$OPTARG | ||
423 | 8 | ;; | ||
424 | 9 | h) | ||
425 | 10 | echo "Usage: create_kit.sh -a [arch]" | ||
426 | 11 | echo -e "\t-a : Creat Kit for the given arch type. Default: ${ARCH} [armhf, i386, amd64]" | ||
427 | 12 | exit | ||
428 | 13 | ;; | ||
429 | 14 | :) | ||
430 | 15 | echo "Option -$OPTARG requires an argument." >&2 | ||
431 | 16 | exit 1 | ||
432 | 17 | ;; | ||
433 | 18 | esac | ||
434 | 19 | done | ||
435 | 20 | |||
436 | 21 | QT_UID="UbuntuSDK-API-Qt" | ||
437 | 22 | SDK_TOOL="/usr/ubuntu-sdk-ide/bin/sdktool" | ||
438 | 23 | SDKPATH="./click-${ARCH}/usr/ubuntu-sdk-ide/share/qtcreator/QtProject/qtcreator" | ||
439 | 24 | |||
440 | 25 | |||
441 | 26 | rm ${SDKPATH}/*.xml | ||
442 | 27 | |||
443 | 28 | case "${ARCH}" in | ||
444 | 29 | amd64) | ||
445 | 30 | GCC_UID="ProjectExplorer.ToolChain.Gcc:UbuntuSDKGCC-x86_64-linux-gnu" | ||
446 | 31 | NAME="GCC (x86 64bit in /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/bin/g++)" | ||
447 | 32 | ABI="x86-linux-generic-elf-64bit" | ||
448 | 33 | SUPPORTED_ABIS="x86-linux-generic-elf-64bit,x86-linux-generic-elf-32bit" | ||
449 | 34 | ;; | ||
450 | 35 | |||
451 | 36 | i386) | ||
452 | 37 | GCC_UID="ProjectExplorer.ToolChain.Gcc:UbuntuSDKGCC-x86-linux-generic-elf-32bit" | ||
453 | 38 | NAME="GCC (x86 32bit in /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/bin/g++)" | ||
454 | 39 | ABI="x86-linux-generic-elf-32bit" | ||
455 | 40 | SUPPORTED_ABIS="x86-linux-generic-elf-32bit" | ||
456 | 41 | ;; | ||
457 | 42 | |||
458 | 43 | armhf) | ||
459 | 44 | GCC_UID="ProjectExplorer.ToolChain.Gcc:UbuntuSDKGCC-arm-linux-generic-elf-32bit" | ||
460 | 45 | NAME="GCC (armhf in /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/bin/g++)" | ||
461 | 46 | ABI="arm-linux-generic-elf-32bit" | ||
462 | 47 | SUPPORTED_ABIS="arm-linux-generic-elf-32bit" | ||
463 | 48 | ;; | ||
464 | 49 | |||
465 | 50 | *) | ||
466 | 51 | echo "Unknown architecture" | ||
467 | 52 | exit 1 | ||
468 | 53 | ;; | ||
469 | 54 | esac | ||
470 | 55 | |||
471 | 56 | ${SDK_TOOL} --sdkpath=${SDKPATH} addTC \ | ||
472 | 57 | --id "${GCC_UID}" \ | ||
473 | 58 | --name "${NAME}" \ | ||
474 | 59 | --path /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/bin/g++ \ | ||
475 | 60 | --abi "${ABI}" \ | ||
476 | 61 | --supportedAbis "${SUPPORTED_ABIS}" | ||
477 | 62 | |||
478 | 63 | ${SDK_TOOL} --sdkpath=${SDKPATH} addQt \ | ||
479 | 64 | --id "${QT_UID}" \ | ||
480 | 65 | --name "Ubuntu SDK Desktop Qt" \ | ||
481 | 66 | --qmake /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/bin/qmake-clicksdk \ | ||
482 | 67 | --type Qt4ProjectManager.QtVersion.Desktop | ||
483 | 68 | |||
484 | 69 | ${SDK_TOOL} --sdkpath=${SDKPATH} addKit \ | ||
485 | 70 | --id "UbuntuSDK-API-Desktop-Kit" \ | ||
486 | 71 | --name "Ubuntu SDK Desktop Kit" \ | ||
487 | 72 | --debuggerengine 1 \ | ||
488 | 73 | --debugger /opt/click.ubuntu.com/com.ubuntu.sdk/current/usr/bin/gdb \ | ||
489 | 74 | --devicetype Desktop \ | ||
490 | 75 | --toolchain "${GCC_UID}" \ | ||
491 | 76 | --qt "${QT_UID}" | ||
492 | 0 | 77 | ||
493 | === added directory 'setup' | |||
494 | === added directory 'setup/gui' | |||
495 | === added file 'setup/gui/ubuntu-sdk-ide.desktop' | |||
496 | --- setup/gui/ubuntu-sdk-ide.desktop 1970-01-01 00:00:00 +0000 | |||
497 | +++ setup/gui/ubuntu-sdk-ide.desktop 2016-09-07 08:57:20 +0000 | |||
498 | @@ -0,0 +1,13 @@ | |||
499 | 1 | [Desktop Entry] | ||
500 | 2 | Exec=ubuntu-sdk-ide %F | ||
501 | 3 | TryExec=ubuntu-sdk-ide | ||
502 | 4 | Icon=${SNAP}/meta/gui/ubuntu-sdk-ide.png | ||
503 | 5 | Type=Application | ||
504 | 6 | Terminal=false | ||
505 | 7 | Name=Ubuntu SDK IDE | ||
506 | 8 | GenericName=Integrated Development Environment | ||
507 | 9 | MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;application/x-qmlproject; | ||
508 | 10 | Categories=Qt;Development;IDE; | ||
509 | 11 | InitialPreference=9 | ||
510 | 12 | Keywords=IDE;Ubuntu SDK IDE;buntu SDK;SDK;Ubuntu Touch;Qt Creator;Qt | ||
511 | 13 | |||
512 | 0 | 14 | ||
513 | === added file 'setup/gui/ubuntu-sdk-ide.png' | |||
514 | 1 | Binary files setup/gui/ubuntu-sdk-ide.png 1970-01-01 00:00:00 +0000 and setup/gui/ubuntu-sdk-ide.png 2016-09-07 08:57:20 +0000 differ | 15 | Binary files setup/gui/ubuntu-sdk-ide.png 1970-01-01 00:00:00 +0000 and setup/gui/ubuntu-sdk-ide.png 2016-09-07 08:57:20 +0000 differ |
515 | === added file 'snapcraft.yaml' | |||
516 | --- snapcraft.yaml 1970-01-01 00:00:00 +0000 | |||
517 | +++ snapcraft.yaml 2016-09-07 08:57:20 +0000 | |||
518 | @@ -0,0 +1,23 @@ | |||
519 | 1 | name: ubuntu-sdk-ide | ||
520 | 2 | version: "0" | ||
521 | 3 | summary: Integrated Development Environment for Ubuntu Touch | ||
522 | 4 | description: | | ||
523 | 5 | Qt Creator is a lightweight, cross-platform integrated development environment (IDE) designed to make | ||
524 | 6 | development with the Qt application framework even faster and easier. | ||
525 | 7 | |||
526 | 8 | This package contains the Qt Creator and the Ubuntu plugins providing deeper integration for developing | ||
527 | 9 | applications for Ubuntu using the Ubuntu UI Toolkit. It also introduces an Ubuntu themed welcome screen. | ||
528 | 10 | confinement: devmode | ||
529 | 11 | |||
530 | 12 | apps: | ||
531 | 13 | ubuntu-sdk-ide: | ||
532 | 14 | command: desktop-launch $SNAP/usr/ubuntu-sdk-ide/bin/qtcreator.sh -noload Ubuntu | ||
533 | 15 | plugs: [unity7, opengl, network-bind] | ||
534 | 16 | |||
535 | 17 | parts: | ||
536 | 18 | ubuntu-sdk-ide: | ||
537 | 19 | plugin: nil | ||
538 | 20 | stage-packages: | ||
539 | 21 | - ubuntu-sdk-ide | ||
540 | 22 | # https://wiki.ubuntu.com/snapcraft/parts | ||
541 | 23 | after: [desktop-glib-only] |
PASSED: Continuous integration, rev:156 /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/171/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/5932/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/171/ rebuild
https:/