Ubuntu UI Toolkit

Merge lp:~loic.molinari/ubuntu-ui-toolkit/fix-ld-library-path-expansion into lp:ubuntu-ui-toolkit/staging

  1. fix-ld-library-path-expansion
  2. Merge into staging
Proposed by Loïc Molinari
Status: Superseded
Proposed branch: lp:~loic.molinari/ubuntu-ui-toolkit/fix-ld-library-path-expansion
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 517 lines (+501/-1)
2 files modified
examples/ubuntu-ui-toolkit-gallery/po/oc.po (+500/-0)
export_qml_dir.sh (+1/-1)
To merge this branch: bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/fix-ld-library-path-expansion
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+298772@code.launchpad.net

Commit message

Expansion of LD_LIBRARY_PATH is broken since it doesn't include a ":", which means PerformanceMetrics path, which is at the end, is actually not available, nor the current content of LD_LIBRARY_PATH.

That fixes it using the proper shell expansion syntax.

Description of the change

Expansion of LD_LIBRARY_PATH is broken since it doesn't include a ":", which means PerformanceMetrics path, which is at the end, is actually not available, nor the current content of LD_LIBRARY_PATH.

That fixes it using the proper shell expansion syntax.

To post a comment you must log in.
lp:~loic.molinari/ubuntu-ui-toolkit/fix-ld-library-path-expansion updated
1339. By Loïc Molinari

Merged lp:ubuntu-ui-toolkit/staging.

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1338
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/797/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4190/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/797/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1338
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/771/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4192/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/771/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1338
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1016/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4193/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1016/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1338
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/988/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4194/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/988/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1338
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/509/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/988
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1016
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/797
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/771
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4195/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4194
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4193
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4190
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4192

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/509/rebuild

review: Approve (continuous-integration)

Unmerged revisions

1339. By Loïc Molinari

Merged lp:ubuntu-ui-toolkit/staging.

1338. By Loïc Molinari

