1
=== modified file 'README'
2
--- README	2015-01-14 15:18:05 +0000
3
+++ README	2015-11-23 11:20:56 +0000
4
@@ -27,21 +27,23 @@
5
27
----------------
27
----------------
6
28
28
7
29
You need Qt5 installed to proceed. To build this repository, run
29
You need Qt5 installed to proceed. To build this repository, run
10
30
$ qmake
30
 $ qmake
11
31
$ make
31
 $ make
12
32
32
13
33
View the components gallery by running
33
View the components gallery by running
15
34
$ ./gallery.sh
34
 $ ./gallery.sh
16
35
35
17
36
To install these components, run
36
To install these components, run
19
37
$ make install
37
 $ make install
20
38
You may need to be root for this command to succeed.
38
You may need to be root for this command to succeed.
21
39
39
27
40
To use these components in QML without installing them, you need to set the 
40
To use these components uninstalled, you need to have some environment
28
41
QML2_IMPORT_PATH environment variable. This is done by running
41
variables correctly set. This is done by either running a dedicated
29
42
$ source export_modules_dir.sh
42
(recursive) shell with
30
43
from the root directory of this repository, but is lost when you close your 
43
 $ ./uitk_shell.sh
31
44
shell.
44
or by exporting the variables in the current shell session with
32
45
 $ source export_modules_dir.sh
33
46
Note that qmake must be run before.
34
45
47
35
46
48
36
47
Documentation
49
Documentation
37
48
50
38
=== modified file 'export_modules_dir.sh'
39
--- export_modules_dir.sh	2015-11-06 08:09:05 +0000
40
+++ export_modules_dir.sh	2015-11-23 11:20:56 +0000
41
@@ -19,8 +19,4 @@
42
19
export QML_IMPORT_PATH=$BUILD_DIR/qml
19
export QML_IMPORT_PATH=$BUILD_DIR/qml
43
20
export QML2_IMPORT_PATH=$BUILD_DIR/qml
20
export QML2_IMPORT_PATH=$BUILD_DIR/qml
44
21
export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
21
export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
50
22
export LD_LIBRARY_PATH=$BUILD_DIR/lib
22
export LD_LIBRARY_PATH=$BUILD_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
46
23
/sbin/initctl set-env --global QML_IMPORT_PATH=$BUILD_DIR/qml
47
24
/sbin/initctl set-env --global QML2_IMPORT_PATH=$BUILD_DIR/qml
48
25
/sbin/initctl set-env --global UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
49
26
/sbin/initctl set-env --global LD_LIBRARY_PATH=$BUILD_DIR/lib
51
27
23
52
=== modified file 'gallery.sh'
53
--- gallery.sh	2015-08-11 15:42:46 +0000
54
+++ gallery.sh	2015-11-23 11:20:56 +0000
55
@@ -15,7 +15,10 @@
56
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
57
16
#
16
#
58
17
17
60
18
source export_modules_dir.sh
18
if [ -z ${UITK_SHELL+x} ]
61
19
then
62
20
    source export_modules_dir.sh
63
21
fi
64
19
22
65
20
if [ "$1" == "--autopilot" ]
23
if [ "$1" == "--autopilot" ]
66
21
then
24
then
67
22
25
68
=== modified file 'run_tests.sh'
69
--- run_tests.sh	2015-01-30 11:58:40 +0000
70
+++ run_tests.sh	2015-11-23 11:20:56 +0000
71
@@ -15,7 +15,9 @@
72
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
73
16
#
16
#
74
17
17
76
18
source $PWD/export_modules_dir.sh
18
if [ -z ${UITK_SHELL+x} ]; then
77
19
    source $PWD/export_modules_dir.sh
78
20
fi
79
19
21
80
20
if [ ! -e $QML2_IMPORT_PATH/Ubuntu/Layouts/libUbuntuLayouts.so ]; then
22
if [ ! -e $QML2_IMPORT_PATH/Ubuntu/Layouts/libUbuntuLayouts.so ]; then
81
21
    echo You need to build UITK before you can run Autopilot test cases!
23
    echo You need to build UITK before you can run Autopilot test cases!
