Merge lp:~nskaggs/phablet-tools/default-to-1404 into lp:phablet-tools

Proposed by Nicholas Skaggs on 2014-05-02
Status: Superseded
Proposed branch: lp:~nskaggs/phablet-tools/default-to-1404
Merge into: lp:phablet-tools
Diff against target: 169 lines (+54/-54)
1 file modified
click-buddy (+54/-54)
To merge this branch: bzr merge lp:~nskaggs/phablet-tools/default-to-1404
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-05-02
Ubuntu Phablet Team 2014-05-02 Pending
Review via email: mp+218153@code.launchpad.net

This proposal has been superseded by a proposal from 2014-05-03.

Commit message

Change default framework to 14.04, which is latest stable

Description of the change

Change default framework to 14.04, which is latest stable

To post a comment you must log in.
Nicholas Skaggs (nskaggs) wrote :

Wow, that's a lot of whitespace changes. Even using vi, I get this, not sure what the deal is :-)

Sergio Schvezov (sergiusens) wrote :

On Fri, May 2, 2014 at 5:41 PM, Nicholas Skaggs <
<email address hidden>> wrote:

> Wow, that's a lot of whitespace changes. Even using vi, I get this, not
> sure what the deal is :-)
>

You might have an autosave hook that does s/<tab>/<spaces>/ ;-)

Unmerged revisions

269. By Nicholas Skaggs on 2014-05-02