Fixed buggy LD_LIBRARY_PATH expansion.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'examples/ubuntu-ui-toolkit-gallery/po/oc.po'
2--- examples/ubuntu-ui-toolkit-gallery/po/oc.po 1970-01-01 00:00:00 +0000
3+++ examples/ubuntu-ui-toolkit-gallery/po/oc.po 2016-06-30 13:20:36 +0000
4@@ -0,0 +1,500 @@
5+# Occitan (post 1500) translation for ubuntu-ui-toolkit
6+# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
7+# This file is distributed under the same license as the ubuntu-ui-toolkit package.
8+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
9+#
10+msgid ""
11+msgstr ""
12+"Project-Id-Version: ubuntu-ui-toolkit\n"
13+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
14+"POT-Creation-Date: 2015-11-05 10:04+0100\n"
15+"PO-Revision-Date: 2016-06-27 12:26+0000\n"
16+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
17+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
18+"MIME-Version: 1.0\n"
19+"Content-Type: text/plain; charset=UTF-8\n"
20+"Content-Transfer-Encoding: 8bit\n"
21+"X-Launchpad-Export-Date: 2016-06-28 05:39+0000\n"
22+"X-Generator: Launchpad (build 18115)\n"
23+
24+#: About.qml:34
25+msgid "About..."
26+msgstr "A prepaus..."
27+
28+#: ActionBars.qml:68
29+msgid "Short list"
30+msgstr ""
31+
32+#: ActionBars.qml:79
33+msgid "Number of slots"
34+msgstr ""
35+
36+#: ActionBars.qml:92
37+msgid "Long list"
38+msgstr ""
39+
40+#: ActionBars.qml:102 Buttons.qml:91 Sections.qml:45 TextInputs.qml:90
41+#: Toggles.qml:45 Toggles.qml:83
42+msgid "Disabled"
43+msgstr "Desactivat"
44+
45+#: Animations.qml:24
46+msgid "NumberAnimation"
47+msgstr ""
48+
49+#: Animations.qml:28 Buttons.qml:28 Dialog.qml:29 ListItems.qml:25
50+#: ProgressBars.qml:29 ProgressBars.qml:85 Sheet.qml:40 Sheet.qml:73
51+#: Sliders.qml:28 TextInputs.qml:46
52+msgid "Standard"
53+msgstr "Estandard"
54+
55+#: Animations.qml:58
56+msgid "Standard Durations"
57+msgstr ""
58+
59+#: Animations.qml:62
60+msgid "Snap"
61+msgstr "Asimantar"
62+
63+#: Animations.qml:98
64+msgid "Fast"
65+msgstr "Rapid"
66+
67+#: Animations.qml:134
68+msgid "Slow"
69+msgstr "Lenta"
70+
71+#: Animations.qml:159
72+msgid "Sleepy"
73+msgstr "Acossomit"
74+
75+#: Buttons.qml:32 Buttons.qml:41 Buttons.qml:77 Buttons.qml:85 Buttons.qml:95
76+msgid "Call"
77+msgstr "Sonada"
78+
79+#: Buttons.qml:37
80+msgid "Stroke"
81+msgstr "Trait"
82+
83+#: Buttons.qml:47 Icons.qml:54
84+msgid "Color"
85+msgstr "Color"
86+
87+#: Buttons.qml:53
88+#, qt-format
89+msgid "Call %1"
90+msgstr ""
91+
92+#: Buttons.qml:63 Buttons.qml:120 ListItems.qml:43
93+msgid "Icon"
94+msgstr "Icòna"
95+
96+#: Buttons.qml:72 Buttons.qml:134
97+msgid "Icon+Text"
98+msgstr ""
99+
100+#: Buttons.qml:105 OptionSelectors.qml:41
101+msgid "Collapsed"
102+msgstr "Replegat"
103+
104+#: Buttons.qml:148 ListItems.qml:120 OptionSelectors.qml:47
105+msgid "Expanded"
106+msgstr "Desvolopat"
107+
108+#: Colors.qml:30
109+msgid "Orange"
110+msgstr "Irange"
111+
112+#: Colors.qml:36
113+msgid "Light grey"
114+msgstr ""
115+
116+#: Colors.qml:42
117+msgid "Dark grey"
118+msgstr ""
119+
120+#: Colors.qml:48
121+msgid "Red"
122+msgstr "Roge"
123+
124+#: Colors.qml:54
125+msgid "Green"
126+msgstr "Verd"
127+
128+#: Colors.qml:60
129+msgid "Blue"
130+msgstr "Blau"
131+
132+#: Colors.qml:66
133+msgid "Purple"
134+msgstr "Violet"
135+
136+#: Dialog.qml:32 Popover.qml:42 Sheet.qml:43 Sheet.qml:76
137+msgid "Open"
138+msgstr "Dobrir"
139+
140+#: Icons.qml:29
141+msgid "Scaling"
142+msgstr "Redimensionament"
143+
144+#: Icons.qml:79
145+msgid "Theme"
146+msgstr "Tèma"
147+
148+#: ListItemLayouts.qml:208 NewListItems.qml:79
149+msgid "Leading and trailing actions"
150+msgstr ""
151+
152+#: ListItems.qml:28 ListItems.qml:36 ListItems.qml:46 ListItems.qml:60
153+#: ListItems.qml:66 ListItems.qml:76 ListItems.qml:85 ListItems.qml:94
154+#: ListItems.qml:160 ListItems.qml:173 ListItems.qml:193
155+msgid "Label"
156+msgstr "Etiqueta"
157+
158+#: ListItems.qml:33
159+msgid "Subtitled"
160+msgstr "Sostitolat"
161+
162+#: ListItems.qml:37
163+msgid "Secondary label"
164+msgstr ""
165+
166+#: ListItems.qml:52
167+msgid "ThinDivider"
168+msgstr ""
169+
170+#: ListItems.qml:73
171+msgid "Progression"
172+msgstr "Progression"
173+
174+#: ListItems.qml:82
175+msgid "Single value"
176+msgstr ""
177+
178+#: ListItems.qml:86
179+msgid "Value"
180+msgstr "Valor"
181+
182+#: ListItems.qml:91
183+msgid "Multi value"
184+msgstr ""
185+
186+#: ListItems.qml:95 ListItems.qml:113 ListItems.qml:122 ListItems.qml:132
187+#: ListItems.qml:161 ListItems.qml:176 OptionSelectors.qml:33
188+#: OptionSelectors.qml:84 OptionSelectors.qml:99
189+msgid "Value 1"
190+msgstr "Valor 1"
191+
192+#: ListItems.qml:96 ListItems.qml:114 ListItems.qml:123 ListItems.qml:133
193+#: ListItems.qml:162 ListItems.qml:177 OptionSelectors.qml:85
194+#: OptionSelectors.qml:100
195+msgid "Value 2"
196+msgstr "Valor 2"
197+
198+#: ListItems.qml:97 ListItems.qml:115 ListItems.qml:124 ListItems.qml:134
199+#: ListItems.qml:163 ListItems.qml:178 OptionSelectors.qml:86
200+#: OptionSelectors.qml:101
201+msgid "Value 3"
202+msgstr "Valor 3"
203+
204+#: ListItems.qml:98 ListItems.qml:116 ListItems.qml:125 ListItems.qml:135
205+#: ListItems.qml:164 ListItems.qml:179 OptionSelectors.qml:87
206+#: OptionSelectors.qml:102
207+msgid "Value 4"
208+msgstr "Valor 4"
209+
210+#: ListItems.qml:103
211+msgid "Item selector"
212+msgstr ""
213+
214+#: ListItems.qml:112 TextInputs.qml:117
215+msgid "Expanding"
216+msgstr "Espandiment"
217+
218+#: ListItems.qml:129 OptionSelectors.qml:54
219+msgid "Multiple Selection"
220+msgstr ""
221+
222+#: ListItems.qml:139 OptionSelectors.qml:62
223+msgid "Custom Model"
224+msgstr ""
225+
226+#: ListItems.qml:165 ListItems.qml:180 OptionSelectors.qml:88
227+#: OptionSelectors.qml:103
228+msgid "Value 5"
229+msgstr "Valor 5"
230+
231+#: ListItems.qml:166 ListItems.qml:181 OptionSelectors.qml:89
232+#: OptionSelectors.qml:104
233+msgid "Value 6"
234+msgstr "Valor 6"
235+
236+#: ListItems.qml:167 ListItems.qml:182 OptionSelectors.qml:90
237+#: OptionSelectors.qml:105
238+msgid "Value 7"
239+msgstr "Valor 7"
240+
241+#: ListItems.qml:168 ListItems.qml:183 OptionSelectors.qml:91
242+#: OptionSelectors.qml:106
243+msgid "Value 8"
244+msgstr "Valor 8"
245+
246+#: ListItems.qml:190
247+msgid "Control"
248+msgstr "Contraròtle"
249+
250+#: ListItems.qml:202
251+msgid "Removable"
252+msgstr "Amovible"
253+
254+#: ListItems.qml:205
255+msgid "Slide to remove"
256+msgstr ""
257+
258+#: ListItems.qml:215
259+msgid "Reset"
260+msgstr "Reïnicializar"
261+
262+#: ListItems.qml:226
263+msgid "Grouped list"
264+msgstr ""
265+
266+#: ListItems.qml:261
267+msgid "UbuntuListView"
268+msgstr ""
269+
270+#: ListItems.qml:321
271+msgid "ExpandablesColumn"
272+msgstr ""
273+
274+#: ListItems.qml:364
275+msgid "Expandable"
276+msgstr ""
277+
278+#: NewListItems.qml:39
279+msgid "Colored"
280+msgstr "Colorat :"
281+
282+#: NewListItems.qml:42
283+msgid "Highlight color"
284+msgstr "Color de susbrilhança"
285+
286+#: NewListItems.qml:71
287+msgid "Leading actions"
288+msgstr ""
289+
290+#: NewListItems.qml:75
291+msgid "Trailing actions"
292+msgstr ""
293+
294+#: NewListItems.qml:84
295+msgid "Custom action delegates"
296+msgstr ""
297+
298+#: NewListItems.qml:111
299+msgid "Edit"
300+msgstr "Editar"
301+
302+#: NewListItems.qml:114
303+msgid "Move"
304+msgstr "Desplaçar"
305+
306+#: NewListItems.qml:163
307+msgid "Basic"
308+msgstr "Basic"
309+
310+#: NewListItems.qml:163 NewListItems.qml:168 NewListItems.qml:169
311+#: NewListItems.qml:213 NewListItems.qml:214
312+msgid "Colored divider"
313+msgstr ""
314+
315+#: NewListItems.qml:163
316+msgid "Immutable"
317+msgstr ""
318+
319+#: NewListItems.qml:163 NewListItems.qml:170 NewListItems.qml:215
320+msgid "No divider"
321+msgstr ""
322+
323+#: OptionSelectors.qml:24
324+msgid "Option Selector"
325+msgstr ""
326+
327+#: OptionSelectors.qml:34
328+msgid "This is the second value"
329+msgstr ""
330+
331+#: OptionSelectors.qml:35
332+msgid ""
333+"Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy "
334+"nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat."
335+msgstr ""
336+
337+#: OptionSelectors.qml:36
338+msgid "Once upon a time there was a story nobody told."
339+msgstr ""
340+
341+#: OptionSelectors.qml:83
342+msgid "Custom container height"
343+msgstr ""
344+
345+#: OptionSelectors.qml:96
346+msgid "No initial selection, scrollable."
347+msgstr ""
348+
349+#: Pickers.qml:31
350+msgid "Linear"
351+msgstr "Linear"
352+
353+#: Pickers.qml:63
354+msgid "Circular"
355+msgstr "Circular"
356+
357+#: Pickers.qml:100 ProgressBars.qml:49
358+msgid "Infinite"
359+msgstr "Infinit"
360+
361+#: Pickers.qml:137
362+msgid "Clock"
363+msgstr "Relòtge"
364+
365+#: Pickers.qml:174
366+msgid "Overlay"
367+msgstr "Superpausar"
368+
369+#: Popover.qml:38
370+msgid "Flickable"
371+msgstr ""
372+
373+#: Popover.qml:74
374+msgid "Action #1"
375+msgstr ""
376+
377+#: Popover.qml:78
378+msgid "Action #2"
379+msgstr "Accion #2"
380+
381+#: Popover.qml:82
382+msgid "Action #3"
383+msgstr "Accion #3"
384+
385+#: Popover.qml:86
386+msgid "Action #4"
387+msgstr "Accion #4"
388+
389+#: Popover.qml:90
390+msgid "Action #5"
391+msgstr "Accion #5"
392+
393+#: ProgressBars.qml:24
394+msgid "Progress Bar"
395+msgstr "Barra de progression"
396+
397+#: ProgressBars.qml:59
398+msgid "No label"
399+msgstr ""
400+
401+#: ProgressBars.qml:81
402+msgid "Activity Indicator"
403+msgstr ""
404+
405+#: ProportionalShape.qml:28
406+msgid "Sizes"
407+msgstr "Talhas"
408+
409+#: Sections.qml:34
410+msgid "Enabled"
411+msgstr "Activat"
412+
413+#: Sheet.qml:28
414+msgid "The visual style of the Sheet is early work and thus clunky looking."
415+msgstr ""
416+
417+#: Sheet.qml:53 Sheet.qml:86
418+msgid "Title"
419+msgstr "Títol"
420+
421+#: Sliders.qml:36 Sliders.qml:51 Sliders.qml:68 Sliders.qml:93
422+#, qt-format
423+msgid "Actual value: %1"
424+msgstr ""
425+
426+#: Sliders.qml:42
427+msgid "Live Update"
428+msgstr ""
429+
430+#: Sliders.qml:57
431+msgid "Range"
432+msgstr "Plaja"
433+
434+#: Sliders.qml:74
435+msgid "Labels"
436+msgstr "Etiquetas"
437+
438+#: Sliders.qml:85
439+msgid "Small"
440+msgstr "Pichon"
441+
442+#: Sliders.qml:87
443+msgid "Medium"
444+msgstr "Mejan"
445+
446+#: Sliders.qml:89
447+msgid "Large"
448+msgstr "Grand"
449+
450+#: TextInputs.qml:50
451+msgid "Type me in..."
452+msgstr ""
453+
454+#: TextInputs.qml:56
455+msgid "Password"
456+msgstr "Senhal"
457+
458+#: TextInputs.qml:67
459+msgid "Numbers"
460+msgstr "Nombres"
461+
462+#: TextInputs.qml:78
463+msgid "Read-only"
464+msgstr "En lectura sola"
465+
466+#: TextInputs.qml:82
467+msgid "Nobody type here"
468+msgstr ""
469+
470+#: TextInputs.qml:94
471+msgid "No interaction allowed"
472+msgstr ""
473+
474+#: TextInputs.qml:107
475+msgid "Default"
476+msgstr "Per defaut"
477+
478+#: TextInputs.qml:129
479+msgid "Rich Text"
480+msgstr ""
481+
482+#: Toggles.qml:28 Toggles.qml:66
483+msgid "Unchecked"
484+msgstr "Desmarcat"
485+
486+#: Toggles.qml:36 Toggles.qml:74
487+msgid "Checked"
488+msgstr ""
489+
490+#: UbuntuShape.qml:28
491+msgid "Aspect"
492+msgstr ""
493+
494+#: UbuntuShape.qml:73
495+msgid "Radius"
496+msgstr ""
497+
498+#: UbuntuShape.qml:115
499+msgid "Image"
500+msgstr ""
501+
502+#: UbuntuShape.qml:134
503+msgid "Gradient"
504+msgstr ""
505
506=== modified file 'export_qml_dir.sh'
507--- export_qml_dir.sh 2016-06-13 10:44:46 +0000
508+++ export_qml_dir.sh 2016-06-30 13:20:36 +0000
509@@ -25,7 +25,7 @@
510 export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
511 UBUNTU_QML_ROOT=$BUILD_DIR/qml/Ubuntu
512 UBUNTU_QML_DIRS=$UBUNTU_QML_ROOT/Components:$UBUNTU_QML_ROOT/Test:$UBUNTU_QML_ROOT/Layouts:$UBUNTU_QML_ROOT/PerformanceMetrics
513-export LD_LIBRARY_PATH=$BUILD_DIR/lib:$UBUNTU_QML_DIRS$LD_LIBRARY_PATH
514+export LD_LIBRARY_PATH=$BUILD_DIR/lib:$UBUNTU_QML_DIRS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
515 # Build machines may not have initctl and don't need it
516 test -f /sbin/initctl || return 0
517 # initctl may be available but not working (for example in a lxd container without upstart)

Subscribers

People subscribed via source and target branches