82
22
24
83
=== added file 'uitk_shell.sh'
84
--- uitk_shell.sh	1970-01-01 00:00:00 +0000
85
+++ uitk_shell.sh	2015-11-23 11:20:56 +0000
86
@@ -0,0 +1,44 @@
87
1
#!/bin/bash -i
88
2
#
89
3
# Copyright (C) 2015 Canonical Ltd.
90
4
#
91
5
# This program is free software; you can redistribute it and/or modify
92
6
# it under the terms of the GNU Lesser General Public License as published by
93
7
# the Free Software Foundation; version 3.
94
8
#
95
9
# This program is distributed in the hope that it will be useful,
96
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
97
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
98
12
# GNU Lesser General Public License for more details.
99
13
#
100
14
# You should have received a copy of the GNU Lesser General Public License
101
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
102
16
103
17
# This script spawns a new Bash shell with all the environment variables needed
104
18
# to run apps based on the local source tree uninstalled. Note that qmake must
105
19
# be run before in order to have the build_paths.inc file generated:
106
20
#
107
21
#  $ qmake
108
22
#  $ ./uitk_shell.sh
109
23
#  $ make
110
24
#  $ qmlscene uitk_based_file.qml
111
25
112
26
NAME='uitk'
113
27
114
28
source `dirname $0`/export_modules_dir.sh
115
29
116
30
export UITK_SHELL=1
117
31
118
32
TEMP_FILE=`mktemp -t bashrc.XXXXXXXX`
119
33
echo source $HOME/.bashrc >> $TEMP_FILE
120
34
echo PS1=\'[$NAME] $PS1\' >> $TEMP_FILE
121
35
SHELL_OPTIONS="--init-file $TEMP_FILE"
122
36
123
37
echo Entering $NAME shell.
124
38
$SHELL $SHELL_OPTIONS
125
39
echo Leaving $NAME shell. Have a nice day!
126
40
127
41
if test ! -z "$TEMP_FILE"
128
42
then
129
43
    rm $TEMP_FILE