change default sdk framework to 14.04

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click-buddy'
2--- click-buddy 2014-04-14 18:45:09 +0000
3+++ click-buddy 2014-05-02 20:39:02 +0000
4@@ -25,18 +25,18 @@
5 Creates and runs click apps
6
7 OPTIONS:
8- -h Show this message
9+ -h Show this message
10 -s Specify the serial of the device to install (see adb $ADBOPTS devices)
11
12- --bzr-source bzr sources used to backreference the package
13- --dir directory holding the package to build
14+ --bzr-source bzr sources used to backreference the package
15+ --dir directory holding the package to build
16 --provision Install resulting click and run tests
17 --no-clean Don't clean temporary directories
18 --extra-deps Packages required in the chroot which are not part of the SDK
19 --arch Target architecture, requires a created click chroot
20 (defaults to arch all)
21 --framework Target click framework, requires a created click chroot
22- (defaults to ubuntu-sdk-13.10)
23+ (defaults to ubuntu-sdk-14.04)
24 EOF
25 }
26
27@@ -47,7 +47,7 @@
28 NO_CLEAN=""
29 EXTRA_DEPS=""
30 ARCH="all"
31-FRAMEWORK="ubuntu-sdk-13.10"
32+FRAMEWORK="ubuntu-sdk-14.04"
33 MAINTMODE=""
34
35 TEST_DIR='tests/autopilot'
36@@ -89,25 +89,25 @@
37 shift
38 NO_CLEAN=1
39 ;;
40- --arch)
41- shift
42- ARCH="$1"
43- shift
44- ;;
45- --framework)
46- shift
47- FRAMEWORK="$1"
48- shift
49- ;;
50- --extra-deps)
51- shift
52- EXTRA_DEPS="$1"
53- shift
54- ;;
55- --maint-mode)
56- shift
57- MAINTMODE=1
58- ;;
59+ --arch)
60+ shift
61+ ARCH="$1"
62+ shift
63+ ;;
64+ --framework)
65+ shift
66+ FRAMEWORK="$1"
67+ shift
68+ ;;
69+ --extra-deps)
70+ shift
71+ EXTRA_DEPS="$1"
72+ shift
73+ ;;
74+ --maint-mode)
75+ shift
76+ MAINTMODE=1
77+ ;;
78 --)
79 shift
80 break
81@@ -122,7 +122,7 @@
82 fi
83
84 if [ -z "$SOURCE" ]; then
85- SOURCE="$(readlink -f $(pwd))"
86+ SOURCE="$(readlink -f $(pwd))"
87 fi
88
89 if [ ! -f $SOURCE/CMakeLists.txt ]; then
90@@ -135,50 +135,50 @@
91 cd $builddir
92
93 CMAKE_PARAMS="-DINSTALL_TESTS=off -DCLICK_MODE=on \
94- -DBZR_REVNO=$(cd $SOURCE; bzr revno)"
95+ -DBZR_REVNO=$(cd $SOURCE; bzr revno)"
96
97 if [ -n "$BZR_SOURCE" ]; then
98- CMAKE_PARAMS="$CMAKE_PARAMS -DBZR_SOURCE=$BZR_SOURCE"
99+ CMAKE_PARAMS="$CMAKE_PARAMS -DBZR_SOURCE=$BZR_SOURCE"
100 fi
101
102 set -e
103 if [ "$ARCH" = "all" ]; then
104- cmake "$SOURCE" $CMAKE_PARAMS
105- make DESTDIR=$installdir install
106+ cmake "$SOURCE" $CMAKE_PARAMS
107+ make DESTDIR=$installdir install
108 else
109- if [ -n "$EXTRA_DEPS" ] && [ -z "$MAINTMODE" ]; then
110- echo "click chroot still doesn\'t support sessions and deps outside the"
111- echo "default sdk were requested, you can optionally use click maint"
112- echo "to install $EXTRA_DEPS by running"
113- echo " click chroot -a$ARCH -f$FRAMEWORK maint apt-get update"
114- echo " click chroot -a$ARCH -f$FRAMEWORK maint apt-get install $EXTRA_DEPS"
115- echo
116- echo "Your chroot will be unclean from then on, so if you want to"
117- echo "guarantee clean builds the chroot would need to be recreated."
118- echo
119- echo "Use the undocumented --maint-mode if you want this automated."
120- exit 1
121- fi
122- cd "$SOURCE"
123- if [ -n "$MAINTMODE" ]; then
124- trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \
125- EXIT HUP INT TERM
126- click chroot -a$ARCH -f$FRAMEWORK maint apt-get update
127- click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS
128- fi
129- click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS
130- click chroot -a$ARCH -f$FRAMEWORK run make
131+ if [ -n "$EXTRA_DEPS" ] && [ -z "$MAINTMODE" ]; then
132+ echo "click chroot still doesn\'t support sessions and deps outside the"
133+ echo "default sdk were requested, you can optionally use click maint"
134+ echo "to install $EXTRA_DEPS by running"
135+ echo " click chroot -a$ARCH -f$FRAMEWORK maint apt-get update"
136+ echo " click chroot -a$ARCH -f$FRAMEWORK maint apt-get install $EXTRA_DEPS"
137+ echo
138+ echo "Your chroot will be unclean from then on, so if you want to"
139+ echo "guarantee clean builds the chroot would need to be recreated."
140+ echo
141+ echo "Use the undocumented --maint-mode if you want this automated."
142+ exit 1
143+ fi
144+ cd "$SOURCE"
145+ if [ -n "$MAINTMODE" ]; then
146+ trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \
147+ EXIT HUP INT TERM
148+ click chroot -a$ARCH -f$FRAMEWORK maint apt-get update
149+ click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS
150+ fi
151+ click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS
152+ click chroot -a$ARCH -f$FRAMEWORK run make
153 click chroot -a$ARCH -f$FRAMEWORK run make DESTDIR=$installdir install
154 fi
155
156 if [ ! -f "$installdir/manifest.json" ]; then
157- echo Building failed, check environment
158- exit 1
159+ echo Building failed, check environment
160+ exit 1
161 fi
162
163 click build $installdir
164 if [ "$workdir" != "$(pwd)" ]; then
165- cp *.click $workdir
166+ cp *.click $workdir
167 fi
168
169 if [ -n "$PROVISION" ]; then

Subscribers

People subscribed via source and target branches