130
44
fi
Status:	Work in progress
Proposed branch:	lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-export-script-improvement
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	130 lines (+63/-16) 5 files modified README (+11/-9) export_modules_dir.sh (+1/-5) gallery.sh (+4/-1) run_tests.sh (+3/-1) uitk_shell.sh (+44/-0)
To merge this branch:	bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-export-script-improvement
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-03-25
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-12-16
Benjamin Zeller		2015-11-23	Approve on 2015-11-25
Zsombor Egri		2015-11-19	Pending
Review via email: mp+278028@code.launchpad.net
1	=== modified file 'README'
2	--- README 2015-01-14 15:18:05 +0000
3	+++ README 2015-11-23 11:20:56 +0000
4	@@ -27,21 +27,23 @@
5	27	----------------	27	----------------
6	28		28
7	29	You need Qt5 installed to proceed. To build this repository, run	29	You need Qt5 installed to proceed. To build this repository, run
10	30	$ qmake	30	$ qmake
11	31	$ make	31	$ make
12	32		32
13	33	View the components gallery by running	33	View the components gallery by running
15	34	$ ./gallery.sh	34	$ ./gallery.sh
16	35		35
17	36	To install these components, run	36	To install these components, run
19	37	$ make install	37	$ make install
20	38	You may need to be root for this command to succeed.	38	You may need to be root for this command to succeed.
21	39		39
27	40	To use these components in QML without installing them, you need to set the	40	To use these components uninstalled, you need to have some environment
28	41	QML2_IMPORT_PATH environment variable. This is done by running	41	variables correctly set. This is done by either running a dedicated
29	42	$ source export_modules_dir.sh	42	(recursive) shell with
30	43	from the root directory of this repository, but is lost when you close your	43	$ ./uitk_shell.sh
31	44	shell.	44	or by exporting the variables in the current shell session with
32			45	$ source export_modules_dir.sh
33			46	Note that qmake must be run before.
34	45		47
35	46		48
36	47	Documentation	49	Documentation
37	48		50
38	=== modified file 'export_modules_dir.sh'
39	--- export_modules_dir.sh 2015-11-06 08:09:05 +0000
40	+++ export_modules_dir.sh 2015-11-23 11:20:56 +0000
41	@@ -19,8 +19,4 @@
42	19	export QML_IMPORT_PATH=$BUILD_DIR/qml	19	export QML_IMPORT_PATH=$BUILD_DIR/qml
43	20	export QML2_IMPORT_PATH=$BUILD_DIR/qml	20	export QML2_IMPORT_PATH=$BUILD_DIR/qml
44	21	export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml	21	export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
50	22	export LD_LIBRARY_PATH=$BUILD_DIR/lib	22	export LD_LIBRARY_PATH=$BUILD_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
46	23	/sbin/initctl set-env --global QML_IMPORT_PATH=$BUILD_DIR/qml
47	24	/sbin/initctl set-env --global QML2_IMPORT_PATH=$BUILD_DIR/qml
48	25	/sbin/initctl set-env --global UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
49	26	/sbin/initctl set-env --global LD_LIBRARY_PATH=$BUILD_DIR/lib
51	27		23
52	=== modified file 'gallery.sh'
53	--- gallery.sh 2015-08-11 15:42:46 +0000
54	+++ gallery.sh 2015-11-23 11:20:56 +0000
55	@@ -15,7 +15,10 @@
56	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
57	16	#	16	#
58	17		17
60	18	source export_modules_dir.sh	18	if [ -z ${UITK_SHELL+x} ]
61			19	then
62			20	source export_modules_dir.sh
63			21	fi
64	19		22
65	20	if [ "$1" == "--autopilot" ]	23	if [ "$1" == "--autopilot" ]
66	21	then	24	then
67	22		25
68	=== modified file 'run_tests.sh'
69	--- run_tests.sh 2015-01-30 11:58:40 +0000
70	+++ run_tests.sh 2015-11-23 11:20:56 +0000
71	@@ -15,7 +15,9 @@
72	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
73	16	#	16	#
74	17		17
76	18	source $PWD/export_modules_dir.sh	18	if [ -z ${UITK_SHELL+x} ]; then
77			19	source $PWD/export_modules_dir.sh
78			20	fi
79	19		21
80	20	if [ ! -e $QML2_IMPORT_PATH/Ubuntu/Layouts/libUbuntuLayouts.so ]; then	22	if [ ! -e $QML2_IMPORT_PATH/Ubuntu/Layouts/libUbuntuLayouts.so ]; then
81	21	echo You need to build UITK before you can run Autopilot test cases!	23	echo You need to build UITK before you can run Autopilot test cases!
82	22		24
83	=== added file 'uitk_shell.sh'
84	--- uitk_shell.sh 1970-01-01 00:00:00 +0000
85	+++ uitk_shell.sh 2015-11-23 11:20:56 +0000
86	@@ -0,0 +1,44 @@
87			1	#!/bin/bash -i
88			2	#
89			3	# Copyright (C) 2015 Canonical Ltd.
90			4	#
91			5	# This program is free software; you can redistribute it and/or modify
92			6	# it under the terms of the GNU Lesser General Public License as published by
93			7	# the Free Software Foundation; version 3.
94			8	#
95			9	# This program is distributed in the hope that it will be useful,
96			10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
97			11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
98			12	# GNU Lesser General Public License for more details.
99			13	#
100			14	# You should have received a copy of the GNU Lesser General Public License
101			15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
102			16
103			17	# This script spawns a new Bash shell with all the environment variables needed
104			18	# to run apps based on the local source tree uninstalled. Note that qmake must
105			19	# be run before in order to have the build_paths.inc file generated:
106			20	#
107			21	# $ qmake
108			22	# $ ./uitk_shell.sh
109			23	# $ make
110			24	# $ qmlscene uitk_based_file.qml
111			25
112			26	NAME='uitk'
113			27
114			28	source `dirname $0`/export_modules_dir.sh
115			29
116			30	export UITK_SHELL=1
117			31
118			32	TEMP_FILE=`mktemp -t bashrc.XXXXXXXX`
119			33	echo source $HOME/.bashrc >> $TEMP_FILE
120			34	echo PS1=\'[$NAME] $PS1\' >> $TEMP_FILE
121			35	SHELL_OPTIONS="--init-file $TEMP_FILE"
122			36
123			37	echo Entering $NAME shell.
124			38	$SHELL $SHELL_OPTIONS
125			39	echo Leaving $NAME shell. Have a nice day!
126			40
127			41	if test ! -z "$TEMP_FILE"
128			42	then
129			43	rm $TEMP_FILE
130			44	fi